src/PrinterDriverFactory.cpp

@@ -1,12 +1,13 @@
 #include "PrinterDriverFactory.hpp"
 
+#include <algorithm>
 #include <spdlog/spdlog.h>
 
 #include <memory>
 
-#include "printers/P700Printer.hpp"
-#include "printers/FakePrinter.hpp"
 #include "libusbwrap/LibUsbTypes.hpp"
+#include "printers/FakePrinter.hpp"
+#include "printers/P700Printer.hpp"
 
 namespace ptprnt {
 
@@ -29,8 +30,7 @@ std::shared_ptr<IPrinterDriver> PrinterDriverFactory::createFakePrinter() {
 std::shared_ptr<IPrinterDriver> PrinterDriverFactory::createByName(const std::string& driverName) {
     // Convert to lowercase for case-insensitive comparison
     std::string nameLower = driverName;
-    std::transform(nameLower.begin(), nameLower.end(), nameLower.begin(),
+    std::ranges::transform(nameLower, nameLower.begin(), [](unsigned char c) { return std::tolower(c); });
-                   [](unsigned char c) { return std::tolower(c); });
 
     if (nameLower == "p700" || nameLower == "p700printer") {
         spdlog::info("Creating P700 printer driver by name");
@@ -44,10 +44,7 @@ std::shared_ptr<IPrinterDriver> PrinterDriverFactory::createByName(const std::st
 }
 
 std::vector<std::string> PrinterDriverFactory::listAllDrivers() const {
-    return {
+    return {std::string(printer::P700Printer::mInfo.driverName), std::string(printer::FakePrinter::mInfo.driverName)};
-        std::string(printer::P700Printer::mInfo.driverName),
-        std::string(printer::FakePrinter::mInfo.driverName)
-    };
 }
 
 }  // namespace ptprnt

src/PtouchPrint.cpp

@@ -70,7 +70,6 @@ int PtouchPrint::init(int argc, char** argv) {
 
 int PtouchPrint::run() {
     spdlog::info("ptprnt version {}", mVersionString);
-    SPDLOG_TRACE("testing trace");
 
     // Handle --list-all-drivers flag
     if (mListDriversFlag) {

src/libusbwrap/UsbDeviceFactory.cpp

@@ -67,21 +67,19 @@ ssize_t UsbDeviceFactory::refreshDeviceList() {
     return ret;
 }
 
-std::vector<std::unique_ptr<IUsbDevice>> UsbDeviceFactory::buildMaskedDeviceVector(uint16_t vidMask,
+std::vector<std::unique_ptr<IUsbDevice>> UsbDeviceFactory::buildMaskedDeviceVector(uint16_t vidMask, uint16_t pidMask,
-                                                                                   uint16_t pidMask,
+                                                                                   uint16_t vid, uint16_t pid) {
-                                                                                   uint16_t vid,
-                                                                                   uint16_t pid) {
     std::vector<std::unique_ptr<IUsbDevice>> matchedDevices;
     // see libusb/examples/listdevs.c
     for (auto& currDev : mLibusbDeviceList) {
-        struct libusb_device_descriptor currDevDesc {};
+        struct libusb_device_descriptor currDevDesc{};
 
         int ret = libusb_get_device_descriptor(currDev.get(), &currDevDesc);
+        spdlog::trace("Detected Device {:04x}:{:04x} ", currDevDesc.idVendor, currDevDesc.idProduct);
         if (ret < 0) {
             continue;
         }
-        if (((currDevDesc.idVendor & vidMask) == vid) &&
+        if (((currDevDesc.idVendor & vidMask) == vid) && ((currDevDesc.idProduct & pidMask) == pid)) {
-            ((currDevDesc.idProduct & pidMask) == pid)) {
             matchedDevices.push_back(std::make_unique<UsbDevice>(mLibusbCtx, std::move(currDev)));
         }
     }

src/printers/P700Printer.cpp

@@ -21,6 +21,7 @@
 
 #include <spdlog/spdlog.h>
 
+#include <cassert>
 #include <cstdint>
 #include <iterator>
 #include <memory>
@@ -32,9 +33,6 @@
 #include "../libusbwrap/LibUsbTypes.hpp"
 #include "spdlog/fmt/bin_to_hex.h"
 
-// as long as DRYRUN is defined, no data is actually send to the printer, we need to save some tape ;)
-#define DRYRUN
-
 namespace ptprnt::printer {
 
 const PrinterInfo P700Printer::mInfo = {.driverName = "P700",
@@ -129,9 +127,6 @@ bool P700Printer::printBitmap(const graphics::Bitmap<graphics::ALPHA8>& bitmap)
 }
 
 bool P700Printer::printMonochromeData(const graphics::MonochromeData& data) {
-#ifdef DRYRUN
-    spdlog::debug("DRYRUN enabled, printing nothing");
-#endif
 
     send(p700::commands::RASTER_START);
     std::vector<uint8_t> rastercmd(4);
@@ -184,7 +179,6 @@ bool P700Printer::printLabel(std::unique_ptr<graphics::ILabel> label) {
     monoData.transformTo(graphics::Orientation::PORTRAIT);
 
     spdlog::debug("Label surface is {}x{}, transformed to portrait", label->getWidth(), label->getHeight());
-    monoData.visualize();
 
     return printMonochromeData(monoData);
 }
@@ -203,19 +197,15 @@ bool P700Printer::send(const std::vector<uint8_t>& data) {
         return false;
     }
 
-    size_t tx = 0;
+    int tx = 0;
 
-#ifndef DRYRUN
     if (!mUsbHndl->bulkTransfer(0x02, data, &tx, 0)) {
         spdlog::error("Error writing command to Printer: {}", mUsbHndl->getLastErrorString());
         return false;
     }
-#else
-    tx = data.size();
-    spdlog::trace("USB raw data(len {}): {}", data.size(), spdlog::to_hex(data));
-#endif
 
-    if (tx != data.size()) {
+    assert(tx > 0);
+    if (static_cast<std::uint32_t>(tx) != data.size()) {
         spdlog::error("Could not transfer all data via USB bulk transfer. Only sent {} of {} bytes", tx, data.size());
         return false;
     }