Implemented printer status retrieval
This commit is contained in:
@@ -1,8 +1,10 @@
|
||||
#include "libusbwrap/UsbDevice.hpp"
|
||||
|
||||
#include <cstdint>
|
||||
#include <stdexcept>
|
||||
|
||||
#include "libusb.h"
|
||||
#include "libusbwrap/LibUsbTypes.hpp"
|
||||
#include "libusbwrap/interface/IUsbDevice.hpp"
|
||||
|
||||
namespace libusbwrap {
|
||||
@@ -22,14 +24,67 @@ UsbDevice::~UsbDevice() {
|
||||
}
|
||||
}
|
||||
|
||||
Error UsbDevice::open() {
|
||||
return static_cast<Error>(libusb_open(mLibusbDev, &mLibusbDevHandle));
|
||||
bool UsbDevice::open() {
|
||||
int openStatus = libusb_open(mLibusbDev, &mLibusbDevHandle);
|
||||
if (openStatus != 0) {
|
||||
mLastError = static_cast<Error>(openStatus);
|
||||
return false;
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
void UsbDevice::close() {
|
||||
libusb_close(mLibusbDevHandle);
|
||||
}
|
||||
|
||||
bool UsbDevice::detachKernelDriver(int interfaceNo) {
|
||||
// TODO: cover the other status codes that can be returned
|
||||
int kernelDriverStatus = libusb_kernel_driver_active(mLibusbDevHandle, interfaceNo);
|
||||
if (kernelDriverStatus == 1) { // kernel driver is active, we have to detach to continue...
|
||||
int detachStatus = libusb_detach_kernel_driver(mLibusbDevHandle, interfaceNo);
|
||||
if (detachStatus != 0) {
|
||||
mLastError = static_cast<Error>(detachStatus);
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool UsbDevice::claimInterface(int interfaceNo) {
|
||||
// TODO: cover the other status codes that can be returned
|
||||
int claimInterfaceStatus = libusb_claim_interface(mLibusbDevHandle, interfaceNo);
|
||||
if (claimInterfaceStatus != 0) {
|
||||
mLastError = static_cast<Error>(claimInterfaceStatus);
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
bool UsbDevice::releaseInterface(int interfaceNo) {
|
||||
int releaseInterfaceStatus = libusb_release_interface(mLibusbDevHandle, interfaceNo);
|
||||
if (releaseInterfaceStatus != 0) {
|
||||
mLastError = static_cast<Error>(releaseInterfaceStatus);
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
bool UsbDevice::bulkTransfer(uint8_t endpoint, std::vector<uint8_t>& data, int* tx,
|
||||
unsigned int timeout) {
|
||||
// TODO: implement error handling for incomplete transactions (tx length != data length)
|
||||
int bulkTransferStatus = 0;
|
||||
|
||||
bulkTransferStatus =
|
||||
libusb_bulk_transfer(mLibusbDevHandle, endpoint, data.data(), data.size(), tx, timeout);
|
||||
if (bulkTransferStatus != 0) {
|
||||
mLastError = static_cast<Error>(bulkTransferStatus);
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
const uint16_t UsbDevice::getVid() {
|
||||
return mLibusbDevDesc.idVendor;
|
||||
}
|
||||
@@ -49,4 +104,12 @@ const uint8_t UsbDevice::getBusNumber() {
|
||||
const uint8_t UsbDevice::getPortNumber() {
|
||||
return libusb_get_port_number(mLibusbDev);
|
||||
}
|
||||
|
||||
const Error UsbDevice::getLastError() {
|
||||
return mLastError;
|
||||
}
|
||||
|
||||
const std::string UsbDevice::getLastErrorString() {
|
||||
return std::string(libusb_error_name(static_cast<int>(mLastError)));
|
||||
}
|
||||
} // namespace libusbwrap
|
||||
Reference in New Issue
Block a user