Change .clang-format to the latest M5 one

m5stack · Sep 25, 2024 · b4cd78a · b4cd78a
1 parent 0121515
commit b4cd78a
Show file tree

Hide file tree

Showing 9 changed files with 115 additions and 61 deletions.
diff --git a/.clang-format b/.clang-format
@@ -1,7 +1,7 @@
 ---
 Language:        Cpp
 BasedOnStyle:  Google
-AccessModifierOffset: -1
+AccessModifierOffset: -4
 AlignAfterOpenBracket: Align
 AlignConsecutiveMacros: true
 AlignConsecutiveAssignments: true
@@ -29,7 +29,7 @@ BraceWrapping:
   AfterClass:      false
   AfterControlStatement: false
   AfterEnum:       false
-  AfterFunction:   false
+  AfterFunction:   true
   AfterNamespace:  false
   AfterObjCDeclaration: false
   AfterStruct:     false
@@ -42,7 +42,7 @@ BraceWrapping:
   SplitEmptyRecord: true
   SplitEmptyNamespace: true
 BreakBeforeBinaryOperators: None
-BreakBeforeBraces: Attach
+BreakBeforeBraces: Custom
 BreakBeforeInheritanceComma: false
 BreakInheritanceList: BeforeColon
 BreakBeforeTernaryOperators: true

diff --git a/examples/UnitUnified/PlotToSerial/main/PlotToSerial.cpp b/examples/UnitUnified/PlotToSerial/main/PlotToSerial.cpp
@@ -22,7 +22,8 @@ m5::unit::UnitKmeterISO unit;
 auto& lcd = M5.Display;
 }  // namespace
 
-void setup() {
+void setup()
+{
     M5.begin();
 
     m5::utility::delay(3000);
@@ -71,7 +72,8 @@ void setup() {
     lcd.clear(TFT_DARKGREEN);
 }
 
-void loop() {
+void loop()
+{
     M5.update();
     Units.update();
     if (unit.updated()) {

diff --git a/src/M5UnitKmeterISO.cpp b/src/M5UnitKmeterISO.cpp
@@ -1,7 +1,8 @@
 #include "M5UnitKmeterISO.h"
 #include <string.h>
 
-void M5UnitKmeterISO::writeBytes(uint8_t addr, uint8_t reg, uint8_t *buffer, uint8_t length) {
+void M5UnitKmeterISO::writeBytes(uint8_t addr, uint8_t reg, uint8_t *buffer, uint8_t length)
+{
     _wire->beginTransmission(addr);
     _wire->write(reg);
     for (int i = 0; i < length; i++) {
@@ -10,7 +11,8 @@ void M5UnitKmeterISO::writeBytes(uint8_t addr, uint8_t reg, uint8_t *buffer, uin
     _wire->endTransmission();
 }
 
-void M5UnitKmeterISO::readBytes(uint8_t addr, uint8_t reg, uint8_t *buffer, uint8_t length) {
+void M5UnitKmeterISO::readBytes(uint8_t addr, uint8_t reg, uint8_t *buffer, uint8_t length)
+{
     uint8_t index = 0;
     _wire->beginTransmission(addr);
     _wire->write(reg);
@@ -21,7 +23,8 @@ void M5UnitKmeterISO::readBytes(uint8_t addr, uint8_t reg, uint8_t *buffer, uint
     }
 }
 
-bool M5UnitKmeterISO::begin(TwoWire *wire, uint8_t addr, uint8_t sda, uint8_t scl, uint32_t speed) {
+bool M5UnitKmeterISO::begin(TwoWire *wire, uint8_t addr, uint8_t sda, uint8_t scl, uint32_t speed)
+{
     _wire  = wire;
     _addr  = addr;
     _sda   = sda;
@@ -38,78 +41,89 @@ bool M5UnitKmeterISO::begin(TwoWire *wire, uint8_t addr, uint8_t sda, uint8_t sc
     }
 }
 
-int32_t M5UnitKmeterISO::getCelsiusTempValue(void) {
+int32_t M5UnitKmeterISO::getCelsiusTempValue(void)
+{
     uint8_t read_buf[4] = {0};
 
     readBytes(_addr, KMETER_TEMP_VAL_REG, read_buf, 4);
     return (read_buf[3] << 24) | (read_buf[2] << 16) | (read_buf[1] << 8) | read_buf[0];
 }
 
-int32_t M5UnitKmeterISO::getFahrenheitTempValue(void) {
+int32_t M5UnitKmeterISO::getFahrenheitTempValue(void)
+{
     uint8_t read_buf[4] = {0};
 
     readBytes(_addr, KMETER_TEMP_VAL_REG + 4, read_buf, 4);
     return (read_buf[3] << 24) | (read_buf[2] << 16) | (read_buf[1] << 8) | read_buf[0];
 }
 
-int32_t M5UnitKmeterISO::getInternalCelsiusTempValue(void) {
+int32_t M5UnitKmeterISO::getInternalCelsiusTempValue(void)
+{
     uint8_t read_buf[4] = {0};
 
     readBytes(_addr, KMETER_INTERNAL_TEMP_VAL_REG, read_buf, 4);
     return (read_buf[3] << 24) | (read_buf[2] << 16) | (read_buf[1] << 8) | read_buf[0];
 }
 
-int32_t M5UnitKmeterISO::getInternalFahrenheitTempValue(void) {
+int32_t M5UnitKmeterISO::getInternalFahrenheitTempValue(void)
+{
     uint8_t read_buf[4] = {0};
 
     readBytes(_addr, KMETER_INTERNAL_TEMP_VAL_REG + 4, read_buf, 4);
     return (read_buf[3] << 24) | (read_buf[2] << 16) | (read_buf[1] << 8) | read_buf[0];
 }
 
-void M5UnitKmeterISO::getCelsiusTempString(char *str) {
+void M5UnitKmeterISO::getCelsiusTempString(char *str)
+{
     char read_buf[8] = {0};
 
     readBytes(_addr, KMETER_TEMP_CELSIUS_STRING_REG, (uint8_t *)read_buf, 8);
     memcpy(str, read_buf, sizeof(read_buf));
 }
 
-void M5UnitKmeterISO::getFahrenheitTempString(char *str) {
+void M5UnitKmeterISO::getFahrenheitTempString(char *str)
+{
     uint8_t read_buf[8] = {0};
 
     readBytes(_addr, KMETER_TEMP_FAHRENHEIT_STRING_REG, (uint8_t *)read_buf, 8);
     memcpy(str, read_buf, sizeof(read_buf));
 }
 
-void M5UnitKmeterISO::getInternalCelsiusTempString(char *str) {
+void M5UnitKmeterISO::getInternalCelsiusTempString(char *str)
+{
     uint8_t read_buf[8] = {0};
 
     readBytes(_addr, KMETER_INTERNAL_TEMP_CELSIUS_STRING_REG, (uint8_t *)read_buf, 8);
     memcpy(str, read_buf, sizeof(read_buf));
 }
 
-void M5UnitKmeterISO::getInternalFahrenheitTempString(char *str) {
+void M5UnitKmeterISO::getInternalFahrenheitTempString(char *str)
+{
     uint8_t read_buf[8] = {0};
 
     readBytes(_addr, KMETER_INTERNAL_TEMP_FAHRENHEIT_STRING_REG, (uint8_t *)read_buf, 8);
     memcpy(str, read_buf, sizeof(read_buf));
 }
 
-uint8_t M5UnitKmeterISO::getReadyStatus(void) {
+uint8_t M5UnitKmeterISO::getReadyStatus(void)
+{
     uint8_t read_buf[4] = {0};
 
     readBytes(_addr, KMETER_KMETER_ERROR_STATUS_REG, read_buf, 1);
     return read_buf[0];
 }
 
-uint8_t M5UnitKmeterISO::getFirmwareVersion(void) {
+uint8_t M5UnitKmeterISO::getFirmwareVersion(void)
+{
     uint8_t reg;
     uint8_t read_buf[4] = {0};
 
     readBytes(_addr, KMETER_FIRMWARE_VERSION_REG, read_buf, 1);
     return read_buf[0];
 }
 
-bool M5UnitKmeterISO::setI2CAddress(uint8_t addr) {
+bool M5UnitKmeterISO::setI2CAddress(uint8_t addr)
+{
     _wire->beginTransmission(_addr);
     _wire->write(KMETER_I2C_ADDRESS_REG);
     _wire->write(addr);

diff --git a/src/M5UnitUnifiedKmeterISO.hpp b/src/M5UnitUnifiedKmeterISO.hpp
@@ -29,6 +29,7 @@ namespace m5 {
   @namespace unit
   @brief Unit-related namespace
  */
-namespace unit {}  // namespace unit
+namespace unit {
+}  // namespace unit
 }  // namespace m5
 #endif
diff --git a/src/unit/unit_KmeterISO.cpp b/src/unit/unit_KmeterISO.cpp
@@ -19,7 +19,8 @@ using namespace m5::unit::kmeterISO::command;
 
 namespace {
 template <typename T>
-T array_to_type(const std::array<uint8_t, 4>& a) {
+T array_to_type(const std::array<uint8_t, 4>& a)
+{
     static_assert(std::is_integral<T>::value && sizeof(T) == 4, "Invalid type");
     return static_cast<T>((((uint32_t)a[3]) << 24) | (((uint32_t)a[2]) << 16) | (((uint32_t)a[1]) << 8) |
                           (((uint32_t)a[0]) << 0));
@@ -44,7 +45,8 @@ const char UnitKmeterISO::name[] = "UnitKmeterISO";
 const types::uid_t UnitKmeterISO::uid{"UnitKmeterISO"_mmh3};
 const types::uid_t UnitKmeterISO::attr{0};
 
-bool UnitKmeterISO::begin() {
+bool UnitKmeterISO::begin()
+{
     auto ssize = stored_size();
     assert(ssize && "stored_size must be greater than zero");
     if (ssize != _data->capacity()) {
@@ -63,7 +65,8 @@ bool UnitKmeterISO::begin() {
     return _cfg.start_periodic ? startPeriodicMeasurement(_cfg.interval, _cfg.measurement_unit) : true;
 }
 
-void UnitKmeterISO::update(const bool force) {
+void UnitKmeterISO::update(const bool force)
+{
     _updated = false;
     if (inPeriodic()) {
         elapsed_time_t at{m5::utility::millis()};
@@ -78,7 +81,8 @@ void UnitKmeterISO::update(const bool force) {
     }
 }
 
-bool UnitKmeterISO::start_periodic_measurement() {
+bool UnitKmeterISO::start_periodic_measurement()
+{
     if (inPeriodic()) {
         M5_LIB_LOGD("Periodic measurements are running");
         return false;
@@ -88,7 +92,8 @@ bool UnitKmeterISO::start_periodic_measurement() {
     return true;
 }
 
-bool UnitKmeterISO::start_periodic_measurement(const uint32_t interval, const MeasurementUnit munit) {
+bool UnitKmeterISO::start_periodic_measurement(const uint32_t interval, const MeasurementUnit munit)
+{
     if (start_periodic_measurement()) {
         _interval = interval;
         _munit    = munit;
@@ -97,21 +102,25 @@ bool UnitKmeterISO::start_periodic_measurement(const uint32_t interval, const Me
     return false;
 }
 
-bool UnitKmeterISO::stop_periodic_measurement() {
+bool UnitKmeterISO::stop_periodic_measurement()
+{
     _periodic = _updated = false;
     return true;
 }
 
-bool UnitKmeterISO::readStatus(uint8_t& status) {
+bool UnitKmeterISO::readStatus(uint8_t& status)
+{
     status = 0xFF;
     return readRegister8(ERROR_STATUS_REG, status, 0);
 }
 
-bool UnitKmeterISO::readFirmwareVersion(uint8_t& ver) {
+bool UnitKmeterISO::readFirmwareVersion(uint8_t& ver)
+{
     return readRegister8(FIRMWARE_VERSION_REG, ver, 0);
 }
 
-bool UnitKmeterISO::measureSingleshot(kmeterISO::Data& d, kmeterISO::MeasurementUnit munit, const uint32_t timeoutMs) {
+bool UnitKmeterISO::measureSingleshot(kmeterISO::Data& d, kmeterISO::MeasurementUnit munit, const uint32_t timeoutMs)
+{
     auto timeout_at = m5::utility::millis() + timeoutMs;
     do {
         if (isReady()) {
@@ -125,7 +134,8 @@ bool UnitKmeterISO::measureSingleshot(kmeterISO::Data& d, kmeterISO::Measurement
 }
 
 bool UnitKmeterISO::measureInternalSingleshot(kmeterISO::Data& d, kmeterISO::MeasurementUnit munit,
-                                              const uint32_t timeoutMs) {
+                                              const uint32_t timeoutMs)
+{
     auto timeout_at = m5::utility::millis() + timeoutMs;
     do {
         if (isReady()) {
@@ -138,7 +148,8 @@ bool UnitKmeterISO::measureInternalSingleshot(kmeterISO::Data& d, kmeterISO::Mea
     return false;
 }
 
-bool UnitKmeterISO::changeI2CAddress(const uint8_t i2c_address) {
+bool UnitKmeterISO::changeI2CAddress(const uint8_t i2c_address)
+{
     if (!m5::utility::isValidI2CAddress(i2c_address)) {
         M5_LIB_LOGE("Invalid address : %02X", i2c_address);
         return false;
@@ -157,17 +168,20 @@ bool UnitKmeterISO::changeI2CAddress(const uint8_t i2c_address) {
     return false;
 }
 
-bool UnitKmeterISO::readI2CAddress(uint8_t& i2c_address) {
+bool UnitKmeterISO::readI2CAddress(uint8_t& i2c_address)
+{
     return readRegister8(I2C_ADDRESS_REG, i2c_address, 1);
 }
 
 //
-bool UnitKmeterISO::read_measurement(Data& d, const kmeterISO::MeasurementUnit munit) {
+bool UnitKmeterISO::read_measurement(Data& d, const kmeterISO::MeasurementUnit munit)
+{
     assert(m5::stl::to_underlying(munit) < m5::stl::size(reg_temperature_table));
     return readRegister(reg_temperature_table[m5::stl::to_underlying(munit)], d.raw.data(), d.raw.size(), 0);
 }
 
-bool UnitKmeterISO::read_internal_measurement(Data& d, const kmeterISO::MeasurementUnit munit) {
+bool UnitKmeterISO::read_internal_measurement(Data& d, const kmeterISO::MeasurementUnit munit)
+{
     assert(m5::stl::to_underlying(munit) < m5::stl::size(reg_internal_temperature_table));
     return readRegister(reg_internal_temperature_table[m5::stl::to_underlying(munit)], d.raw.data(), d.raw.size(), 0);
 }