Restyled by clang-format

project-chip · Sep 9, 2024 · 049acbe · 049acbe
1 parent 942d29c
commit 049acbe
Show file tree

Hide file tree

Showing 9 changed files with 92 additions and 79 deletions.
diff --git a/examples/air-quality-sensor-app/air-quality-sensor-common/src/air-quality-sensor-manager.cpp b/examples/air-quality-sensor-app/air-quality-sensor-common/src/air-quality-sensor-manager.cpp
@@ -134,7 +134,7 @@ void AirQualitySensorManager::Init()
     mFormaldehydeConcentrationMeasurementInstance.SetLevelValue(LevelValueEnum::kLow);
 }
 
-AirQualityEnum AirQualitySensorManager:: GetAirQuality()
+AirQualityEnum AirQualitySensorManager::GetAirQuality()
 {
     return mAirQualityInstance.GetAirQuality();
 }

diff --git a/examples/air-quality-sensor-app/silabs/include/AirQualitySensorUI.h b/examples/air-quality-sensor-app/silabs/include/AirQualitySensorUI.h
@@ -18,11 +18,11 @@
 
 #pragma once
 
-#include <CommonIcons.h>
 #include "demo-ui-bitmaps.h"
 #include "dmd.h"
 #include "glib.h"
 #include "lcd.h"
+#include <CommonIcons.h>
 
 class AirQualitySensorUI
 {

diff --git a/examples/air-quality-sensor-app/silabs/include/SensorManager.h b/examples/air-quality-sensor-app/silabs/include/SensorManager.h
@@ -18,11 +18,11 @@
 
 #pragma once
 
-#include <stdbool.h>
-#include <stdint.h>
 #include "AppEvent.h"
 #include <cmsis_os2.h>
 #include <lib/core/CHIPError.h>
+#include <stdbool.h>
+#include <stdint.h>
 
 class SensorManager
 {
@@ -32,7 +32,7 @@ class SensorManager
 
 private:
     SensorManager()  = default;
-    ~SensorManager()  = default;
+    ~SensorManager() = default;
 
     osTimerId_t mSensorTimer;
 

diff --git a/examples/air-quality-sensor-app/silabs/src/AirQualitySensorUI.cpp b/examples/air-quality-sensor-app/silabs/src/AirQualitySensorUI.cpp
@@ -20,10 +20,10 @@
 #include <string.h>
 
 #include "AirQualitySensorUI.h"
+#include "AppTask.h"
 #include "SensorManager.h"
 #include "demo-ui-bitmaps.h"
 #include "dmd.h"
-#include "AppTask.h"
 #include <air-quality-sensor-manager.h>
 #if DISPLAY_ENABLED
 #include "glib.h"
@@ -32,7 +32,7 @@
 
 using namespace chip::app::Clusters;
 
-namespace{
+namespace {
 // Bitmap
 const uint8_t silabsLogo[]       = { SILABS_LOGO_SMALL };
 const uint8_t matterLogoBitmap[] = { MATTER_LOGO_BITMAP };
@@ -41,22 +41,22 @@ const uint8_t wifiLogo[]   = { WIFI_BITMAP };
 const uint8_t threadLogo[] = { THREAD_BITMAP };
 const uint8_t bleLogo[]    = { BLUETOOTH_ICON_SMALL };
 
-const unsigned char monaco_48pt[]          = { MONACO_48PT };
+const unsigned char monaco_48pt[] = { MONACO_48PT };
 
 #ifdef SL_WIFI
 constexpr bool UI_WIFI = true;
 #else
 constexpr bool UI_WIFI = false;
 #endif
-}
+} // namespace
 
 using namespace chip::app::Clusters::AirQuality;
 
 void AirQualitySensorUI::DrawUI(GLIB_Context_t * glibContext)
 {
     if (glibContext == nullptr)
     {
-        ChipLogDetail(AppServer,"Context is null");
+        ChipLogDetail(AppServer, "Context is null");
         return;
     }
 
@@ -132,7 +132,6 @@ void AirQualitySensorUI::DrawFooter(GLIB_Context_t * glibContext)
 #endif // SL_LCDCTRL_MUX
 }
 
-
 /**
  * @brief Draw a 2 digit Air Quality of screen. Because of this Celsius is used by default
  * @param GLIB_Context_t * pointer to the context for the GLIB library
@@ -142,23 +141,23 @@ void AirQualitySensorUI::DrawCurrentAirQuality(GLIB_Context_t * glibContext)
 {
     // LCD line define
     constexpr uint8_t kAirQualityLcdInitialX = 30;
-    uint8_t position_x = 10;
-    uint8_t *data;
+    uint8_t position_x                       = 10;
+    uint8_t * data;
     uint8_t print_val;
 
     // Print Current air quality
     print_val = 0;
-    data = (uint8_t *) &monaco_48pt[print_val * MONACO_FONT_NB_LENGTH];
+    data      = (uint8_t *) &monaco_48pt[print_val * MONACO_FONT_NB_LENGTH];
     DrawFont(glibContext, position_x, kAirQualityLcdInitialX, MONACO_FONT_WIDTH, data, MONACO_FONT_NB_LENGTH);
     position_x += MONACO_FONT_WIDTH;
 
-    print_val = static_cast<uint8_t>( AirQualitySensorManager::GetInstance()->GetAirQuality() );
-    data = (uint8_t *) &monaco_48pt[print_val * MONACO_FONT_NB_LENGTH];
+    print_val = static_cast<uint8_t>(AirQualitySensorManager::GetInstance()->GetAirQuality());
+    data      = (uint8_t *) &monaco_48pt[print_val * MONACO_FONT_NB_LENGTH];
     DrawFont(glibContext, position_x, kAirQualityLcdInitialX, MONACO_FONT_WIDTH, data, MONACO_FONT_NB_LENGTH);
 }
 
 void AirQualitySensorUI::DrawFont(GLIB_Context_t * glibContext, uint8_t initial_x, uint8_t initial_y, uint8_t width, uint8_t * data,
-                            uint32_t size)
+                                  uint32_t size)
 {
     uint8_t x = initial_x, y = initial_y;
     for (uint16_t i = 0; i < size; i++)

diff --git a/examples/air-quality-sensor-app/silabs/src/AppTask.cpp b/examples/air-quality-sensor-app/silabs/src/AppTask.cpp
@@ -34,6 +34,7 @@
 #endif // QR_CODE_ENABLED
 #endif // DISPLAY_ENABLED
 
+#include <air-quality-sensor-manager.h>
 #include <app-common/zap-generated/attributes/Accessors.h>
 #include <app-common/zap-generated/callback.h>
 #include <app-common/zap-generated/cluster-objects.h>
@@ -47,7 +48,6 @@
 #include <platform/silabs/platformAbstraction/SilabsPlatform.h>
 #include <setup_payload/QRCodeSetupPayloadGenerator.h>
 #include <setup_payload/SetupPayload.h>
-#include <air-quality-sensor-manager.h>
 
 /**********************************************************
  * Defines and Constants
@@ -68,7 +68,6 @@ using namespace chip::app::Clusters;
 
 AppTask AppTask::sAppTask;
 
-
 CHIP_ERROR AppTask::Init()
 {
     CHIP_ERROR err = CHIP_NO_ERROR;
@@ -129,20 +128,21 @@ void AppTask::AppTaskMain(void * pvParameter)
 
 void AppTask::UpdateAirQualitySensorUI()
 {
-    // Update the LCD with the Stored value. Show QR Code if not provisioned
-    #ifdef DISPLAY_ENABLED
-        GetLCD().WriteDemoUI(false);
-    #ifdef QR_CODE_ENABLED
-        if (BaseApplication::GetProvisionStatus())
-        {
-            GetLCD().ShowQRCode(true);
-        }
-    #endif // QR_CODE_ENABLED
-    #else
-        PlatformMgr().LockChipStack();
-        ChipLogDetail(AppServer, "Air Quality Sensor Status - AirQualityEnumValue:%d", chip::to_underlying(AirQualitySensorManager::GetInstance()->GetAirQuality()));
-        PlatformMgr().UnlockChipStack();
-    #endif
+// Update the LCD with the Stored value. Show QR Code if not provisioned
+#ifdef DISPLAY_ENABLED
+    GetLCD().WriteDemoUI(false);
+#ifdef QR_CODE_ENABLED
+    if (BaseApplication::GetProvisionStatus())
+    {
+        GetLCD().ShowQRCode(true);
+    }
+#endif // QR_CODE_ENABLED
+#else
+    PlatformMgr().LockChipStack();
+    ChipLogDetail(AppServer, "Air Quality Sensor Status - AirQualityEnumValue:%d",
+                  chip::to_underlying(AirQualitySensorManager::GetInstance()->GetAirQuality()));
+    PlatformMgr().UnlockChipStack();
+#endif
 }
 
 void AppTask::ButtonEventHandler(uint8_t button, uint8_t btnAction)

diff --git a/examples/air-quality-sensor-app/silabs/src/SensorManager.cpp b/examples/air-quality-sensor-app/silabs/src/SensorManager.cpp
@@ -24,9 +24,8 @@
 #include "AppConfig.h"
 #include "AppEvent.h"
 #include "AppTask.h"
-#include <air-quality-sensor-manager.h>
 #include <AirQualityConfig.h>
-
+#include <air-quality-sensor-manager.h>
 
 #ifdef USE_AIR_QUALITY_SENSOR
 #include "AirQualitySensor.h"
@@ -44,15 +43,16 @@ using namespace chip::app::Clusters::AirQuality;
  * Variable declarations
  *********************************************************/
 SensorManager SensorManager::sSensorManager;
-namespace{
-constexpr uint16_t kSensorTImerPeriodMs  = 30000; // 30s timer period
+namespace {
+constexpr uint16_t kSensorTImerPeriodMs = 30000; // 30s timer period
 
 #ifndef USE_AIR_QUALITY_SENSOR
-constexpr uint16_t kSimulatedReadingFrequency = (60000 / kSensorTImerPeriodMs); // for every two timer cycles, a simulated sensor update is triggered.
-int32_t mSimulatedAirQuality[]         = { 5, 55, 105, 155, 205, 255, 305, 355, 400 };
+constexpr uint16_t kSimulatedReadingFrequency =
+    (60000 / kSensorTImerPeriodMs); // for every two timer cycles, a simulated sensor update is triggered.
+int32_t mSimulatedAirQuality[] = { 5, 55, 105, 155, 205, 255, 305, 355, 400 };
 #endif
 
-}
+} // namespace
 
 /**
  * @brief Classifies the air quality based on a given sensor value.
@@ -65,20 +65,34 @@ int32_t mSimulatedAirQuality[]         = { 5, 55, 105, 155, 205, 255, 305, 355,
  * @param value The sensor value used to classify air quality.
  * @return AirQualityEnum The classified air quality category.
  */
-AirQualityEnum classifyAirQuality(int32_t value) {
-    if (value < MIN_THRESHOLD) {
+AirQualityEnum classifyAirQuality(int32_t value)
+{
+    if (value < MIN_THRESHOLD)
+    {
         return AirQualityEnum::kUnknown;
-    } else if (value < GOOD_THRESHOLD) {
+    }
+    else if (value < GOOD_THRESHOLD)
+    {
         return AirQualityEnum::kGood;
-    } else if (value < FAIR_THRESHOLD) {
+    }
+    else if (value < FAIR_THRESHOLD)
+    {
         return AirQualityEnum::kFair;
-    } else if (value < MODERATE_THRESHOLD) {
+    }
+    else if (value < MODERATE_THRESHOLD)
+    {
         return AirQualityEnum::kModerate;
-    } else if (value < POOR_THRESHOLD) {
+    }
+    else if (value < POOR_THRESHOLD)
+    {
         return AirQualityEnum::kPoor;
-    } else if (value < VERY_POOR_THRESHOLD) {
+    }
+    else if (value < VERY_POOR_THRESHOLD)
+    {
         return AirQualityEnum::kVeryPoor;
-    } else {
+    }
+    else
+    {
         return AirQualityEnum::kExtremelyPoor;
     }
 }
@@ -87,9 +101,9 @@ CHIP_ERROR SensorManager::Init()
 {
 
     PlatformMgr().LockChipStack();
-    ChipLogDetail(AppServer ,"Int instnace");
+    ChipLogDetail(AppServer, "Int instnace");
     AirQualitySensorManager::InitInstance(1);
-    ChipLogDetail(AppServer ,"Int instnace success");
+    ChipLogDetail(AppServer, "Int instnace success");
     PlatformMgr().UnlockChipStack();
     // Create cmsisos sw timer for air quality sensor timer.
     mSensorTimer = osTimerNew(SensorTimerEventHandler, osTimerPeriodic, nullptr, nullptr);
@@ -114,15 +128,15 @@ CHIP_ERROR SensorManager::Init()
     // Starts or restarts the function timer
     if (osTimerStart(mSensorTimer, delayTicks))
     {
-        ChipLogDetail(AppServer ,"mSensor Timer start() failed");
+        ChipLogDetail(AppServer, "mSensor Timer start() failed");
         appError(APP_ERROR_START_TIMER_FAILED);
     }
     return CHIP_NO_ERROR;
 }
 
 void SensorManager::SensorTimerEventHandler(void * arg)
 {
-int32_t air_quality;
+    int32_t air_quality;
 #ifdef USE_AIR_QUALITY_SENSOR
     if (SL_STATUS_OK != AirQualitySensor::GetAirQuality(air_quality))
     {
@@ -157,6 +171,6 @@ int32_t air_quality;
     AppTask::GetAppTask().UpdateAirQualitySensorUI();
     PlatformMgr().UnlockChipStack();
 
-    ChipLogDetail(AppServer , "RAW AirQuality value: %ld and corresponding Enum value : %d", air_quality,chip::to_underlying( AirQualitySensorManager::GetInstance()->GetAirQuality() ));
-
+    ChipLogDetail(AppServer, "RAW AirQuality value: %ld and corresponding Enum value : %d", air_quality,
+                  chip::to_underlying(AirQualitySensorManager::GetInstance()->GetAirQuality()));
 }
diff --git a/examples/air-quality-sensor-app/silabs/src/ZclCallbacks.cpp b/examples/air-quality-sensor-app/silabs/src/ZclCallbacks.cpp
@@ -38,8 +38,8 @@ using namespace ::chip::app::Clusters;
 void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size,
                                        uint8_t * value)
 {
-    ClusterId clusterId     = attributePath.mClusterId;
-    [[maybe_unused]]AttributeId attributeId = attributePath.mAttributeId;
+    ClusterId clusterId                      = attributePath.mClusterId;
+    [[maybe_unused]] AttributeId attributeId = attributePath.mAttributeId;
     ChipLogProgress(Zcl, "Cluster callback: " ChipLogFormatMEI, ChipLogValueMEI(clusterId));
 
     if (clusterId == Identify::Id)

diff --git a/examples/platform/silabs/sensors/AirQuality/AirQualitySensor.cpp b/examples/platform/silabs/sensors/AirQuality/AirQualitySensor.cpp
@@ -29,9 +29,9 @@ extern "C" {
 #include <sparkfun_sgp40_i2c.h>
 }
 #include "sl_i2cspm_instances.h"
-#endif //USE_SPARKFUN_AIR_QUALITY_SENSOR
+#endif // USE_SPARKFUN_AIR_QUALITY_SENSOR
 
-namespace{
+namespace {
 bool initialized = false;
 }
 
@@ -41,7 +41,8 @@ namespace AirQualitySensor {
  * @brief Initializes the air quality sensor.
  *
  * This function initializes the air quality sensor, specifically supporting the SparkFun SGP40 air quality sensor.
- * It uses the I2C protocol for communication and sets up the VOC (Volatile Organic Compounds) algorithm for air quality measurement.
+ * It uses the I2C protocol for communication and sets up the VOC (Volatile Organic Compounds) algorithm for air quality
+ * measurement.
  *
  * @note If the macro USE_SPARKFUN_AIR_QUALITY_SENSOR is defined, the SparkFun SGP40 sensor is initialized.
  *       If initialization is successful, the function returns SL_STATUS_OK, indicating the sensor is ready for use.
@@ -53,20 +54,20 @@ namespace AirQualitySensor {
 
 sl_status_t Init()
 {
-  sl_status_t status = SL_STATUS_FAIL;
+    sl_status_t status = SL_STATUS_FAIL;
 
-  #ifdef USE_SPARKFUN_AIR_QUALITY_SENSOR
+#ifdef USE_SPARKFUN_AIR_QUALITY_SENSOR
     status = sparkfun_sgp40_init(sl_i2cspm_qwiic);
     VerifyOrReturnError(status == SL_STATUS_OK, SL_STATUS_FAIL);
     initialized = true;
 
     sparkfun_sgp40_voc_algorithm_init();
 
-  #else
-  //User implementation of Init
-  #endif //USE_SPARKFUN_AIR_QUALITY_SENSOR
+#else
+// User implementation of Init
+#endif // USE_SPARKFUN_AIR_QUALITY_SENSOR
 
-  return status;
+    return status;
 }
 
 /**
@@ -87,22 +88,22 @@ sl_status_t Init()
  *         SL_STATUS_NOT_INITIALIZED if the sensor has not been initialized, or other error codes as defined.
  */
 
-sl_status_t GetAirQuality(int32_t &air_quality)
+sl_status_t GetAirQuality(int32_t & air_quality)
 {
-  sl_status_t status = SL_STATUS_FAIL;
-  VerifyOrReturnError(initialized, SL_STATUS_NOT_INITIALIZED);
+    sl_status_t status = SL_STATUS_FAIL;
+    VerifyOrReturnError(initialized, SL_STATUS_NOT_INITIALIZED);
 
-  #ifdef USE_SPARKFUN_AIR_QUALITY_SENSOR
-  constexpr  float relativeHumidity = 50; //50%
-  constexpr  float temperature      = 25; //25°C
+#ifdef USE_SPARKFUN_AIR_QUALITY_SENSOR
+    constexpr float relativeHumidity = 50; // 50%
+    constexpr float temperature      = 25; // 25°C
 
-  status =  sparkfun_sgp40_get_voc_index(&air_quality, relativeHumidity, temperature);
-  VerifyOrReturnError(status == SL_STATUS_OK, status);
+    status = sparkfun_sgp40_get_voc_index(&air_quality, relativeHumidity, temperature);
+    VerifyOrReturnError(status == SL_STATUS_OK, status);
 
-  #else
-    //User implementation of GetAirQuality
-  #endif //USE_SPARKFUN_AIR_QUALITY_SENSOR
+#else
+    // User implementation of GetAirQuality
+#endif // USE_SPARKFUN_AIR_QUALITY_SENSOR
 
-  return status;
+    return status;
 }
 }; // namespace AirQualitySensor