From f71f257eb0cbffc264119ca98a59cc8e1e2ea4fc Mon Sep 17 00:00:00 2001 From: Martin Brodbeck Date: Mon, 6 Aug 2018 09:59:06 +0200 Subject: [PATCH] successfully claim printer interace --- src/gui/CMakeLists.txt | 2 +- src/gui/settingsdialog.cpp | 6 ++++ src/printer/CMakeLists.txt | 2 +- src/printer/posprinter.cpp | 62 +++++++++++++++++++++++++------------- src/printer/posprinter.h | 16 +++++++--- 5 files changed, 60 insertions(+), 28 deletions(-) diff --git a/src/gui/CMakeLists.txt b/src/gui/CMakeLists.txt index dd02999..244d481 100644 --- a/src/gui/CMakeLists.txt +++ b/src/gui/CMakeLists.txt @@ -29,7 +29,7 @@ set(GUI_SOURCES add_executable(kima2 ${GUI_SOURCES}) target_include_directories(kima2 PRIVATE ${PROJECT_BINARY_DIR}) -target_link_libraries(kima2 core Qt5::Widgets Qt5::PrintSupport stdc++fs) +target_link_libraries(kima2 core printer Qt5::Widgets Qt5::PrintSupport stdc++fs) if(WIN32) set_target_properties(kima2 PROPERTIES LINK_FLAGS "-mwindows") endif(WIN32) diff --git a/src/gui/settingsdialog.cpp b/src/gui/settingsdialog.cpp index af62279..c891909 100644 --- a/src/gui/settingsdialog.cpp +++ b/src/gui/settingsdialog.cpp @@ -1,6 +1,7 @@ #include "settingsdialog.h" #include +#include #include #include @@ -19,6 +20,11 @@ SettingsDialog::SettingsDialog(QWidget* parent, Qt::WindowFlags f) : QDialog(par ui_.posPrinterDeviceEdit->setText(posPrinterDevice); ui_.feePercentSpinBox->setValue(feeInPercent); ui_.maxFeeSpinBox->setValue(maxFeeInEuro); + + connect(ui_.testPosPrinterButton, &QPushButton::clicked, this, [](){ + //PosPrinter::initialize({0, 0}); + PosPrinter printer; + }); } void SettingsDialog::accept() diff --git a/src/printer/CMakeLists.txt b/src/printer/CMakeLists.txt index 26f56be..4f698d7 100644 --- a/src/printer/CMakeLists.txt +++ b/src/printer/CMakeLists.txt @@ -5,5 +5,5 @@ set(PRINTER_SOURCES ) add_library(printer STATIC ${PRINTER_SOURCES}) -target_link_libraries(printer ${LibUSB_LIBRARY}) +target_link_libraries(printer ${LIBUSB_1_LIBRARIES}) target_include_directories(printer PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) \ No newline at end of file diff --git a/src/printer/posprinter.cpp b/src/printer/posprinter.cpp index ff50d66..8ac8dfe 100644 --- a/src/printer/posprinter.cpp +++ b/src/printer/posprinter.cpp @@ -4,9 +4,7 @@ #include #include -PosPrinter::PosPrinter() : PosPrinter(std::pair{0x0456, 0x0808}) {} - -PosPrinter::PosPrinter(std::pair vendorModelId) +PosPrinter::PosPrinter() { int retValue; @@ -15,17 +13,50 @@ PosPrinter::PosPrinter(std::pair vendorModelId) throw std::runtime_error("Init error"); } - // libusb_set_debug(contextPtr_, 3); // set verbosity level to 3, as suggested in the - // documentation + libusb_device** devList; + int devCount = libusb_get_device_list(contextPtr_, &devList); + if (devCount <= 0) { + libusb_exit(contextPtr_); + throw std::runtime_error("Could not receive device list"); + } + int numDevice = -1; + for (int i = 0; i < devCount; ++i) { + libusb_device_descriptor desc; + libusb_get_device_descriptor(devList[i], &desc); + for (const auto& supported : supportedPrinters_.models) { + if (desc.idVendor == supported.first && desc.idProduct == supported.second) { + numDevice = i; + break; + } + } + } - devicePtr_ = - libusb_open_device_with_vid_pid(contextPtr_, vendorModelId.first, - vendorModelId.second); // these are vendorID and productID - if (devicePtr_ == NULL) { + if (numDevice < 0) { + libusb_exit(contextPtr_); + return; + } + + retValue = libusb_open(devList[numDevice], &devicePtr_); // these are vendorID and productID + if (retValue != 0) { + libusb_free_device_list(devList, 1); + libusb_exit(contextPtr_); throw std::runtime_error("Cannot open printer device"); } - // ... + if (libusb_kernel_driver_active(devicePtr_, 0) == 1) { // find out if kernel driver is attached + std::cout << "Kernel Driver Active" << std::endl; + if (libusb_detach_kernel_driver(devicePtr_, 0) == 0) // detach it + std::cout << "Kernel Driver Detached!" << std::endl; + } + + retValue = libusb_claim_interface( + devicePtr_, 0); // claim interface 0 (the first) of device (mine had jsut 1) + if (retValue < 0) { + std::cout << "Cannot Claim Interface" << std::endl; + throw std::runtime_error("Cannot claim interface"); + } + + libusb_free_device_list(devList, 1); } PosPrinter::~PosPrinter() @@ -40,15 +71,4 @@ PosPrinter::~PosPrinter() libusb_close(devicePtr_); // close the device we opened libusb_exit(contextPtr_); // close the session - - delete instance_; } - -void PosPrinter::initialize(std::pair vendorModelId) -{ - if (!instance_) { - instance_ = new PosPrinter(vendorModelId); - } -} - -PosPrinter* PosPrinter::getInstance() { return instance_; } diff --git a/src/printer/posprinter.h b/src/printer/posprinter.h index 73fd6fe..33dfb19 100644 --- a/src/printer/posprinter.h +++ b/src/printer/posprinter.h @@ -5,18 +5,24 @@ #include +struct SupportedPrinters { + std::array, 2> models{ + // {Vendor ID, Model ID} + std::make_pair(0x0456, 0x0808), + std::make_pair(0x0416, 0x5011), + }; +}; + class PosPrinter { public: - static void initialize(std::pair vendorModelIds); - static PosPrinter* getInstance(); - private: PosPrinter(); - PosPrinter(std::pair vendorModelId); ~PosPrinter(); - static PosPrinter* instance_; + + private: libusb_context* contextPtr_{}; libusb_device_handle* devicePtr_{}; + SupportedPrinters supportedPrinters_; }; #endif \ No newline at end of file