refactor(style): Apply style changes

Author: lucasssvaz

cores/esp32/Arduino.h

@@ -41,95 +41,97 @@
 #include "binary.h"
 #include "extra_attr.h"
 
-#define PI 3.1415926535897932384626433832795
-#define HALF_PI 1.5707963267948966192313216916398
-#define TWO_PI 6.283185307179586476925286766559
+#define PI         3.1415926535897932384626433832795
+#define HALF_PI    1.5707963267948966192313216916398
+#define TWO_PI     6.283185307179586476925286766559
 #define DEG_TO_RAD 0.017453292519943295769236907684886
 #define RAD_TO_DEG 57.295779513082320876798154814105
-#define EULER 2.718281828459045235360287471352
+#define EULER      2.718281828459045235360287471352
 
-#define SERIAL 0x0
+#define SERIAL  0x0
 #define DISPLAY 0x1
 
 #define LSBFIRST 0
 #define MSBFIRST 1
 
 //Interrupt Modes
-#define RISING 0x01
-#define FALLING 0x02
-#define CHANGE 0x03
-#define ONLOW 0x04
-#define ONHIGH 0x05
-#define ONLOW_WE 0x0C
+#define RISING    0x01
+#define FALLING   0x02
+#define CHANGE    0x03
+#define ONLOW     0x04
+#define ONHIGH    0x05
+#define ONLOW_WE  0x0C
 #define ONHIGH_WE 0x0D
 
-#define DEFAULT 1
+#define DEFAULT  1
 #define EXTERNAL 0
 
 #ifndef __STRINGIFY
 #define __STRINGIFY(a) #a
 #endif
 
 // can't define max() / min() because of conflicts with C++
-#define _min(a, b) ((a) < (b) ? (a) : (b))
-#define _max(a, b) ((a) > (b) ? (a) : (b))
-#define _abs(x) ((x) > 0 ? (x) : -(x))  // abs() comes from STL
+#define _min(a, b)                ((a) < (b) ? (a) : (b))
+#define _max(a, b)                ((a) > (b) ? (a) : (b))
+#define _abs(x)                   ((x) > 0 ? (x) : -(x))  // abs() comes from STL
 #define constrain(amt, low, high) ((amt) < (low) ? (low) : ((amt) > (high) ? (high) : (amt)))
-#define _round(x) ((x) >= 0 ? (long)((x) + 0.5) : (long)((x)-0.5))  // round() comes from STL
-#define radians(deg) ((deg)*DEG_TO_RAD)
-#define degrees(rad) ((rad)*RAD_TO_DEG)
-#define sq(x) ((x) * (x))
+#define _round(x)                 ((x) >= 0 ? (long)((x) + 0.5) : (long)((x) - 0.5))  // round() comes from STL
+#define radians(deg)              ((deg) * DEG_TO_RAD)
+#define degrees(rad)              ((rad) * RAD_TO_DEG)
+#define sq(x)                     ((x) * (x))
 
 // ESP32xx runs FreeRTOS... disabling interrupts can lead to issues, such as Watchdog Timeout
-#define sei() portENABLE_INTERRUPTS()
-#define cli() portDISABLE_INTERRUPTS()
-#define interrupts() sei()
+#define sei()          portENABLE_INTERRUPTS()
+#define cli()          portDISABLE_INTERRUPTS()
+#define interrupts()   sei()
 #define noInterrupts() cli()
 
-#define clockCyclesPerMicrosecond() ((long int)getCpuFrequencyMhz())
+#define clockCyclesPerMicrosecond()  ((long int)getCpuFrequencyMhz())
 #define clockCyclesToMicroseconds(a) ((a) / clockCyclesPerMicrosecond())
-#define microsecondsToClockCycles(a) ((a)*clockCyclesPerMicrosecond())
+#define microsecondsToClockCycles(a) ((a) * clockCyclesPerMicrosecond())
 
-#define lowByte(w) ((uint8_t)((w)&0xff))
+#define lowByte(w)  ((uint8_t)((w) & 0xff))
 #define highByte(w) ((uint8_t)((w) >> 8))
 
-#define bitRead(value, bit) (((value) >> (bit)) & 0x01)
-#define bitSet(value, bit) ((value) |= (1UL << (bit)))
-#define bitClear(value, bit) ((value) &= ~(1UL << (bit)))
-#define bitToggle(value, bit) ((value) ^= (1UL << (bit)))
+#define bitRead(value, bit)            (((value) >> (bit)) & 0x01)
+#define bitSet(value, bit)             ((value) |= (1UL << (bit)))
+#define bitClear(value, bit)           ((value) &= ~(1UL << (bit)))
+#define bitToggle(value, bit)          ((value) ^= (1UL << (bit)))
 #define bitWrite(value, bit, bitvalue) ((bitvalue) ? bitSet(value, bit) : bitClear(value, bit))
 
 // avr-libc defines _NOP() since 1.6.2
 #ifndef _NOP
-#define _NOP() \
-  do { __asm__ volatile("nop"); } while (0)
+#define _NOP()               \
+  do {                       \
+    __asm__ volatile("nop"); \
+  } while (0)
 #endif
 
 #define bit(b) (1UL << (b))
 #define _BV(b) (1UL << (b))
 
 #define digitalPinToTimer(pin) (0)
-#define analogInPinToBit(P) (P)
+#define analogInPinToBit(P)    (P)
 #if SOC_GPIO_PIN_COUNT <= 32
-#define digitalPinToPort(pin) (0)
+#define digitalPinToPort(pin)    (0)
 #define digitalPinToBitMask(pin) (1UL << digitalPinToGPIONumber(pin))
-#define portOutputRegister(port) ((volatile uint32_t*)GPIO_OUT_REG)
-#define portInputRegister(port) ((volatile uint32_t*)GPIO_IN_REG)
-#define portModeRegister(port) ((volatile uint32_t*)GPIO_ENABLE_REG)
+#define portOutputRegister(port) ((volatile uint32_t *)GPIO_OUT_REG)
+#define portInputRegister(port)  ((volatile uint32_t *)GPIO_IN_REG)
+#define portModeRegister(port)   ((volatile uint32_t *)GPIO_ENABLE_REG)
 #elif SOC_GPIO_PIN_COUNT <= 64
-#define digitalPinToPort(pin) ((digitalPinToGPIONumber(pin) > 31) ? 1 : 0)
+#define digitalPinToPort(pin)    ((digitalPinToGPIONumber(pin) > 31) ? 1 : 0)
 #define digitalPinToBitMask(pin) (1UL << (digitalPinToGPIONumber(pin) & 31))
-#define portOutputRegister(port) ((volatile uint32_t*)((port) ? GPIO_OUT1_REG : GPIO_OUT_REG))
-#define portInputRegister(port) ((volatile uint32_t*)((port) ? GPIO_IN1_REG : GPIO_IN_REG))
-#define portModeRegister(port) ((volatile uint32_t*)((port) ? GPIO_ENABLE1_REG : GPIO_ENABLE_REG))
+#define portOutputRegister(port) ((volatile uint32_t *)((port) ? GPIO_OUT1_REG : GPIO_OUT_REG))
+#define portInputRegister(port)  ((volatile uint32_t *)((port) ? GPIO_IN1_REG : GPIO_IN_REG))
+#define portModeRegister(port)   ((volatile uint32_t *)((port) ? GPIO_ENABLE1_REG : GPIO_ENABLE_REG))
 #else
 #error SOC_GPIO_PIN_COUNT > 64 not implemented
 #endif
 
-#define NOT_A_PIN -1
-#define NOT_A_PORT -1
+#define NOT_A_PIN        -1
+#define NOT_A_PORT       -1
 #define NOT_AN_INTERRUPT -1
-#define NOT_ON_TIMER 0
+#define NOT_ON_TIMER     0
 
 // some defines generic for all SoC moved from variants/board_name/pins_arduino.h
 #define NUM_DIGITAL_PINS SOC_GPIO_PIN_COUNT  // All GPIOs
@@ -138,10 +140,10 @@
 #elif SOC_ADC_PERIPH_NUM == 2
 #define NUM_ANALOG_INPUTS (SOC_ADC_CHANNEL_NUM(0) + SOC_ADC_CHANNEL_NUM(1))  // Depends on the SoC (ESP32, ESP32S2, ESP32S3, ESP32C3)
 #endif
-#define EXTERNAL_NUM_INTERRUPTS NUM_DIGITAL_PINS  // All GPIOs
+#define EXTERNAL_NUM_INTERRUPTS    NUM_DIGITAL_PINS  // All GPIOs
 #define analogInputToDigitalPin(p) (((p) < NUM_ANALOG_INPUTS) ? (analogChannelToDigitalPin(p)) : -1)
-#define digitalPinToInterrupt(p) ((((uint8_t)digitalPinToGPIONumber(p)) < NUM_DIGITAL_PINS) ? digitalPinToGPIONumber(p) : NOT_AN_INTERRUPT)
-#define digitalPinHasPWM(p) (((uint8_t)digitalPinToGPIONumber(p)) < NUM_DIGITAL_PINS)
+#define digitalPinToInterrupt(p)   ((((uint8_t)digitalPinToGPIONumber(p)) < NUM_DIGITAL_PINS) ? digitalPinToGPIONumber(p) : NOT_AN_INTERRUPT)
+#define digitalPinHasPWM(p)        (((uint8_t)digitalPinToGPIONumber(p)) < NUM_DIGITAL_PINS)
 
 typedef bool boolean;
 typedef uint8_t byte;
@@ -170,15 +172,15 @@ long map(long, long, long, long, long);
 extern "C" {
 #endif
 
-  void init(void);
-  void initVariant(void);
-  void initArduino(void);
+void init(void);
+void initVariant(void);
+void initArduino(void);
 
-  unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout);
-  unsigned long pulseInLong(uint8_t pin, uint8_t state, unsigned long timeout);
+unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout);
+unsigned long pulseInLong(uint8_t pin, uint8_t state, unsigned long timeout);
 
-  uint8_t shiftIn(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder);
-  void shiftOut(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder, uint8_t val);
+uint8_t shiftIn(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder);
+void shiftOut(uint8_t dataPin, uint8_t clockPin, uint8_t bitOrder, uint8_t val);
 
 #ifdef __cplusplus
 }
@@ -212,29 +214,33 @@ uint16_t makeWord(uint8_t h, uint8_t l);
 #define word(...) makeWord(__VA_ARGS__)
 
 size_t getArduinoLoopTaskStackSize(void);
-#define SET_LOOP_TASK_STACK_SIZE(sz) \
-  size_t getArduinoLoopTaskStackSize() { return sz; }
+#define SET_LOOP_TASK_STACK_SIZE(sz)     \
+  size_t getArduinoLoopTaskStackSize() { \
+    return sz;                           \
+  }
 
 bool shouldPrintChipDebugReport(void);
-#define ENABLE_CHIP_DEBUG_REPORT \
-  bool shouldPrintChipDebugReport(void) { return true; }
+#define ENABLE_CHIP_DEBUG_REPORT          \
+  bool shouldPrintChipDebugReport(void) { \
+    return true;                          \
+  }
 
 // allows user to bypass esp_spiram_test()
 bool esp_psram_extram_test(void);
-#define BYPASS_SPIRAM_TEST(bypass) \
-  bool testSPIRAM(void) { \
-    if (bypass) return true; \
-    else return esp_psram_extram_test(); \
+#define BYPASS_SPIRAM_TEST(bypass)    \
+  bool testSPIRAM(void) {             \
+    if (bypass)                       \
+      return true;                    \
+    else                              \
+      return esp_psram_extram_test(); \
   }
 
 unsigned long pulseIn(uint8_t pin, uint8_t state, unsigned long timeout = 1000000L);
 unsigned long pulseInLong(uint8_t pin, uint8_t state, unsigned long timeout = 1000000L);
 
-extern "C" bool getLocalTime(struct tm* info, uint32_t ms = 5000);
-extern "C" void configTime(long gmtOffset_sec, int daylightOffset_sec,
-                           const char* server1, const char* server2 = nullptr, const char* server3 = nullptr);
-extern "C" void configTzTime(const char* tz,
-                             const char* server1, const char* server2 = nullptr, const char* server3 = nullptr);
+extern "C" bool getLocalTime(struct tm *info, uint32_t ms = 5000);
+extern "C" void configTime(long gmtOffset_sec, int daylightOffset_sec, const char *server1, const char *server2 = nullptr, const char *server3 = nullptr);
+extern "C" void configTzTime(const char *tz, const char *server1, const char *server2 = nullptr, const char *server3 = nullptr);
 
 void setToneChannel(uint8_t channel = 0);
 void tone(uint8_t _pin, unsigned int frequency, unsigned long duration = 0);

cores/esp32/Client.h

@@ -37,6 +37,7 @@ class Client : public Stream {
   virtual void stop() = 0;
   virtual uint8_t connected() = 0;
   virtual operator bool() = 0;
+
 protected:
   uint8_t *rawIPAddress(IPAddress &addr) {
     return addr.raw_address();

cores/esp32/Esp.cpp

@@ -72,7 +72,7 @@ extern "C" {
 
 #if CONFIG_IDF_TARGET_ESP32S3 || CONFIG_IDF_TARGET_ESP32C3
 #ifndef REG_SPI_BASE
-#define REG_SPI_BASE(i) (DR_REG_SPI1_BASE + (((i) > 1) ? (((i)*0x1000) + 0x20000) : (((~(i)) & 1) * 0x1000)))
+#define REG_SPI_BASE(i) (DR_REG_SPI1_BASE + (((i) > 1) ? (((i) * 0x1000) + 0x20000) : (((~(i)) & 1) * 0x1000)))
 #endif  // REG_SPI_BASE
 #endif  // TARGET
 
@@ -119,7 +119,6 @@ unsigned long long operator"" _GB(unsigned long long x) {
   return x * 1024 * 1024 * 1024;
 }
 
-
 EspClass ESP;
 
 void EspClass::deepSleep(uint64_t time_us) {
@@ -177,7 +176,9 @@ uint32_t EspClass::getMaxAllocPsram(void) {
 static uint32_t sketchSize(sketchSize_t response) {
   esp_image_metadata_t data;
   const esp_partition_t *running = esp_ota_get_running_partition();
-  if (!running) return 0;
+  if (!running) {
+    return 0;
+  }
   const esp_partition_pos_t running_pos = {
     .offset = running->address,
     .size = running->size,
@@ -260,39 +261,31 @@ const char *EspClass::getChipModel(void) {
   uint32_t pkg_ver = chip_ver & 0x7;
   switch (pkg_ver) {
     case EFUSE_RD_CHIP_VER_PKG_ESP32D0WDQ6:
-      if (getChipRevision() == 3)
+      if (getChipRevision() == 3) {
         return "ESP32-D0WDQ6-V3";
-      else
+      } else {
         return "ESP32-D0WDQ6";
+      }
     case EFUSE_RD_CHIP_VER_PKG_ESP32D0WDQ5:
-      if (getChipRevision() == 3)
+      if (getChipRevision() == 3) {
         return "ESP32-D0WD-V3";
-      else
+      } else {
         return "ESP32-D0WD";
-    case EFUSE_RD_CHIP_VER_PKG_ESP32D2WDQ5:
-      return "ESP32-D2WD";
-    case EFUSE_RD_CHIP_VER_PKG_ESP32PICOD2:
-      return "ESP32-PICO-D2";
-    case EFUSE_RD_CHIP_VER_PKG_ESP32PICOD4:
-      return "ESP32-PICO-D4";
-    case EFUSE_RD_CHIP_VER_PKG_ESP32PICOV302:
-      return "ESP32-PICO-V3-02";
-    case EFUSE_RD_CHIP_VER_PKG_ESP32D0WDR2V3:
-      return "ESP32-D0WDR2-V3";
-    default:
-      return "Unknown";
+      }
+    case EFUSE_RD_CHIP_VER_PKG_ESP32D2WDQ5:   return "ESP32-D2WD";
+    case EFUSE_RD_CHIP_VER_PKG_ESP32PICOD2:   return "ESP32-PICO-D2";
+    case EFUSE_RD_CHIP_VER_PKG_ESP32PICOD4:   return "ESP32-PICO-D4";
+    case EFUSE_RD_CHIP_VER_PKG_ESP32PICOV302: return "ESP32-PICO-V3-02";
+    case EFUSE_RD_CHIP_VER_PKG_ESP32D0WDR2V3: return "ESP32-D0WDR2-V3";
+    default:                                  return "Unknown";
   }
 #elif CONFIG_IDF_TARGET_ESP32S2
   uint32_t pkg_ver = REG_GET_FIELD(EFUSE_RD_MAC_SPI_SYS_3_REG, EFUSE_PKG_VERSION);
   switch (pkg_ver) {
-    case 0:
-      return "ESP32-S2";
-    case 1:
-      return "ESP32-S2FH16";
-    case 2:
-      return "ESP32-S2FH32";
-    default:
-      return "ESP32-S2 (Unknown)";
+    case 0:  return "ESP32-S2";
+    case 1:  return "ESP32-S2FH16";
+    case 2:  return "ESP32-S2FH32";
+    default: return "ESP32-S2 (Unknown)";
   }
 #else
   esp_chip_info_t chip_info;
@@ -303,7 +296,7 @@ const char *EspClass::getChipModel(void) {
     case CHIP_ESP32C2: return "ESP32-C2";
     case CHIP_ESP32C6: return "ESP32-C6";
     case CHIP_ESP32H2: return "ESP32-H2";
-    default: return "UNKNOWN";
+    default:           return "UNKNOWN";
   }
 #endif
 }
@@ -414,7 +407,6 @@ uint32_t EspClass::magicFlashChipSpeed(uint8_t byte) {
       return 0;
   }
 
-
 #elif CONFIG_IDF_TARGET_ESP32C6
   /*
    FLASH_FREQUENCY = {
@@ -449,7 +441,6 @@ uint32_t EspClass::magicFlashChipSpeed(uint8_t byte) {
       return 0;
   }
 
-
 #else
   /*
     FLASH_FREQUENCY = {
@@ -470,7 +461,6 @@ uint32_t EspClass::magicFlashChipSpeed(uint8_t byte) {
 #endif
 }
 
-
 FlashMode_t EspClass::magicFlashChipMode(uint8_t byte) {
   FlashMode_t mode = (FlashMode_t)byte;
   if (mode > FM_SLOW_READ) {

cores/esp32/Esp.h

@@ -42,7 +42,6 @@ typedef enum {
   WDTO_8S = 8000     //!< WDTO_8S
 } WDTO_t;
 
-
 typedef enum {
   FM_QIO = 0x00,
   FM_QOUT = 0x01,

cores/esp32/FirmwareMSC.cpp

@@ -310,7 +310,8 @@ static int32_t msc_write(uint32_t lba, uint32_t offset, uint8_t *buffer, uint32_
         return 0;
       }
     } else if (msc_update_state == MSC_UPDATE_RUNNING) {
-      if (msc_update_entry && msc_update_entry->file_size && msc_update_bytes_written < msc_update_entry->file_size && (msc_update_bytes_written + bufsize) >= msc_update_entry->file_size) {
+      if (msc_update_entry && msc_update_entry->file_size && msc_update_bytes_written < msc_update_entry->file_size
+          && (msc_update_bytes_written + bufsize) >= msc_update_entry->file_size) {
         bufsize = msc_update_entry->file_size - msc_update_bytes_written;
       }
       if (msc_update_write(msc_ota_partition, ((lba - msc_update_start_sector) * DISK_SECTOR_SIZE) + offset, buffer, bufsize) == ESP_OK) {
@@ -369,8 +370,7 @@ static void msc_task(void *pvParameters) {
   vTaskDelete(NULL);
 }
 
-FirmwareMSC::FirmwareMSC()
-  : msc() {}
+FirmwareMSC::FirmwareMSC() : msc() {}
 
 FirmwareMSC::~FirmwareMSC() {
   end();