Improve gitignore for less noise in commits

.gitignore

@@ -6,6 +6,7 @@ subprojects/*
 coverageReport/
 
 # Files
+ptprnt.log
 !subprojects/*.wrap
 .vscode/*
 !.vscode/c_cpp_properties.json

.vscode/settings.json

@@ -85,5 +85,6 @@
   },
   "clang-tidy.buildPath": "builddir/",
   "clangd.onConfigChanged": "restart",
-  "C_Cpp.default.compileCommands": "builddir/compile_commands.json"
+  "C_Cpp.default.compileCommands": "builddir/compile_commands.json",
+  "mesonbuild.configureOnOpen": true
 }

src/P700Printer.cpp

@@ -41,11 +41,6 @@
 
 namespace ptprnt::printer {
 
-const PrinterInfo P700Printer::mInfo = {.driverName = "P700",
-                                        .name       = "Brother P-touch P700",
-                                        .version    = "v1.0",
-                                        .usbId{0x04f9, 0x2061}};
-
 P700Printer::~P700Printer() {
     detachUsbDevice();
     if (mUsbHndl) {
@@ -85,8 +80,12 @@ const PrinterStatus P700Printer::getPrinterStatus() {
     return PrinterStatus{.tapeWidthMm = recvBuf[10]};
 }
 
-const libusbwrap::usbId P700Printer::getUsbId() {
+const uint16_t P700Printer::getVid() {
-    return mInfo.usbId;
+    return mInfo.vid;
+}
+
+const uint16_t P700Printer::getPid() {
+    return mInfo.pid;
 }
 
 bool P700Printer::attachUsbDevice(std::shared_ptr<libusbwrap::IUsbDevice> usbHndl) {

src/P700Printer.hpp

@@ -25,7 +25,6 @@
 
 #include "interface/IPrinterDriver.hpp"
 #include "interface/IPrinterTypes.hpp"
-#include "libusbwrap/LibUsbTypes.hpp"
 #include "libusbwrap/interface/IUsbDevice.hpp"
 
 #pragma once
@@ -45,13 +44,11 @@ class P700Printer : public ::ptprnt::IPrinterDriver {
     P700Printer(P700Printer&&)                 = default;
     P700Printer& operator=(P700Printer&&)      = default;
 
-    // Printer info has to be static to be accessed without instantiation
-    static const PrinterInfo mInfo;
-
     // IPrinterDriver
     const std::string_view getDriverName() override;
     const std::string_view getName() override;
-    const libusbwrap::usbId getUsbId() override;
+    const uint16_t getPid() override;
+    const uint16_t getVid() override;
     const std::string_view getVersion() override;
     const PrinterInfo getPrinterInfo() override;
     const PrinterStatus getPrinterStatus() override;
@@ -65,6 +62,12 @@ class P700Printer : public ::ptprnt::IPrinterDriver {
     bool init();
 
     std::shared_ptr<libusbwrap::IUsbDevice> mUsbHndl{nullptr};
+
+    static constexpr PrinterInfo mInfo{.driverName = "P700",
+                                       .name       = "Brother P-touch P700",
+                                       .version    = "v1.0",
+                                       .vid        = 0x04f9,
+                                       .pid        = 0x2061};
     std::map<std::string, std::vector<uint8_t>> commands{
         {"rasterstart",
          {0x1b, 0x69, 0x61,

src/PrinterDriverFactory.cpp

@@ -1,22 +0,0 @@
-#include "PrinterDriverFactory.hpp"
-#include <memory>
-#include "libusbwrap/LibUsbTypes.hpp"
-#include "P700Printer.hpp"
-#include <spdlog/spdlog.h>
-
-namespace ptprnt {
-
-std::shared_ptr<IPrinterDriver> PrinterDriverFactory::create(libusbwrap::usbId id) {
-
-   if(printer::P700Printer::mInfo.usbId == id) {
-      spdlog::debug("Printer is P700!");
-      return std::make_shared<printer::P700Printer>();
-   }
-   else  {
-      spdlog::debug("{:04x}:{:04x} is not a compatible printer", id.first, id.second);
-   }
-   return nullptr;
-}
-
-
-}

src/PrinterDriverFactory.hpp

@@ -1,22 +0,0 @@
-#include <memory>
-#include "interface/IPrinterDriver.hpp"
-#include "libusbwrap/LibUsbTypes.hpp"
-
-namespace ptprnt {
-
-class PrinterDriverFactory {
-   public:
-    PrinterDriverFactory()  = default;
-    ~PrinterDriverFactory() = default;
-
-    PrinterDriverFactory(const PrinterDriverFactory&)            = delete;
-    PrinterDriverFactory& operator=(const PrinterDriverFactory&) = delete;
-    PrinterDriverFactory(PrinterDriverFactory&&)                 = delete;
-    PrinterDriverFactory& operator=(PrinterDriverFactory&&)      = delete;
-
-    std::shared_ptr<IPrinterDriver> create(libusbwrap::usbId id);
-
-   private:
-};
-
-}

src/PtouchPrint.cpp

@@ -37,7 +37,7 @@
 #include <vector>
 
 #include "CLI/Option.hpp"
-#include "PrinterDriverFactory.hpp"
+#include "P700Printer.hpp"
 #include "graphics/Bitmap.hpp"
 #include "libusbwrap/UsbDeviceFactory.hpp"
 
@@ -65,14 +65,14 @@ int PtouchPrint::init(int argc, char** argv) {
         spdlog::error("Could not initialize libusb");
         return -1;
     }
+    mCompatiblePrinters = {std::make_shared<ptprnt::printer::P700Printer>()};
     return 0;
 }
 
 int PtouchPrint::run() {
     spdlog::debug("ptprnt version {}", mVersionString);
     SPDLOG_TRACE("testing trace");
-    mDetectedPrinters = getCompatiblePrinters();
+    auto numFoundPrinters = getCompatiblePrinters();
-    auto numFoundPrinters = mDetectedPrinters.size();
     if (numFoundPrinters == 0) {
         spdlog::error(
             "No compatible printers found, please make sure that they are turned on and connected");
@@ -82,9 +82,8 @@ int PtouchPrint::run() {
         return -1;
     }
 
-    auto printer = mDetectedPrinters[0];
+    auto printer = mCompatiblePrinters[0];
-    const auto printerUsbId = printer->getUsbId();
+    auto devices = mUsbDeviceFactory.findDevices(printer->getVid(), printer->getPid());
-    auto devices = mUsbDeviceFactory.findDevices(printerUsbId.first, printerUsbId.second);
     if (devices.size() != 1) {
         spdlog::warn(
             "Found more than one device of the same printer on bus. Currently not supported");
@@ -104,19 +103,26 @@ int PtouchPrint::run() {
     return 0;
 }
 
-std::vector<std::shared_ptr<IPrinterDriver>> PtouchPrint::getCompatiblePrinters() {
+unsigned int PtouchPrint::getCompatiblePrinters() {
-
     auto usbDevs = mUsbDeviceFactory.findAllDevices();
-    auto driverFactory = std::make_unique<PrinterDriverFactory>();
-    std::vector<std::shared_ptr<IPrinterDriver>> foundPrinterDrivers {};
 
     for (auto usbDev : usbDevs) {
-        auto driver = driverFactory->create(usbDev->getUsbId());
+        auto foundPrinterIt =
-        if(driver != nullptr) {
+            std::find_if(mCompatiblePrinters.begin(), mCompatiblePrinters.end(),
-            foundPrinterDrivers.push_back(driver);
+                         [usbDev](const std::shared_ptr<ptprnt::IPrinterDriver>& printer) {
+                             return printer->getPid() == usbDev->getPid() &&
+                                    printer->getVid() == usbDev->getVid();
+                         });
+        if (foundPrinterIt == mCompatiblePrinters.end()) {
+            continue;
         }
+        auto foundPrinter = *foundPrinterIt;
+        spdlog::info("Found Printer {}", foundPrinter->getName());
+        mDetectedPrinters.push_back(foundPrinter);
     }
-    return foundPrinterDrivers;
+    // we can delete all instantiated printers that are not compatible
+    mCompatiblePrinters.clear();
+    return mDetectedPrinters.size();
 }
 
 void PtouchPrint::setupLogger(spdlog::level::level_enum lvl) {

src/PtouchPrint.hpp

@@ -49,12 +49,13 @@ class PtouchPrint {
     // methods
     void setupLogger(spdlog::level::level_enum lvl);
     void setupCliParser();
-    std::vector<std::shared_ptr<IPrinterDriver>> getCompatiblePrinters();
+    unsigned int getCompatiblePrinters();
 
     // member variables
     CLI::App mApp{ptprnt::APP_DESC};
     libusbwrap::UsbDeviceFactory mUsbDeviceFactory{};
-    std::vector<std::shared_ptr<IPrinterDriver>> mDetectedPrinters{};
+    std::vector<std::shared_ptr<ptprnt::IPrinterDriver>> mCompatiblePrinters{};
+    std::vector<std::shared_ptr<ptprnt::IPrinterDriver>> mDetectedPrinters{};
     std::vector<CliCmd> mCommands{};
     std::string mVersionString = "";
 

src/interface/IPrinterDriver.hpp

@@ -34,7 +34,8 @@ class IPrinterDriver {
     virtual const std::string_view getDriverName()                                = 0;
     virtual const std::string_view getName()                                      = 0;
     virtual const std::string_view getVersion()                                   = 0;
-    virtual const libusbwrap::usbId getUsbId()                                    = 0;
+    virtual const uint16_t getVid()                                               = 0;
+    virtual const uint16_t getPid()                                               = 0;
     virtual const PrinterInfo getPrinterInfo()                                    = 0;
     virtual const PrinterStatus getPrinterStatus()                                = 0;
     virtual bool attachUsbDevice(std::shared_ptr<libusbwrap::IUsbDevice> usbHndl) = 0;

src/interface/IPrinterTypes.hpp

@@ -21,7 +21,6 @@
 
 #include <cstdint>
 #include <string_view>
-#include "libusbwrap/LibUsbTypes.hpp"
 
 namespace ptprnt {
 
@@ -29,7 +28,8 @@ struct PrinterInfo {
     std::string_view driverName = "";
     std::string_view name       = "";
     std::string_view version    = "";
-    libusbwrap::usbId usbId {0x00, 0x00};
+    uint16_t vid                = 0x00;
+    uint16_t pid                = 0x00;
 };
 
 struct PrinterStatus {

src/libusbwrap/LibUsbTypes.hpp

@@ -19,7 +19,7 @@
 
 #pragma once
 
-#include <utility>
+#include <memory>
 
 #include "libusb.h"
 
@@ -40,7 +40,4 @@ enum class Error {
     NOT_SUPPORTED = LIBUSB_ERROR_NOT_SUPPORTED,
     OTHER         = LIBUSB_ERROR_OTHER
 };
-
+}
-using usbId = std::pair<uint16_t, uint16_t>;
-
-}  // namespace libusbwrap

src/libusbwrap/UsbDevice.cpp

@@ -104,8 +104,12 @@ bool UsbDevice::bulkTransfer(uint8_t endpoint, std::vector<uint8_t>& data, int*
     return true;
 }
 
-const usbId UsbDevice::getUsbId() {
+const uint16_t UsbDevice::getVid() {
-    return {mLibusbDevDesc.idVendor, mLibusbDevDesc.idProduct};
+    return mLibusbDevDesc.idVendor;
+}
+
+const uint16_t UsbDevice::getPid() {
+    return mLibusbDevDesc.idProduct;
 }
 
 const device::Speed UsbDevice::getSpeed() {

src/libusbwrap/UsbDevice.hpp

@@ -47,7 +47,8 @@ class UsbDevice : public IUsbDevice {
                       unsigned int timeout) override;
 
     // getters
-    const usbId getUsbId() override;
+    const uint16_t getVid() override;
+    const uint16_t getPid() override;
     const device::Speed getSpeed() override;
     const uint8_t getBusNumber() override;
     const uint8_t getPortNumber() override;

src/libusbwrap/interface/IUsbDevice.hpp

@@ -36,7 +36,8 @@ class IUsbDevice {
                               unsigned int timeout)  = 0;
 
     // getters
-    virtual const usbId getUsbId()         = 0;
+    virtual const uint16_t getVid()        = 0;
+    virtual const uint16_t getPid()        = 0;
     virtual const device::Speed getSpeed() = 0;
     virtual const uint8_t getBusNumber()   = 0;
     virtual const uint8_t getPortNumber()  = 0;

src/meson.build

@@ -8,7 +8,6 @@ ptprnt_hpps = files (
     'interface/IPrinterTypes.hpp',
     'P700Printer.hpp',
     'PtouchPrint.hpp',
-    'PrinterDriverFactory.hpp',
     'graphics/Bitmap.hpp',
     'graphics/Image.hpp',
     'graphics/Monochrome.hpp'
@@ -16,7 +15,6 @@ ptprnt_hpps = files (
 
 ptprnt_srcs = files (
     'PtouchPrint.cpp',
-    'PrinterDriverFactory.cpp',
     'P700Printer.cpp',
     'graphics/Image.cpp',
     'graphics/Bitmap.cpp',