Set up clang format & tidy and format all the files
This commit is contained in:
14
src/Usb.cpp
14
src/Usb.cpp
@@ -1,6 +1,7 @@
|
||||
#include "Usb.hpp"
|
||||
|
||||
#include <spdlog/spdlog.h>
|
||||
|
||||
#include <iomanip>
|
||||
#include <iostream>
|
||||
#include <optional>
|
||||
@@ -27,8 +28,7 @@ std::optional<std::vector<UsbDevice>> Usb::getDevices() {
|
||||
mDevices.clear();
|
||||
|
||||
if (0 == (ret = libusb_get_device_list(NULL, &libUsbDevs))) {
|
||||
spdlog::error("Could not find any USB devices: {}",
|
||||
libusb_error_name(ret));
|
||||
spdlog::error("Could not find any USB devices: {}", libusb_error_name(ret));
|
||||
return std::nullopt;
|
||||
}
|
||||
|
||||
@@ -44,8 +44,7 @@ std::optional<std::vector<UsbDevice>> Usb::getDevices() {
|
||||
newDev.vendorId = libUsbDesc.idVendor;
|
||||
newDev.productId = libUsbDesc.idProduct;
|
||||
newDev.device = libUsbDev;
|
||||
newDev.hndl =
|
||||
nullptr; // handle is only available after we opened the dev
|
||||
newDev.hndl = nullptr; // handle is only available after we opened the dev
|
||||
mDevices.push_back(newDev);
|
||||
}
|
||||
|
||||
@@ -58,8 +57,8 @@ std::optional<UsbDevice> Usb::open(UsbDevice dev) {
|
||||
int ret = 0;
|
||||
|
||||
if ((ret = libusb_open(dev.device, &libUsbHandle) != 0)) {
|
||||
spdlog::error("Could not open device {0:04X}:{1:04X}: {2}",
|
||||
dev.vendorId, dev.productId, libusb_error_name(ret));
|
||||
spdlog::error("Could not open device {0:04X}:{1:04X}: {2}", dev.vendorId, dev.productId,
|
||||
libusb_error_name(ret));
|
||||
return std::nullopt;
|
||||
}
|
||||
|
||||
@@ -89,13 +88,14 @@ std::optional<UsbDevice> Usb::open(UsbDevice dev) {
|
||||
|
||||
bool Usb::close(UsbDevice dev) {
|
||||
int ret = 0;
|
||||
if(0 != (ret = libusb_release_interface(dev.hndl, 0))) {
|
||||
if (0 != (ret = libusb_release_interface(dev.hndl, 0))) {
|
||||
spdlog::error(
|
||||
"Could not close USB device {0:04X}:{1:04X}: "
|
||||
"{2}",
|
||||
dev.vendorId, dev.productId, libusb_error_name(ret));
|
||||
}
|
||||
|
||||
std::cout << "test" << std::endl;
|
||||
libusb_close(dev.hndl);
|
||||
return true;
|
||||
}
|
||||
|
Reference in New Issue
Block a user