ci(pre-commit): Apply automatic fixes

Author: pre-commit-ci-lite[bot]

cores/esp32/esp32-hal-misc.c

@@ -30,7 +30,8 @@
 #endif
 #include <sys/time.h>
 #include "soc/rtc.h"
-#if !defined(CONFIG_IDF_TARGET_ESP32C2) && !defined(CONFIG_IDF_TARGET_ESP32C6) && !defined(CONFIG_IDF_TARGET_ESP32H2) && !defined(CONFIG_IDF_TARGET_ESP32P4) && !defined(CONFIG_IDF_TARGET_ESP32C5)
+#if !defined(CONFIG_IDF_TARGET_ESP32C2) && !defined(CONFIG_IDF_TARGET_ESP32C6) && !defined(CONFIG_IDF_TARGET_ESP32H2) && !defined(CONFIG_IDF_TARGET_ESP32P4) \
+  && !defined(CONFIG_IDF_TARGET_ESP32C5)
 #include "soc/rtc_cntl_reg.h"
 #include "soc/syscon_reg.h"
 #endif

libraries/BLE/src/BLE2902.h

@@ -40,26 +40,26 @@ class BLE2902 : public BLEDescriptor {
 
 // Class declaration for NimBLE (deprecated)
 #if defined(CONFIG_NIMBLE_ENABLED)
-class [[deprecated("NimBLE does not support manually adding 2902 descriptors as they \
+  class [[deprecated("NimBLE does not support manually adding 2902 descriptors as they \
 are automatically added when the characteristic has notifications or indications enabled. \
 Get/Set the notifications/indications properties of the characteristic instead. \
 This class will be removed in a future version.")]] BLE2902 : public BLEDescriptor {
 #endif
 
-public:
-  /***************************************************************************
+  public:
+    /***************************************************************************
    *                         Common public functions                         *
    ***************************************************************************/
 
-  BLE2902();
-  bool getNotifications();
-  bool getIndications();
-  void setNotifications(bool flag);
-  void setIndications(bool flag);
+    BLE2902();
+    bool getNotifications();
+    bool getIndications();
+    void setNotifications(bool flag);
+    void setIndications(bool flag);
 
-private:
-  friend class BLECharacteristic;
-};  // BLE2902
+  private:
+    friend class BLECharacteristic;
+  };  // BLE2902
 
 #endif /* CONFIG_BLUEDROID_ENABLED || CONFIG_NIMBLE_ENABLED */
 #endif /* SOC_BLE_SUPPORTED */

libraries/BLE/src/BLE2904.cpp

@@ -25,9 +25,9 @@
 
 #include "BLE2904.h"
 
-#define BLE2904_UUID 0x2904
-#define BLE2904_DEFAULT_NAMESPACE 1  // 1 = Bluetooth SIG Assigned Numbers
-#define BLE2904_DEFAULT_UNIT 0x2700  // 0x2700 = Unitless
+#define BLE2904_UUID              0x2904
+#define BLE2904_DEFAULT_NAMESPACE 1       // 1 = Bluetooth SIG Assigned Numbers
+#define BLE2904_DEFAULT_UNIT      0x2700  // 0x2700 = Unitless
 
 /***************************************************************************
  *                           Common functions                              *

libraries/BLE/src/BLEAdvertisedDevice.cpp

@@ -24,7 +24,6 @@
  *                           Common includes                               *
  ***************************************************************************/
 
-
 #include <sstream>
 #include "BLEAdvertisedDevice.h"
 #include "BLEUtils.h"
@@ -328,32 +327,32 @@ void BLEAdvertisedDevice::parseAdvertisement(uint8_t *payload, size_t total_len)
 
       switch (ad_type) {
         case ESP_BLE_AD_TYPE_NAME_CMPL:  // 0x09
-        {  // Adv Data Type: ESP_BLE_AD_TYPE_NAME_CMPL
+        {                                // Adv Data Type: ESP_BLE_AD_TYPE_NAME_CMPL
           setName(String(reinterpret_cast<char *>(payload), length));
           break;
         }  // 0x09
 
         case ESP_BLE_AD_TYPE_TX_PWR:  // 0x0A
-        {  // Adv Data Type: ESP_BLE_AD_TYPE_TX_PWR
+        {                             // Adv Data Type: ESP_BLE_AD_TYPE_TX_PWR
           setTXPower(*payload);
           break;
         }  // 0x0A
 
         case ESP_BLE_AD_TYPE_APPEARANCE:  // 0x19
-        {  // Adv Data Type: ESP_BLE_AD_TYPE_APPEARANCE
+        {                                 // Adv Data Type: ESP_BLE_AD_TYPE_APPEARANCE
           setAppearance(*reinterpret_cast<uint16_t *>(payload));
           break;
         }  // 0x19
 
         case ESP_BLE_AD_TYPE_FLAG:  // 0x01
-        {  // Adv Data Type: ESP_BLE_AD_TYPE_FLAG
+        {                           // Adv Data Type: ESP_BLE_AD_TYPE_FLAG
           setAdFlag(*payload);
           break;
         }  // 0x01
 
         case ESP_BLE_AD_TYPE_16SRV_PART:  // 0x02
         case ESP_BLE_AD_TYPE_16SRV_CMPL:  // 0x03
-        {  // Adv Data Type: ESP_BLE_AD_TYPE_16SRV_PART/CMPL
+        {                                 // Adv Data Type: ESP_BLE_AD_TYPE_16SRV_PART/CMPL
           for (int var = 0; var < length / 2; ++var) {
             setServiceUUID(BLEUUID(*reinterpret_cast<uint16_t *>(payload + var * 2)));
           }
@@ -362,21 +361,21 @@ void BLEAdvertisedDevice::parseAdvertisement(uint8_t *payload, size_t total_len)
 
         case ESP_BLE_AD_TYPE_32SRV_PART:  // 0x04
         case ESP_BLE_AD_TYPE_32SRV_CMPL:  // 0x05
-        {  // Adv Data Type: ESP_BLE_AD_TYPE_32SRV_PART/CMPL
+        {                                 // Adv Data Type: ESP_BLE_AD_TYPE_32SRV_PART/CMPL
           for (int var = 0; var < length / 4; ++var) {
             setServiceUUID(BLEUUID(*reinterpret_cast<uint32_t *>(payload + var * 4)));
           }
           break;
         }  // 0x04, 0x05
 
         case ESP_BLE_AD_TYPE_128SRV_CMPL:  // 0x07
-        {  // Adv Data Type: ESP_BLE_AD_TYPE_128SRV_CMPL
+        {                                  // Adv Data Type: ESP_BLE_AD_TYPE_128SRV_CMPL
           setServiceUUID(BLEUUID(payload, 16, false));
           break;
         }  // 0x07
 
         case ESP_BLE_AD_TYPE_128SRV_PART:  // 0x06
-        {  // Adv Data Type: ESP_BLE_AD_TYPE_128SRV_PART
+        {                                  // Adv Data Type: ESP_BLE_AD_TYPE_128SRV_PART
           setServiceUUID(BLEUUID(payload, 16, false));
           break;
         }  // 0x06
@@ -389,7 +388,7 @@ void BLEAdvertisedDevice::parseAdvertisement(uint8_t *payload, size_t total_len)
         }  // 0xFF
 
         case ESP_BLE_AD_TYPE_SERVICE_DATA:  // 0x16
-        {  // Adv Data Type: ESP_BLE_AD_TYPE_SERVICE_DATA - 2 byte UUID
+        {                                   // Adv Data Type: ESP_BLE_AD_TYPE_SERVICE_DATA - 2 byte UUID
           if (length < 2) {
             log_e("Length too small for SERVICE_DATA");
             break;
@@ -403,7 +402,7 @@ void BLEAdvertisedDevice::parseAdvertisement(uint8_t *payload, size_t total_len)
         }  // 0x16
 
         case ESP_BLE_AD_TYPE_32SERVICE_DATA:  // 0x20
-        {  // Adv Data Type: ESP_BLE_AD_TYPE_32SERVICE_DATA - 4 byte UUID
+        {                                     // Adv Data Type: ESP_BLE_AD_TYPE_32SERVICE_DATA - 4 byte UUID
           if (length < 4) {
             log_e("Length too small for 32SERVICE_DATA");
             break;
@@ -417,7 +416,7 @@ void BLEAdvertisedDevice::parseAdvertisement(uint8_t *payload, size_t total_len)
         }  // 0x20
 
         case ESP_BLE_AD_TYPE_128SERVICE_DATA:  // 0x21
-        {  // Adv Data Type: ESP_BLE_AD_TYPE_128SERVICE_DATA - 16 byte UUID
+        {                                      // Adv Data Type: ESP_BLE_AD_TYPE_128SERVICE_DATA - 16 byte UUID
           if (length < 16) {
             log_e("Length too small for 128SERVICE_DATA");
             break;

libraries/BLE/src/BLECharacteristic.cpp

@@ -37,7 +37,7 @@
  *                           Common definitions                            *
  ***************************************************************************/
 
-#define NULL_HANDLE         (0xffff)
+#define NULL_HANDLE (0xffff)
 
 /***************************************************************************
  *                           NimBLE definitions                            *
@@ -927,8 +927,7 @@ int BLECharacteristic::handleGATTServerEvent(uint16_t conn_handle, uint16_t attr
         return 0;
       }
 
-      default:
-        break;
+      default: break;
     }
   }
 
@@ -943,38 +942,38 @@ int BLECharacteristic::handleGATTServerEvent(uint16_t conn_handle, uint16_t attr
  */
 void BLECharacteristic::setSubscribe(struct ble_gap_event *event) {
   ble_gap_conn_desc desc;
-  if(ble_gap_conn_find(event->subscribe.conn_handle, &desc) != 0) {
+  if (ble_gap_conn_find(event->subscribe.conn_handle, &desc) != 0) {
     return;
   }
 
   uint16_t subVal = 0;
-  if(event->subscribe.cur_notify > 0 && (m_properties & BLECharacteristic::PROPERTY_NOTIFY)) {
+  if (event->subscribe.cur_notify > 0 && (m_properties & BLECharacteristic::PROPERTY_NOTIFY)) {
     subVal |= NIMBLE_SUB_NOTIFY;
   }
-  if(event->subscribe.cur_indicate && (m_properties & BLECharacteristic::PROPERTY_INDICATE)) {
+  if (event->subscribe.cur_indicate && (m_properties & BLECharacteristic::PROPERTY_INDICATE)) {
     subVal |= NIMBLE_SUB_INDICATE;
   }
 
   log_i("New subscribe value for conn: %d val: %d", event->subscribe.conn_handle, subVal);
 
-  if(!event->subscribe.cur_indicate && event->subscribe.prev_indicate) {
+  if (!event->subscribe.cur_indicate && event->subscribe.prev_indicate) {
     BLEDevice::getServer()->clearIndicateWait(event->subscribe.conn_handle);
   }
 
   auto it = m_subscribedVec.begin();
-  for(; it != m_subscribedVec.end(); ++it) {
-    if((*it).first == event->subscribe.conn_handle) {
+  for (; it != m_subscribedVec.end(); ++it) {
+    if ((*it).first == event->subscribe.conn_handle) {
       break;
     }
   }
 
-  if(subVal > 0) {
-    if(it == m_subscribedVec.end()) {
+  if (subVal > 0) {
+    if (it == m_subscribedVec.end()) {
       m_subscribedVec.push_back({event->subscribe.conn_handle, subVal});
     } else {
       (*it).second = subVal;
     }
-  } else if(it != m_subscribedVec.end()) {
+  } else if (it != m_subscribedVec.end()) {
     m_subscribedVec.erase(it);
   }
 
@@ -1062,12 +1061,12 @@ void BLECharacteristic::notify(bool is_notification) {
       log_w("- Truncating to %d bytes (maximum notify size)", _mtu - 3);
     }
 
-    if(is_notification && (!(myPair.second & NIMBLE_SUB_NOTIFY))) {
+    if (is_notification && (!(myPair.second & NIMBLE_SUB_NOTIFY))) {
       log_w("Sending notification to client subscribed to indications, sending indication instead");
       is_notification = false;
     }
 
-    if(!is_notification && (!(myPair.second & NIMBLE_SUB_INDICATE))) {
+    if (!is_notification && (!(myPair.second & NIMBLE_SUB_INDICATE))) {
       log_w("Sending indication to client subscribed to notification, sending notification instead");
       is_notification = true;
     }
@@ -1129,7 +1128,7 @@ void BLECharacteristicCallbacks::onWrite(BLECharacteristic *pCharacteristic, ble
   onWrite(pCharacteristic);
 }  // onWrite
 
-void BLECharacteristicCallbacks::onSubscribe(BLECharacteristic* pCharacteristic, ble_gap_conn_desc* desc, uint16_t subValue) {
+void BLECharacteristicCallbacks::onSubscribe(BLECharacteristic *pCharacteristic, ble_gap_conn_desc *desc, uint16_t subValue) {
   log_d(">> onSubscribe: default");
   log_d("<< onSubscribe");
 }  // onSubscribe

libraries/BLE/src/BLEClient.cpp

@@ -181,7 +181,7 @@ bool BLEClient::secureConnection() {
 
 #if defined(CONFIG_NIMBLE_ENABLED)
   int retryCount = 1;
-  BLETaskData taskData(const_cast<BLEClient*>(this), BLE_HS_ENOTCONN);
+  BLETaskData taskData(const_cast<BLEClient *>(this), BLE_HS_ENOTCONN);
   m_pTaskData = &taskData;
 
   do {
@@ -452,8 +452,8 @@ bool BLEClient::connect(BLEAddress address, uint8_t type, uint32_t timeoutMs) {
   errRc = ::esp_ble_gattc_open(
     m_gattc_if,
     getPeerAddress().getNative(),  // address
-    (esp_ble_addr_type_t)type,                           // Note: This was added on 2018-04-03 when the latest ESP-IDF was detected to have changed the signature.
-    1                               // direct connection <-- maybe needs to be changed in case of direct indirect connection???
+    (esp_ble_addr_type_t)type,     // Note: This was added on 2018-04-03 when the latest ESP-IDF was detected to have changed the signature.
+    1                              // direct connection <-- maybe needs to be changed in case of direct indirect connection???
   );
   if (errRc != ESP_OK) {
     log_e("esp_ble_gattc_open: rc=%d %s", errRc, GeneralUtils::errorToString(errRc));
@@ -866,12 +866,11 @@ bool BLEClient::connect(BLEAddress address, uint8_t type, uint32_t timeoutMs) {
  * When a service is found or there is none left or there was an error
  * the API will call this and report findings.
  */
-int BLEClient::serviceDiscoveredCB(uint16_t conn_handle, const struct ble_gatt_error *error, const struct ble_gatt_svc *service, void *arg)
-{
+int BLEClient::serviceDiscoveredCB(uint16_t conn_handle, const struct ble_gatt_error *error, const struct ble_gatt_svc *service, void *arg) {
   log_d("Service Discovered >> status: %d handle: %d", error->status, (error->status == 0) ? service->start_handle : -1);
 
-  BLETaskData *pTaskData = (BLETaskData*)arg;
-  BLEClient *client = (BLEClient*)pTaskData->m_pInstance;
+  BLETaskData *pTaskData = (BLETaskData *)arg;
+  BLEClient *client = (BLEClient *)pTaskData->m_pInstance;
 
   if (error->status == BLE_HS_ENOTCONN) {
     log_e("<< Service Discovered; Disconnected");
@@ -880,13 +879,13 @@ int BLEClient::serviceDiscoveredCB(uint16_t conn_handle, const struct ble_gatt_e
   }
 
   // Make sure the service discovery is for this device
-  if(client->getConnId() != conn_handle){
+  if (client->getConnId() != conn_handle) {
     return 0;
   }
 
-  if(error->status == 0) {
+  if (error->status == 0) {
     // Found a service - add it to the vector
-    BLERemoteService* pRemoteService = new BLERemoteService(client, service);
+    BLERemoteService *pRemoteService = new BLERemoteService(client, service);
     client->m_servicesMap.insert(std::pair<std::string, BLERemoteService *>(pRemoteService->getUUID().toString().c_str(), pRemoteService));
     client->m_servicesMapByInstID.insert(std::pair<BLERemoteService *, uint16_t>(pRemoteService, service->start_handle));
     return 0;
@@ -1018,7 +1017,8 @@ int BLEClient::handleGAPEvent(struct ble_gap_event *event, void *arg) {
       return 0;
     }  // BLE_GAP_EVENT_CONNECT
 
-    case BLE_GAP_EVENT_TERM_FAILURE: {
+    case BLE_GAP_EVENT_TERM_FAILURE:
+    {
       if (client->m_conn_id != event->term_failure.conn_handle) {
         return 0;
       }
@@ -1030,7 +1030,7 @@ int BLEClient::handleGAPEvent(struct ble_gap_event *event, void *arg) {
         ble_gap_terminate(event->term_failure.conn_handle, BLE_ERR_REM_USER_CONN_TERM);
       }
       return 0;
-    } // BLE_GAP_EVENT_TERM_FAILURE
+    }  // BLE_GAP_EVENT_TERM_FAILURE
 
     case BLE_GAP_EVENT_NOTIFY_RX:
     {
@@ -1071,7 +1071,9 @@ int BLEClient::handleGAPEvent(struct ble_gap_event *event, void *arg) {
 
           if (characteristic->second->m_notifyCallback != nullptr) {
             log_d("Invoking callback for notification on characteristic %s", characteristic->second->toString().c_str());
-            characteristic->second->m_notifyCallback(characteristic->second, event->notify_rx.om->om_data, event->notify_rx.om->om_len, !event->notify_rx.indication);
+            characteristic->second->m_notifyCallback(
+              characteristic->second, event->notify_rx.om->om_data, event->notify_rx.om->om_len, !event->notify_rx.indication
+            );
           }
           break;
         }
@@ -1234,7 +1236,7 @@ int BLEClient::disconnect(uint8_t reason) {
   log_d(">> disconnect()");
   int rc = 0;
 
-  if(isConnected()) {
+  if (isConnected()) {
     rc = ble_gap_terminate(m_conn_id, reason);
     if (rc != 0 && rc != BLE_HS_ENOTCONN && rc != BLE_HS_EALREADY) {
       m_lastErr = rc;
@@ -1246,23 +1248,23 @@ int BLEClient::disconnect(uint8_t reason) {
 
   log_d("<< disconnect()");
   return rc;
-} // disconnect
+}  // disconnect
 
 bool BLEClientCallbacks::onConnParamsUpdateRequest(BLEClient *pClient, const ble_gap_upd_params *params) {
   log_d("BLEClientCallbacks", "onConnParamsUpdateRequest: default");
   return true;
 }
 
-uint32_t BLEClientCallbacks::onPassKeyRequest(){
+uint32_t BLEClientCallbacks::onPassKeyRequest() {
   log_d("onPassKeyRequest: default: 123456");
   return 123456;
 }
 
-void BLEClientCallbacks::onAuthenticationComplete(ble_gap_conn_desc* desc){
+void BLEClientCallbacks::onAuthenticationComplete(ble_gap_conn_desc *desc) {
   log_d("onAuthenticationComplete: default");
 }
 
-bool BLEClientCallbacks::onConfirmPIN(uint32_t pin){
+bool BLEClientCallbacks::onConfirmPIN(uint32_t pin) {
   log_d("onConfirmPIN: default: true");
   return true;
 }

libraries/BLE/src/BLEClient.h

@@ -121,10 +121,7 @@ class BLEClient {
 
 #if defined(CONFIG_NIMBLE_ENABLED)
   static int handleGAPEvent(struct ble_gap_event *event, void *arg);
-  static int serviceDiscoveredCB(uint16_t conn_handle,
-                               const struct ble_gatt_error *error,
-                               const struct ble_gatt_svc *service,
-                               void *arg);
+  static int serviceDiscoveredCB(uint16_t conn_handle, const struct ble_gatt_error *error, const struct ble_gatt_svc *service, void *arg);
 #endif
 
 private:
@@ -213,7 +210,7 @@ class BLEClientCallbacks {
 #if defined(CONFIG_NIMBLE_ENABLED)
   virtual bool onConnParamsUpdateRequest(BLEClient *pClient, const ble_gap_upd_params *params);
   virtual uint32_t onPassKeyRequest();
-  virtual void onAuthenticationComplete(ble_gap_conn_desc* desc);
+  virtual void onAuthenticationComplete(ble_gap_conn_desc *desc);
   virtual bool onConfirmPIN(uint32_t pin);
 #endif
 };

libraries/BLE/src/BLEDescriptorMap.cpp

@@ -149,7 +149,6 @@ String BLEDescriptorMap::toString() {
   return res;
 }  // toString
 
-
 /**
  * @brief Get the first descriptor in the map.
  * @return The first descriptor in the map.