add a .clang-format file (#9154)

src/detect/LoRaRadioType.h

@@ -1,17 +1,17 @@
 #pragma once
 
 enum LoRaRadioType {
-    NO_RADIO,
-    STM32WLx_RADIO,
-    SIM_RADIO,
-    RF95_RADIO,
-    SX1262_RADIO,
-    SX1268_RADIO,
-    LLCC68_RADIO,
-    SX1280_RADIO,
-    LR1110_RADIO,
-    LR1120_RADIO,
-    LR1121_RADIO
+  NO_RADIO,
+  STM32WLx_RADIO,
+  SIM_RADIO,
+  RF95_RADIO,
+  SX1262_RADIO,
+  SX1268_RADIO,
+  LLCC68_RADIO,
+  SX1280_RADIO,
+  LR1110_RADIO,
+  LR1120_RADIO,
+  LR1121_RADIO
 };
 
 extern LoRaRadioType radioType;

src/detect/ScanI2C.cpp

@@ -8,82 +8,60 @@ ScanI2C::ScanI2C() = default;
 void ScanI2C::scanPort(ScanI2C::I2CPort port) {}
 void ScanI2C::scanPort(ScanI2C::I2CPort port, uint8_t *address, uint8_t asize) {}
 
-void ScanI2C::setSuppressScreen()
-{
-    shouldSuppressScreen = true;
-}
+void ScanI2C::setSuppressScreen() { shouldSuppressScreen = true; }
 
-ScanI2C::FoundDevice ScanI2C::firstScreen() const
-{
-    // Allow to override the scanner results for screen
-    if (shouldSuppressScreen)
-        return DEVICE_NONE;
-
-    ScanI2C::DeviceType types[] = {SCREEN_SSD1306, SCREEN_SH1106, SCREEN_ST7567, SCREEN_UNKNOWN};
-    return firstOfOrNONE(4, types);
-}
-
-ScanI2C::FoundDevice ScanI2C::firstRTC() const
-{
-    ScanI2C::DeviceType types[] = {RTC_RV3028, RTC_PCF8563, RTC_PCF85063, RTC_RX8130CE};
-    return firstOfOrNONE(4, types);
-}
-
-ScanI2C::FoundDevice ScanI2C::firstKeyboard() const
-{
-    ScanI2C::DeviceType types[] = {CARDKB, TDECKKB, BBQ10KB, RAK14004, MPR121KB, TCA8418KB};
-    return firstOfOrNONE(6, types);
-}
-
-ScanI2C::FoundDevice ScanI2C::firstAccelerometer() const
-{
-    ScanI2C::DeviceType types[] = {MPU6050, LIS3DH, BMA423, LSM6DS3, BMX160, STK8BAXX, ICM20948, QMA6100P, BMM150};
-    return firstOfOrNONE(9, types);
-}
-
-ScanI2C::FoundDevice ScanI2C::firstAQI() const
-{
-    ScanI2C::DeviceType types[] = {PMSA0031, SCD4X};
-    return firstOfOrNONE(2, types);
-}
-
-ScanI2C::FoundDevice ScanI2C::firstRGBLED() const
-{
-    ScanI2C::DeviceType types[] = {NCP5623, LP5562};
-    return firstOfOrNONE(2, types);
-}
-
-ScanI2C::FoundDevice ScanI2C::find(ScanI2C::DeviceType) const
-{
+ScanI2C::FoundDevice ScanI2C::firstScreen() const {
+  // Allow to override the scanner results for screen
+  if (shouldSuppressScreen)
     return DEVICE_NONE;
+
+  ScanI2C::DeviceType types[] = {SCREEN_SSD1306, SCREEN_SH1106, SCREEN_ST7567, SCREEN_UNKNOWN};
+  return firstOfOrNONE(4, types);
 }
 
-bool ScanI2C::exists(ScanI2C::DeviceType) const
-{
-    return false;
+ScanI2C::FoundDevice ScanI2C::firstRTC() const {
+  ScanI2C::DeviceType types[] = {RTC_RV3028, RTC_PCF8563, RTC_PCF85063, RTC_RX8130CE};
+  return firstOfOrNONE(4, types);
 }
 
-ScanI2C::FoundDevice ScanI2C::firstOfOrNONE(size_t count, ScanI2C::DeviceType *types) const
-{
-    return DEVICE_NONE;
+ScanI2C::FoundDevice ScanI2C::firstKeyboard() const {
+  ScanI2C::DeviceType types[] = {CARDKB, TDECKKB, BBQ10KB, RAK14004, MPR121KB, TCA8418KB};
+  return firstOfOrNONE(6, types);
 }
 
-size_t ScanI2C::countDevices() const
-{
-    return 0;
+ScanI2C::FoundDevice ScanI2C::firstAccelerometer() const {
+  ScanI2C::DeviceType types[] = {MPU6050, LIS3DH, BMA423, LSM6DS3, BMX160, STK8BAXX, ICM20948, QMA6100P, BMM150};
+  return firstOfOrNONE(9, types);
 }
 
+ScanI2C::FoundDevice ScanI2C::firstAQI() const {
+  ScanI2C::DeviceType types[] = {PMSA0031, SCD4X};
+  return firstOfOrNONE(2, types);
+}
+
+ScanI2C::FoundDevice ScanI2C::firstRGBLED() const {
+  ScanI2C::DeviceType types[] = {NCP5623, LP5562};
+  return firstOfOrNONE(2, types);
+}
+
+ScanI2C::FoundDevice ScanI2C::find(ScanI2C::DeviceType) const { return DEVICE_NONE; }
+
+bool ScanI2C::exists(ScanI2C::DeviceType) const { return false; }
+
+ScanI2C::FoundDevice ScanI2C::firstOfOrNONE(size_t count, ScanI2C::DeviceType *types) const { return DEVICE_NONE; }
+
+size_t ScanI2C::countDevices() const { return 0; }
+
 ScanI2C::DeviceAddress::DeviceAddress(ScanI2C::I2CPort port, uint8_t address) : port(port), address(address) {}
 
 ScanI2C::DeviceAddress::DeviceAddress() : DeviceAddress(I2CPort::NO_I2C, 0) {}
 
-bool ScanI2C::DeviceAddress::operator<(const ScanI2C::DeviceAddress &other) const
-{
-    return
-        // If this one has no port and other has a port
-        (port == NO_I2C && other.port != NO_I2C)
-        // if both have a port and this one's address is lower
-        || (port != NO_I2C && other.port != NO_I2C && (address < other.address));
+bool ScanI2C::DeviceAddress::operator<(const ScanI2C::DeviceAddress &other) const {
+  return
+      // If this one has no port and other has a port
+      (port == NO_I2C && other.port != NO_I2C)
+      // if both have a port and this one's address is lower
+      || (port != NO_I2C && other.port != NO_I2C && (address < other.address));
 }
 
 ScanI2C::FoundDevice::FoundDevice(ScanI2C::DeviceType type, ScanI2C::DeviceAddress address) : type(type), address(address) {}

src/detect/ScanI2C.h

@@ -3,156 +3,155 @@
 #include <stddef.h>
 #include <stdint.h>
 
-class ScanI2C
-{
-  public:
-    typedef enum DeviceType {
-        NONE,
-        SCREEN_SSD1306,
-        SCREEN_SH1106,
-        SCREEN_UNKNOWN, // has the same address as the two above but does not respond to the same commands
-        SCREEN_ST7567,
-        RTC_RV3028,
-        RTC_PCF8563,
-        RTC_PCF85063,
-        RTC_RX8130CE,
-        CARDKB,
-        TDECKKB,
-        BBQ10KB,
-        RAK14004,
-        PMU_AXP192_AXP2101, // has the same adress as the TCA8418KB
-        BME_680,
-        BME_280,
-        BMP_280,
-        BMP_085,
-        BMP_3XX,
-        INA260,
-        INA219,
-        INA3221,
-        MAX17048,
-        MCP9808,
-        SHT31,
-        SHT4X,
-        SHTC3,
-        LPS22HB,
-        QMC6310,
-        QMI8658,
-        QMC5883L,
-        HMC5883L,
-        PMSA0031,
-        QMA6100P,
-        MPU6050,
-        LIS3DH,
-        BMA423,
-        BQ24295,
-        LSM6DS3,
-        TCA9535,
-        TCA9555,
-        VEML7700,
-        RCWL9620,
-        NCP5623,
-        LP5562,
-        TSL2591,
-        OPT3001,
-        MLX90632,
-        MLX90614,
-        AHT10,
-        BMX160,
-        DFROBOT_LARK,
-        NAU7802,
-        FT6336U,
-        STK8BAXX,
-        ICM20948,
-        SCD4X,
-        MAX30102,
-        TPS65233,
-        MPR121KB,
-        CGRADSENS,
-        INA226,
-        NXP_SE050,
-        DFROBOT_RAIN,
-        DPS310,
-        LTR390UV,
-        RAK12035,
-        TCA8418KB,
-        PCT2075,
-        CST328,
-        BQ25896,
-        BQ27220,
-        LTR553ALS,
-        BHI260AP,
-        BMM150,
-        TSL2561,
-        DRV2605,
-        BH1750,
-        DA217,
-        CHSC6X,
-        CST226SE
-    } DeviceType;
+class ScanI2C {
+public:
+  typedef enum DeviceType {
+    NONE,
+    SCREEN_SSD1306,
+    SCREEN_SH1106,
+    SCREEN_UNKNOWN, // has the same address as the two above but does not respond to the same commands
+    SCREEN_ST7567,
+    RTC_RV3028,
+    RTC_PCF8563,
+    RTC_PCF85063,
+    RTC_RX8130CE,
+    CARDKB,
+    TDECKKB,
+    BBQ10KB,
+    RAK14004,
+    PMU_AXP192_AXP2101, // has the same adress as the TCA8418KB
+    BME_680,
+    BME_280,
+    BMP_280,
+    BMP_085,
+    BMP_3XX,
+    INA260,
+    INA219,
+    INA3221,
+    MAX17048,
+    MCP9808,
+    SHT31,
+    SHT4X,
+    SHTC3,
+    LPS22HB,
+    QMC6310,
+    QMI8658,
+    QMC5883L,
+    HMC5883L,
+    PMSA0031,
+    QMA6100P,
+    MPU6050,
+    LIS3DH,
+    BMA423,
+    BQ24295,
+    LSM6DS3,
+    TCA9535,
+    TCA9555,
+    VEML7700,
+    RCWL9620,
+    NCP5623,
+    LP5562,
+    TSL2591,
+    OPT3001,
+    MLX90632,
+    MLX90614,
+    AHT10,
+    BMX160,
+    DFROBOT_LARK,
+    NAU7802,
+    FT6336U,
+    STK8BAXX,
+    ICM20948,
+    SCD4X,
+    MAX30102,
+    TPS65233,
+    MPR121KB,
+    CGRADSENS,
+    INA226,
+    NXP_SE050,
+    DFROBOT_RAIN,
+    DPS310,
+    LTR390UV,
+    RAK12035,
+    TCA8418KB,
+    PCT2075,
+    CST328,
+    BQ25896,
+    BQ27220,
+    LTR553ALS,
+    BHI260AP,
+    BMM150,
+    TSL2561,
+    DRV2605,
+    BH1750,
+    DA217,
+    CHSC6X,
+    CST226SE
+  } DeviceType;
 
-    // typedef uint8_t DeviceAddress;
-    typedef enum I2CPort {
-        NO_I2C,
-        WIRE,
-        WIRE1,
-    } I2CPort;
+  // typedef uint8_t DeviceAddress;
+  typedef enum I2CPort {
+    NO_I2C,
+    WIRE,
+    WIRE1,
+  } I2CPort;
 
-    typedef struct DeviceAddress {
-        // set default values for ADDRESS_NONE
-        I2CPort port = I2CPort::NO_I2C;
-        uint8_t address = 0;
+  typedef struct DeviceAddress {
+    // set default values for ADDRESS_NONE
+    I2CPort port = I2CPort::NO_I2C;
+    uint8_t address = 0;
 
-        explicit DeviceAddress(I2CPort port, uint8_t address);
-        DeviceAddress();
+    explicit DeviceAddress(I2CPort port, uint8_t address);
+    DeviceAddress();
 
-        bool operator<(const DeviceAddress &other) const;
-    } DeviceAddress;
+    bool operator<(const DeviceAddress &other) const;
+  } DeviceAddress;
 
-    static const DeviceAddress ADDRESS_NONE;
+  static const DeviceAddress ADDRESS_NONE;
 
-    typedef uint8_t RegisterAddress;
+  typedef uint8_t RegisterAddress;
 
-    typedef struct FoundDevice {
-        DeviceType type;
-        DeviceAddress address;
+  typedef struct FoundDevice {
+    DeviceType type;
+    DeviceAddress address;
 
-        explicit FoundDevice(DeviceType = DeviceType::NONE, DeviceAddress = ADDRESS_NONE);
-    } FoundDevice;
+    explicit FoundDevice(DeviceType = DeviceType::NONE, DeviceAddress = ADDRESS_NONE);
+  } FoundDevice;
 
-    static const FoundDevice DEVICE_NONE;
+  static const FoundDevice DEVICE_NONE;
 
-  public:
-    ScanI2C();
+public:
+  ScanI2C();
 
-    virtual void scanPort(ScanI2C::I2CPort);
-    virtual void scanPort(ScanI2C::I2CPort, uint8_t *, uint8_t);
+  virtual void scanPort(ScanI2C::I2CPort);
+  virtual void scanPort(ScanI2C::I2CPort, uint8_t *, uint8_t);
 
-    /*
-     * A bit of a hack, this tells the scanner not to tell later systems there is a screen to avoid enabling it.
-     */
-    void setSuppressScreen();
+  /*
+   * A bit of a hack, this tells the scanner not to tell later systems there is a screen to avoid enabling it.
+   */
+  void setSuppressScreen();
 
-    FoundDevice firstScreen() const;
+  FoundDevice firstScreen() const;
 
-    FoundDevice firstRTC() const;
+  FoundDevice firstRTC() const;
 
-    FoundDevice firstKeyboard() const;
+  FoundDevice firstKeyboard() const;
 
-    FoundDevice firstAccelerometer() const;
+  FoundDevice firstAccelerometer() const;
 
-    FoundDevice firstAQI() const;
+  FoundDevice firstAQI() const;
 
-    FoundDevice firstRGBLED() const;
+  FoundDevice firstRGBLED() const;
 
-    virtual FoundDevice find(DeviceType) const;
+  virtual FoundDevice find(DeviceType) const;
 
-    virtual bool exists(DeviceType) const;
+  virtual bool exists(DeviceType) const;
 
-    virtual size_t countDevices() const;
+  virtual size_t countDevices() const;
 
-  protected:
-    virtual FoundDevice firstOfOrNONE(size_t, DeviceType[]) const;
+protected:
+  virtual FoundDevice firstOfOrNONE(size_t, DeviceType[]) const;
 
-  private:
-    bool shouldSuppressScreen = false;
+private:
+  bool shouldSuppressScreen = false;
 };

src/detect/ScanI2CConsumer.cpp

@@ -3,14 +3,10 @@
 
 static std::forward_list<ScanI2CConsumer *> ScanI2CConsumers;
 
-ScanI2CConsumer::ScanI2CConsumer()
-{
-    ScanI2CConsumers.push_front(this);
-}
+ScanI2CConsumer::ScanI2CConsumer() { ScanI2CConsumers.push_front(this); }
 
-void ScanI2CCompleted(ScanI2C *i2cScanner)
-{
-    for (ScanI2CConsumer *consumer : ScanI2CConsumers) {
-        consumer->i2cScanFinished(i2cScanner);
-    }
+void ScanI2CCompleted(ScanI2C *i2cScanner) {
+  for (ScanI2CConsumer *consumer : ScanI2CConsumers) {
+    consumer->i2cScanFinished(i2cScanner);
+  }
 }

src/detect/ScanI2CConsumer.h

@@ -3,11 +3,10 @@
 #include "ScanI2C.h"
 #include <stddef.h>
 
-class ScanI2CConsumer
-{
-  public:
-    ScanI2CConsumer();
-    virtual void i2cScanFinished(ScanI2C *i2cScanner) = 0;
+class ScanI2CConsumer {
+public:
+  ScanI2CConsumer();
+  virtual void i2cScanFinished(ScanI2C *i2cScanner) = 0;
 };
 
 void ScanI2CCompleted(ScanI2C *i2cScanner);

src/detect/ScanI2CTwoWire.h

@@ -14,49 +14,45 @@
 
 #include "../concurrency/Lock.h"
 
-class ScanI2CTwoWire : public ScanI2C
-{
-  public:
-    void scanPort(ScanI2C::I2CPort) override;
+class ScanI2CTwoWire : public ScanI2C {
+public:
+  void scanPort(ScanI2C::I2CPort) override;
 
-    void scanPort(ScanI2C::I2CPort, uint8_t *, uint8_t) override;
+  void scanPort(ScanI2C::I2CPort, uint8_t *, uint8_t) override;
 
-    ScanI2C::FoundDevice find(ScanI2C::DeviceType) const override;
+  ScanI2C::FoundDevice find(ScanI2C::DeviceType) const override;
 
-    bool exists(ScanI2C::DeviceType) const override;
+  bool exists(ScanI2C::DeviceType) const override;
 
-    size_t countDevices() const override;
+  size_t countDevices() const override;
 
-    static TwoWire *fetchI2CBus(ScanI2C::DeviceAddress);
+  static TwoWire *fetchI2CBus(ScanI2C::DeviceAddress);
 
-  protected:
-    FoundDevice firstOfOrNONE(size_t, DeviceType[]) const override;
+protected:
+  FoundDevice firstOfOrNONE(size_t, DeviceType[]) const override;
 
-  private:
-    typedef struct RegisterLocation {
-        DeviceAddress i2cAddress;
-        RegisterAddress registerAddress;
+private:
+  typedef struct RegisterLocation {
+    DeviceAddress i2cAddress;
+    RegisterAddress registerAddress;
 
-        RegisterLocation(DeviceAddress deviceAddress, RegisterAddress registerAddress)
-            : i2cAddress(deviceAddress), registerAddress(registerAddress)
-        {
-        }
+    RegisterLocation(DeviceAddress deviceAddress, RegisterAddress registerAddress) : i2cAddress(deviceAddress), registerAddress(registerAddress) {}
 
-    } RegisterLocation;
+  } RegisterLocation;
 
-    typedef uint8_t ResponseWidth;
+  typedef uint8_t ResponseWidth;
 
-    std::map<ScanI2C::DeviceAddress, ScanI2C::DeviceType> foundDevices;
+  std::map<ScanI2C::DeviceAddress, ScanI2C::DeviceType> foundDevices;
 
-    // note: prone to overwriting if multiple devices of a type are added at different addresses (rare?)
-    std::map<ScanI2C::DeviceType, ScanI2C::DeviceAddress> deviceAddresses;
+  // note: prone to overwriting if multiple devices of a type are added at different addresses (rare?)
+  std::map<ScanI2C::DeviceType, ScanI2C::DeviceAddress> deviceAddresses;
 
-    concurrency::Lock lock;
+  concurrency::Lock lock;
 
-    uint16_t getRegisterValue(const RegisterLocation &, ResponseWidth, bool) const;
+  uint16_t getRegisterValue(const RegisterLocation &, ResponseWidth, bool) const;
 
-    DeviceType probeOLED(ScanI2C::DeviceAddress) const;
+  DeviceType probeOLED(ScanI2C::DeviceAddress) const;
 
-    static void logFoundDevice(const char *device, uint8_t address);
+  static void logFoundDevice(const char *device, uint8_t address);
 };
 #endif

src/detect/einkScan.h

@@ -4,64 +4,60 @@
 #include "../main.h"
 #include <SPI.h>
 
-void d_writeCommand(uint8_t c)
-{
-    SPI1.beginTransaction(SPISettings(4000000, MSBFIRST, SPI_MODE0));
-    if (PIN_EINK_DC >= 0)
-        digitalWrite(PIN_EINK_DC, LOW);
-    if (PIN_EINK_CS >= 0)
-        digitalWrite(PIN_EINK_CS, LOW);
-    SPI1.transfer(c);
-    if (PIN_EINK_CS >= 0)
-        digitalWrite(PIN_EINK_CS, HIGH);
-    if (PIN_EINK_DC >= 0)
-        digitalWrite(PIN_EINK_DC, HIGH);
-    SPI1.endTransaction();
+void d_writeCommand(uint8_t c) {
+  SPI1.beginTransaction(SPISettings(4000000, MSBFIRST, SPI_MODE0));
+  if (PIN_EINK_DC >= 0)
+    digitalWrite(PIN_EINK_DC, LOW);
+  if (PIN_EINK_CS >= 0)
+    digitalWrite(PIN_EINK_CS, LOW);
+  SPI1.transfer(c);
+  if (PIN_EINK_CS >= 0)
+    digitalWrite(PIN_EINK_CS, HIGH);
+  if (PIN_EINK_DC >= 0)
+    digitalWrite(PIN_EINK_DC, HIGH);
+  SPI1.endTransaction();
 }
 
-void d_writeData(uint8_t d)
-{
-    SPI1.beginTransaction(SPISettings(4000000, MSBFIRST, SPI_MODE0));
-    if (PIN_EINK_CS >= 0)
-        digitalWrite(PIN_EINK_CS, LOW);
-    SPI1.transfer(d);
-    if (PIN_EINK_CS >= 0)
-        digitalWrite(PIN_EINK_CS, HIGH);
-    SPI1.endTransaction();
+void d_writeData(uint8_t d) {
+  SPI1.beginTransaction(SPISettings(4000000, MSBFIRST, SPI_MODE0));
+  if (PIN_EINK_CS >= 0)
+    digitalWrite(PIN_EINK_CS, LOW);
+  SPI1.transfer(d);
+  if (PIN_EINK_CS >= 0)
+    digitalWrite(PIN_EINK_CS, HIGH);
+  SPI1.endTransaction();
 }
 
-unsigned long d_waitWhileBusy(uint16_t busy_time)
-{
-    if (PIN_EINK_BUSY >= 0) {
-        delay(1); // add some margin to become active
-        unsigned long start = micros();
-        while (1) {
-            if (digitalRead(PIN_EINK_BUSY) != HIGH)
-                break;
-            delay(1);
-            if (digitalRead(PIN_EINK_BUSY) != HIGH)
-                break;
-            if (micros() - start > 10000000)
-                break;
-        }
-        unsigned long elapsed = micros() - start;
-        (void)start;
-        return elapsed;
-    } else
-        return busy_time;
+unsigned long d_waitWhileBusy(uint16_t busy_time) {
+  if (PIN_EINK_BUSY >= 0) {
+    delay(1); // add some margin to become active
+    unsigned long start = micros();
+    while (1) {
+      if (digitalRead(PIN_EINK_BUSY) != HIGH)
+        break;
+      delay(1);
+      if (digitalRead(PIN_EINK_BUSY) != HIGH)
+        break;
+      if (micros() - start > 10000000)
+        break;
+    }
+    unsigned long elapsed = micros() - start;
+    (void)start;
+    return elapsed;
+  } else
+    return busy_time;
 }
 
-void scanEInkDevice(void)
-{
-    SPI1.begin();
-    d_writeCommand(0x22);
-    d_writeData(0x83);
-    d_writeCommand(0x20);
-    eink_found = (d_waitWhileBusy(150) > 0) ? true : false;
-    if (eink_found)
-        LOG_DEBUG("EInk display found");
-    else
-        LOG_DEBUG("EInk display not found");
-    SPI1.end();
+void scanEInkDevice(void) {
+  SPI1.begin();
+  d_writeCommand(0x22);
+  d_writeData(0x83);
+  d_writeCommand(0x20);
+  eink_found = (d_waitWhileBusy(150) > 0) ? true : false;
+  if (eink_found)
+    LOG_DEBUG("EInk display found");
+  else
+    LOG_DEBUG("EInk display not found");
+  SPI1.end();
 }
 #endif