Merge pull request #11 from christoph2/pre-commit-ci-update-config

[pre-commit.ci] pre-commit autoupdate

Author: christoph2

.pre-commit-config.yaml

@@ -13,7 +13,7 @@ repos:
         description: "Forces line endings to LF."
 
 -   repo: https://github.com/pre-commit/mirrors-clang-format
-    rev: v21.1.5
+    rev: v21.1.6
     hooks:
     -   id: clang-format
         types_or: [c, c++]

examples/debug_on_pico/usb_descriptors.c

@@ -67,7 +67,7 @@ tusb_desc_device_t const desc_device = {
 
 // Invoked when received GET DEVICE DESCRIPTOR
 // Application return pointer to descriptor
-uint8_t const * tud_descriptor_device_cb(void) {
+uint8_t const *tud_descriptor_device_cb(void) {
     return (uint8_t const *)&desc_device;
 }
 
@@ -161,14 +161,14 @@ tusb_desc_device_qualifier_t const desc_device_qualifier = { .bLength         =
 // Application return pointer to descriptor, whose contents must exist long enough for transfer to complete.
 // device_qualifier descriptor describes information about a high-speed capable device that would
 // change if the device were operating at the other speed. If not highspeed capable stall this request.
-uint8_t const * tud_descriptor_device_qualifier_cb(void) {
+uint8_t const *tud_descriptor_device_qualifier_cb(void) {
     return (uint8_t const *)&desc_device_qualifier;
 }
 
 // Invoked when received GET OTHER SEED CONFIGURATION DESCRIPTOR request
 // Application return pointer to descriptor, whose contents must exist long enough for transfer to complete
 // Configuration descriptor in the other speed e.g if high speed then this is for full speed and vice versa
-uint8_t const * tud_descriptor_other_speed_configuration_cb(uint8_t index) {
+uint8_t const *tud_descriptor_other_speed_configuration_cb(uint8_t index) {
     (void)index;  // for multiple configurations
 
     // if link speed is high return fullspeed config, and vice versa
@@ -188,7 +188,7 @@ uint8_t const * tud_descriptor_other_speed_configuration_cb(uint8_t index) {
 // Invoked when received GET CONFIGURATION DESCRIPTOR
 // Application return pointer to descriptor
 // Descriptor contents must exist long enough for transfer to complete
-uint8_t const * tud_descriptor_configuration_cb(uint8_t index) {
+uint8_t const *tud_descriptor_configuration_cb(uint8_t index) {
     (void)index;  // for multiple configurations
 
 #if TUD_OPT_HIGH_SPEED
@@ -212,7 +212,7 @@ enum {
 };
 
 // array of pointer to string descriptors
-char const * string_desc_arr[] = {
+char const *string_desc_arr[] = {
     (const char[]){ 0x09, 0x04 }, // 0: is supported language is English (0x0409)
     "TinyUSB", // 1: Manufacturer
     "TinyUSB Device", // 2: Product
@@ -224,7 +224,7 @@ static uint16_t _desc_str[32 + 1];
 
 // Invoked when received GET STRING DESCRIPTOR request
 // Application return pointer to descriptor, whose contents must exist long enough for transfer to complete
-uint16_t const * tud_descriptor_string_cb(uint8_t index, uint16_t langid) {
+uint16_t const *tud_descriptor_string_cb(uint8_t index, uint16_t langid) {
     (void)langid;
     size_t chr_count;
 
@@ -245,7 +245,7 @@ uint16_t const * tud_descriptor_string_cb(uint8_t index, uint16_t langid) {
             if (!(index < sizeof(string_desc_arr) / sizeof(string_desc_arr[0])))
                 return NULL;
 
-            const char* str = string_desc_arr[index];
+            const char *str = string_desc_arr[index];
 
             // Cap at max char
             chr_count              = strlen(str);

inc/xcp.h

@@ -100,7 +100,7 @@
     #define XCP_ON_ETHERNET_USE_TCP (1)
 
     #if !defined(XCP_ON_ETHERNET_PROTOCOL)
-    #define XCP_ON_ETHERNET_PROTOCOL    XCP_ON_ETHERNET_USE_UDP
+        #define XCP_ON_ETHERNET_PROTOCOL XCP_ON_ETHERNET_USE_UDP
     #endif /* * XCP_ON_ETHERNET_PROTOCOL */
 
     #if XCP_ENABLE_EXTERN_C_GUARDS == XCP_ON

src/tl/eth/arduino_networking.cpp

@@ -43,7 +43,6 @@
         #include <SPI.h>
     #endif
 
-
 const unsigned long READ_TIMEOUT_MS = 2000;
 
 class ClientWrapper {
@@ -357,37 +356,37 @@ class WiFiAdapter : public ArduinoNetworkIf {
 
     bool begin() override {
         // Put ESP32 in station mode and try to keep things deterministic during connect
-        WiFi.persistent(false);   // avoid writing credentials repeatedly to NVS
+        WiFi.persistent(false);  // avoid writing credentials repeatedly to NVS
         WiFi.mode(WIFI_STA);
-        WiFi.setSleep(false);     // keep radio awake during provisioning/UDP XCP
-        // Optional set TX power (requires Arduino-ESP32 supporting WiFi.setTxPower)
-#ifdef XCP_ON_WIFI_TX_POWER
+        WiFi.setSleep(false);  // keep radio awake during provisioning/UDP XCP
+                               // Optional set TX power (requires Arduino-ESP32 supporting WiFi.setTxPower)
+        #ifdef XCP_ON_WIFI_TX_POWER
         WiFi.setTxPower(XCP_ON_WIFI_TX_POWER);
-#endif
+        #endif
 
         // Optional static IP configuration (do this BEFORE begin())
         {
-#if defined(XCP_ON_ETHERNET_IP_OCTETS)
+        #if defined(XCP_ON_ETHERNET_IP_OCTETS)
             IPAddress ip(XCP_ON_ETHERNET_IP_OCTETS);
             if (!WiFi.config(ip)) {
                 Serial.println("[WiFi] Failed to apply static IP config");
             }
-#elif defined(XCP_ON_ETHERNET_IP)
+        #elif defined(XCP_ON_ETHERNET_IP)
             IPAddress ip;
             ip.fromString(XCP_ON_ETHERNET_IP);
             if (!WiFi.config(ip)) {
                 Serial.println("[WiFi] Failed to apply static IP config");
             }
-#endif
+        #endif
         }
 
         Serial.print("[WiFi] Connecting to SSID: ");
         Serial.println(m_ssid ? m_ssid : "<null>");
         wl_status_t startStatus = WiFi.begin(m_ssid, m_pass);
-        (void)startStatus; // not all cores return a meaningful value here
+        (void)startStatus;  // not all cores return a meaningful value here
 
-        const unsigned long timeoutMs = 15000; // allow a bit more time on congested APs
-        unsigned long       start      = millis();
+        const unsigned long timeoutMs = 15000;  // allow a bit more time on congested APs
+        unsigned long       start     = millis();
         wl_status_t         st;
         while ((st = WiFi.status()) != WL_CONNECTED && (millis() - start < timeoutMs)) {
             switch (st) {
@@ -455,7 +454,7 @@ class WiFiAdapter : public ArduinoNetworkIf {
                     Serial.println("[WiFi] UDP listener started after reconnect");
                 }
             }
-            m_reconnect_backoff_ms = 2000; // reset backoff on success
+            m_reconnect_backoff_ms = 2000;  // reset backoff on success
         } else {
             // Ensure UDP is not used while disconnected/connecting
             if (m_udp_active) {
@@ -491,8 +490,8 @@ class WiFiAdapter : public ArduinoNetworkIf {
     const char*          m_ssid;
     const char*          m_pass;
     WiFiUdpClientWrapper m_udpClientWrapper;
-    bool                 m_udp_active = false;
-    unsigned long        m_reconnect_backoff_ms = 2000; // start with 2s backoff
+    bool                 m_udp_active           = false;
+    unsigned long        m_reconnect_backoff_ms = 2000;  // start with 2s backoff
 };
     #endif  // XCP_ON_ETHERNET_ARDUINO_DRIVER == XCP_ON_ETHERNET_DRIVER_WIFI
 
@@ -554,63 +553,80 @@ class FrameParser {
 /* TCP client wrapper and adapter for WiFi (ESP32) */
 class WiFiClientWrapper : public ClientWrapper {
    public:
-    explicit WiFiClientWrapper(WiFiClient c = WiFiClient()) : m_client(c) {}
 
-    void set(WiFiClient c) { m_client = c; }
+    explicit WiFiClientWrapper(WiFiClient c = WiFiClient()) : m_client(c) {
+    }
 
-    int available() override { return m_client ? m_client.available() : 0; }
+    void set(WiFiClient c) {
+        m_client = c;
+    }
 
-    int read_bytes(uint8_t* buf, size_t len) override { return m_client.read(buf, len); }
+    int available() override {
+        return m_client ? m_client.available() : 0;
+    }
 
-    size_t write_bytes(const uint8_t* buf, size_t len) override { return m_client.write(buf, len); }
+    int read_bytes(uint8_t* buf, size_t len) override {
+        return m_client.read(buf, len);
+    }
 
-    bool connected() override { return m_client && m_client.connected(); }
+    size_t write_bytes(const uint8_t* buf, size_t len) override {
+        return m_client.write(buf, len);
+    }
+
+    bool connected() override {
+        return m_client && m_client.connected();
+    }
 
     void stop() override {
         if (m_client) {
             m_client.stop();
         }
     }
 
-    bool is_datagram() const override { return false; }
+    bool is_datagram() const override {
+        return false;
+    }
 
    private:
+
     WiFiClient m_client;
 };
 
 class WiFiTcpAdapter : public ArduinoNetworkIf {
    public:
-    WiFiTcpAdapter(const char* s, const char* p, uint16_t port) : m_port(port), m_ssid(s), m_pass(p), m_server(port) {}
+
+    WiFiTcpAdapter(const char* s, const char* p, uint16_t port) : m_port(port), m_ssid(s), m_pass(p), m_server(port) {
+    }
 
     bool begin() override {
         // Station mode tweaks
         WiFi.persistent(false);
         WiFi.mode(WIFI_STA);
         WiFi.setSleep(false);
-#ifdef XCP_ON_WIFI_TX_POWER
+    #ifdef XCP_ON_WIFI_TX_POWER
         WiFi.setTxPower(XCP_ON_WIFI_TX_POWER);
-#endif
+    #endif
         Serial.begin(115200);
         while (!Serial) {
             ;
         }
         Serial.println("\nBlueparrot XCP (TCP) on WiFi");
 
         // Optional static IP configuration
-#if defined(XCP_ON_ETHERNET_IP_OCTETS)
+    #if defined(XCP_ON_ETHERNET_IP_OCTETS)
         IPAddress ip(XCP_ON_ETHERNET_IP_OCTETS);
         if (!WiFi.config(ip)) {
             Serial.println("[WiFi] Failed to apply static IP config");
         }
-#elif defined(XCP_ON_ETHERNET_IP)
+    #elif defined(XCP_ON_ETHERNET_IP)
         {
             IPAddress ip;
             ip.fromString(XCP_ON_ETHERNET_IP);
             if (!WiFi.config(ip)) {
                 Serial.println("[WiFi] Failed to apply static IP config (string)");
             }
         }
-#endif
+    #endif
         WiFi.begin(m_ssid, m_pass);
         unsigned long start = millis();
         while (WiFi.status() != WL_CONNECTED && (millis() - start) < 15000UL) {
@@ -657,11 +673,12 @@ class WiFiTcpAdapter : public ArduinoNetworkIf {
     }
 
    private:
-    uint16_t   m_port;
-    const char* m_ssid;
-    const char* m_pass;
-    WiFiServer  m_server;
-    WiFiClient  m_client;
+
+    uint16_t          m_port;
+    const char*       m_ssid;
+    const char*       m_pass;
+    WiFiServer        m_server;
+    WiFiClient        m_client;
     WiFiClientWrapper m_wrapper;
 };
 
@@ -722,9 +739,9 @@ extern "C" {
         /* Initialize backend network adapter and start listening. */
     #if XCP_ON_ETHERNET_ARDUINO_DRIVER == XCP_ON_ETHERNET_DRIVER_WIFI
         #if (XCP_ON_ETHERNET_PROTOCOL == XCP_ON_ETHERNET_USE_TCP)
-            s_net = new WiFiTcpAdapter(XCP_ON_ETHERNET_WIFI_SSID, XCP_ON_ETHERNET_WIFI_PASSWORD, XCP_ON_ETHERNET_PORT);
+        s_net = new WiFiTcpAdapter(XCP_ON_ETHERNET_WIFI_SSID, XCP_ON_ETHERNET_WIFI_PASSWORD, XCP_ON_ETHERNET_PORT);
         #else
-            s_net = new WiFiAdapter(XCP_ON_ETHERNET_WIFI_SSID, XCP_ON_ETHERNET_WIFI_PASSWORD, XCP_ON_ETHERNET_PORT);
+        s_net = new WiFiAdapter(XCP_ON_ETHERNET_WIFI_SSID, XCP_ON_ETHERNET_WIFI_PASSWORD, XCP_ON_ETHERNET_PORT);
         #endif
     #else
         #if defined(XCP_ON_ETHERNET_IP_OCTETS)

tools/arduino/hello_xcp/xcp_config.h

@@ -75,7 +75,7 @@
     #elif defined(TP_ETHER)
         #define XCP_TRANSPORT_LAYER XCP_ON_ETHERNET
 
-        #define XCP_ON_ETHERNET_PROTOCOL    XCP_ON_ETHERNET_USE_UDP
+        #define XCP_ON_ETHERNET_PROTOCOL  XCP_ON_ETHERNET_USE_UDP
         #define XCP_ON_ETHERNET_IP_OCTETS 192, 168, 137, 100
         #define XCP_ON_ETHERNET_PORT      (5555)
 

tools/xcp_config.h

@@ -75,7 +75,7 @@
     #elif defined(TP_ETHER)
         #define XCP_TRANSPORT_LAYER XCP_ON_ETHERNET
 
-        #define XCP_ON_ETHERNET_PROTOCOL    XCP_ON_ETHERNET_USE_UDP
+        #define XCP_ON_ETHERNET_PROTOCOL  XCP_ON_ETHERNET_USE_UDP
         #define XCP_ON_ETHERNET_IP_OCTETS 192, 168, 137, 100
         #define XCP_ON_ETHERNET_PORT      (5555)