Set up clang format & tidy and format all the files

.clang-format

@@ -41,14 +41,13 @@ BreakBeforeBinaryOperators: None
 BreakBeforeTernaryOperators: true
 BreakConstructorInitializers: BeforeColon
 BreakInheritanceList: BeforeColon
-ColumnLimit: 80
+ColumnLimit: 120
 CompactNamespaces: false
 ContinuationIndentWidth: 4
 Cpp11BracedListStyle: true
 DerivePointerAlignment: false  
 EmptyLineBeforeAccessModifier: LogicalBlock
 FixNamespaceComments: true
-IncludeBlocks: Preserve
 IndentCaseLabels: true
 IndentPPDirectives: None
 IndentWidth: 4
@@ -80,3 +79,17 @@ SpacesInSquareBrackets: false
 Standard: c++17
 TabWidth: 4
 UseTab: Never
+QualifierAlignment: Left
+SortIncludes: true
+IncludeBlocks: Regroup
+IncludeCategories:
+  # Classes own header is always priority 0
+  # System C/C++ headers in <> with extension.
+  - Regex:           '<([A-Za-z0-9.\Q/-_\E])+.h.*>'
+    Priority:        1
+  # System Headers in <> without extension.
+  - Regex:           '<([A-Za-z0-9.\Q/-_\E])+>'
+    Priority:        2
+  # c Headers in "" with extension.
+  - Regex:           '"([A-Za-z0-9.\Q/-_\E])+"'
+    Priority:        3

.vscode/settings.json

@@ -1,7 +1,8 @@
 {
-    "C_Cpp.codeAnalysis.clangTidy.args":[
+  "clangd.arguments": ["-background-index", "-compile-commands-dir=builddir"],
-        "-extra-arg=-std=c++17"
+  "C_Cpp.codeAnalysis.clangTidy.args": ["-extra-arg=-std=c++17"],
-    ],
+  "editor.formatOnType": false,
+  "editor.formatOnSave": true,
   "files.associations": {
     "cctype": "cpp",
     "clocale": "cpp",
@@ -82,5 +83,6 @@
     "future": "cpp",
     "charconv": "cpp",
     "*.ipp": "cpp"
-    }
+  },
+  "clang-tidy.buildPath": "builddir/"
 }

inc/IPrinter.hpp

@@ -1,9 +1,9 @@
 
-#include "PrinterTypes.hpp"
-
 #include <memory>
+#include <string_view>
 
 #include "Bitmap.hpp"
+#include "PrinterTypes.hpp"
 
 #pragma once
 

inc/IUsb.hpp

@@ -1,8 +1,8 @@
-#include "UsbTypes.hpp"
-
 #include <optional>
 #include <vector>
 
+#include "UsbTypes.hpp"
+
 #pragma once
 
 namespace ptprnt::driver {

inc/P700Driver.hpp

@@ -1,8 +1,7 @@
-#include "IDriver.hpp"
-
 #include <cstdint>
 #include <memory>
 
+#include "IDriver.hpp"
 #include "Usb.hpp"
 
 #pragma once
@@ -11,8 +10,7 @@ namespace ptprnt::driver {
 
 class P700Driver : public IDriver {
    public:
-    P700Driver(std::shared_ptr<Usb> usbDriver, uint16_t usbDevVendor = 0x04f9,
+    P700Driver(std::shared_ptr<Usb> usbDriver, uint16_t usbDevVendor = 0x04f9, uint16_t usbDevId = 0x2061);
-               uint16_t usbDevId = 0x2061);
     ~P700Driver() override;
 
     driver::info getInfo() override;

inc/P700Printer.hpp

@@ -1,7 +1,6 @@
-#include "IPrinter.hpp"
-
 #include <memory>
 
+#include "IPrinter.hpp"
 #include "P700Driver.hpp"
 
 #pragma once

src/P700Driver.cpp

@@ -1,14 +1,13 @@
 #include "P700Driver.hpp"
 
+#include <spdlog/spdlog.h>
+
 #include <iostream>
 #include <stdexcept>
 
-#include <spdlog/spdlog.h>
-
 namespace ptprnt::driver {
 
-P700Driver::P700Driver(std::shared_ptr<Usb> usbDriver, uint16_t usbDevVendor,
+P700Driver::P700Driver(std::shared_ptr<Usb> usbDriver, uint16_t usbDevVendor, uint16_t usbProductId)
-                       uint16_t usbProductId)
     : mUsbDriver{std::move(usbDriver)},
       mUsbDev{.vendorId = usbDevVendor, .productId = usbProductId}
 
@@ -31,7 +30,7 @@ driver::info P700Driver::getInfo() {
 
 bool P700Driver::open() {
     auto maybeUsbDev = mUsbDriver->open(mUsbDev);
-    if(!maybeUsbDev.has_value()) {
+    if (!maybeUsbDev.has_value()) {
         spdlog::error("Can't open P700 printer");
         return false;
     }
@@ -40,7 +39,7 @@ bool P700Driver::open() {
 }
 
 bool P700Driver::close() {
-    if(!mUsbDriver->close(mUsbDev)) {
+    if (!mUsbDriver->close(mUsbDev)) {
         return false;
     }
     return true;
@@ -60,15 +59,12 @@ bool P700Driver::init() {
 
     // TODO: There is the possibility, that two printers with the same ID are connected
     //       We have to take that into account
-    auto devIt =
+    auto devIt = std::find_if(devs.value().begin(), devs.value().end(), [=](auto dev) {
-        std::find_if(devs.value().begin(), devs.value().end(), [=](auto dev) {
+        return mUsbDev.vendorId == dev.vendorId && mUsbDev.productId == dev.productId;
-            return mUsbDev.vendorId == dev.vendorId &&
-                   mUsbDev.productId == dev.productId;
     });
 
     if (devIt == devs.value().end()) {
-        spdlog::error("No device with {0:04X}:{1:04X}", mUsbDev.vendorId,
+        spdlog::error("No device with {0:04X}:{1:04X}", mUsbDev.vendorId, mUsbDev.productId);
-                      mUsbDev.productId);
         return false;
     }
 

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: {}",
+        spdlog::error("Could not find any USB devices: {}", libusb_error_name(ret));
-                      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 =
+        newDev.hndl = nullptr;  // handle is only available after we opened the dev
-            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}",
+        spdlog::error("Could not open device {0:04X}:{1:04X}: {2}", dev.vendorId, dev.productId,
-                      dev.vendorId, dev.productId, libusb_error_name(ret));
+                      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;
 }

src/main.cpp

@@ -1,12 +1,12 @@
+#include <spdlog/spdlog.h>
+
 #include <iostream>
 #include <memory>
 
 #include "IPrinter.hpp"
 #include "P700Printer.hpp"
 #include "Usb.hpp"
-
 #include <libusb-1.0/libusb.h>
-#include <spdlog/spdlog.h>
 
 using namespace ptprnt;