From bf7ff27b8d1bbb3e25742fd6a8ea41f26e866b51 Mon Sep 17 00:00:00 2001 From: Moritz Martinius Date: Sat, 11 Oct 2025 18:37:27 +0200 Subject: [PATCH] cleanup --- src/PrinterDriverFactory.cpp | 13 +++++-------- src/PtouchPrint.cpp | 1 - src/libusbwrap/UsbDeviceFactory.cpp | 12 +++++------- src/printers/P700Printer.cpp | 18 ++++-------------- 4 files changed, 14 insertions(+), 30 deletions(-) diff --git a/src/PrinterDriverFactory.cpp b/src/PrinterDriverFactory.cpp index 0b197b9..55dbdd8 100644 --- a/src/PrinterDriverFactory.cpp +++ b/src/PrinterDriverFactory.cpp @@ -1,12 +1,13 @@ #include "PrinterDriverFactory.hpp" +#include #include #include -#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 PrinterDriverFactory::createFakePrinter() { std::shared_ptr 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(), - [](unsigned char c) { return std::tolower(c); }); + std::ranges::transform(nameLower, nameLower.begin(), [](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 PrinterDriverFactory::createByName(const std::st } std::vector PrinterDriverFactory::listAllDrivers() const { - return { - std::string(printer::P700Printer::mInfo.driverName), - std::string(printer::FakePrinter::mInfo.driverName) - }; + return {std::string(printer::P700Printer::mInfo.driverName), std::string(printer::FakePrinter::mInfo.driverName)}; } } // namespace ptprnt \ No newline at end of file diff --git a/src/PtouchPrint.cpp b/src/PtouchPrint.cpp index b79ec29..71cdbbf 100644 --- a/src/PtouchPrint.cpp +++ b/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) { diff --git a/src/libusbwrap/UsbDeviceFactory.cpp b/src/libusbwrap/UsbDeviceFactory.cpp index 20991ba..e5aead0 100644 --- a/src/libusbwrap/UsbDeviceFactory.cpp +++ b/src/libusbwrap/UsbDeviceFactory.cpp @@ -67,21 +67,19 @@ ssize_t UsbDeviceFactory::refreshDeviceList() { return ret; } -std::vector> UsbDeviceFactory::buildMaskedDeviceVector(uint16_t vidMask, - uint16_t pidMask, - uint16_t vid, - uint16_t pid) { +std::vector> UsbDeviceFactory::buildMaskedDeviceVector(uint16_t vidMask, uint16_t pidMask, + uint16_t vid, uint16_t pid) { std::vector> 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) && - ((currDevDesc.idProduct & pidMask) == pid)) { + if (((currDevDesc.idVendor & vidMask) == vid) && ((currDevDesc.idProduct & pidMask) == pid)) { matchedDevices.push_back(std::make_unique(mLibusbCtx, std::move(currDev))); } } diff --git a/src/printers/P700Printer.cpp b/src/printers/P700Printer.cpp index 8d5ff1a..601bcce 100644 --- a/src/printers/P700Printer.cpp +++ b/src/printers/P700Printer.cpp @@ -21,6 +21,7 @@ #include +#include #include #include #include @@ -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& bitmap) } bool P700Printer::printMonochromeData(const graphics::MonochromeData& data) { -#ifdef DRYRUN - spdlog::debug("DRYRUN enabled, printing nothing"); -#endif send(p700::commands::RASTER_START); std::vector rastercmd(4); @@ -184,7 +179,6 @@ bool P700Printer::printLabel(std::unique_ptr 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& 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(tx) != data.size()) { spdlog::error("Could not transfer all data via USB bulk transfer. Only sent {} of {} bytes", tx, data.size()); return false; }