Skip to content
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.

Commit 049acbe

Browse files
restyled-commitsSarthak-Shaha
authored andcommittedSep 9, 2024
Restyled by clang-format
1 parent 942d29c commit 049acbe

File tree

9 files changed

+92
-79
lines changed

9 files changed

+92
-79
lines changed
 

‎examples/air-quality-sensor-app/air-quality-sensor-common/src/air-quality-sensor-manager.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@ void AirQualitySensorManager::Init()
134134
mFormaldehydeConcentrationMeasurementInstance.SetLevelValue(LevelValueEnum::kLow);
135135
}
136136

137-
AirQualityEnum AirQualitySensorManager:: GetAirQuality()
137+
AirQualityEnum AirQualitySensorManager::GetAirQuality()
138138
{
139139
return mAirQualityInstance.GetAirQuality();
140140
}

‎examples/air-quality-sensor-app/silabs/include/AirQualitySensorUI.h

+1-1
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818

1919
#pragma once
2020

21-
#include <CommonIcons.h>
2221
#include "demo-ui-bitmaps.h"
2322
#include "dmd.h"
2423
#include "glib.h"
2524
#include "lcd.h"
25+
#include <CommonIcons.h>
2626

2727
class AirQualitySensorUI
2828
{

‎examples/air-quality-sensor-app/silabs/include/SensorManager.h

+3-3
Original file line numberDiff line numberDiff line change
@@ -18,11 +18,11 @@
1818

1919
#pragma once
2020

21-
#include <stdbool.h>
22-
#include <stdint.h>
2321
#include "AppEvent.h"
2422
#include <cmsis_os2.h>
2523
#include <lib/core/CHIPError.h>
24+
#include <stdbool.h>
25+
#include <stdint.h>
2626

2727
class SensorManager
2828
{
@@ -32,7 +32,7 @@ class SensorManager
3232

3333
private:
3434
SensorManager() = default;
35-
~SensorManager() = default;
35+
~SensorManager() = default;
3636

3737
osTimerId_t mSensorTimer;
3838

‎examples/air-quality-sensor-app/silabs/src/AirQualitySensorUI.cpp

+11-12
Original file line numberDiff line numberDiff line change
@@ -20,10 +20,10 @@
2020
#include <string.h>
2121

2222
#include "AirQualitySensorUI.h"
23+
#include "AppTask.h"
2324
#include "SensorManager.h"
2425
#include "demo-ui-bitmaps.h"
2526
#include "dmd.h"
26-
#include "AppTask.h"
2727
#include <air-quality-sensor-manager.h>
2828
#if DISPLAY_ENABLED
2929
#include "glib.h"
@@ -32,7 +32,7 @@
3232

3333
using namespace chip::app::Clusters;
3434

35-
namespace{
35+
namespace {
3636
// Bitmap
3737
const uint8_t silabsLogo[] = { SILABS_LOGO_SMALL };
3838
const uint8_t matterLogoBitmap[] = { MATTER_LOGO_BITMAP };
@@ -41,22 +41,22 @@ const uint8_t wifiLogo[] = { WIFI_BITMAP };
4141
const uint8_t threadLogo[] = { THREAD_BITMAP };
4242
const uint8_t bleLogo[] = { BLUETOOTH_ICON_SMALL };
4343

44-
const unsigned char monaco_48pt[] = { MONACO_48PT };
44+
const unsigned char monaco_48pt[] = { MONACO_48PT };
4545

4646
#ifdef SL_WIFI
4747
constexpr bool UI_WIFI = true;
4848
#else
4949
constexpr bool UI_WIFI = false;
5050
#endif
51-
}
51+
} // namespace
5252

5353
using namespace chip::app::Clusters::AirQuality;
5454

5555
void AirQualitySensorUI::DrawUI(GLIB_Context_t * glibContext)
5656
{
5757
if (glibContext == nullptr)
5858
{
59-
ChipLogDetail(AppServer,"Context is null");
59+
ChipLogDetail(AppServer, "Context is null");
6060
return;
6161
}
6262

@@ -132,7 +132,6 @@ void AirQualitySensorUI::DrawFooter(GLIB_Context_t * glibContext)
132132
#endif // SL_LCDCTRL_MUX
133133
}
134134

135-
136135
/**
137136
* @brief Draw a 2 digit Air Quality of screen. Because of this Celsius is used by default
138137
* @param GLIB_Context_t * pointer to the context for the GLIB library
@@ -142,23 +141,23 @@ void AirQualitySensorUI::DrawCurrentAirQuality(GLIB_Context_t * glibContext)
142141
{
143142
// LCD line define
144143
constexpr uint8_t kAirQualityLcdInitialX = 30;
145-
uint8_t position_x = 10;
146-
uint8_t *data;
144+
uint8_t position_x = 10;
145+
uint8_t * data;
147146
uint8_t print_val;
148147

149148
// Print Current air quality
150149
print_val = 0;
151-
data = (uint8_t *) &monaco_48pt[print_val * MONACO_FONT_NB_LENGTH];
150+
data = (uint8_t *) &monaco_48pt[print_val * MONACO_FONT_NB_LENGTH];
152151
DrawFont(glibContext, position_x, kAirQualityLcdInitialX, MONACO_FONT_WIDTH, data, MONACO_FONT_NB_LENGTH);
153152
position_x += MONACO_FONT_WIDTH;
154153

155-
print_val = static_cast<uint8_t>( AirQualitySensorManager::GetInstance()->GetAirQuality() );
156-
data = (uint8_t *) &monaco_48pt[print_val * MONACO_FONT_NB_LENGTH];
154+
print_val = static_cast<uint8_t>(AirQualitySensorManager::GetInstance()->GetAirQuality());
155+
data = (uint8_t *) &monaco_48pt[print_val * MONACO_FONT_NB_LENGTH];
157156
DrawFont(glibContext, position_x, kAirQualityLcdInitialX, MONACO_FONT_WIDTH, data, MONACO_FONT_NB_LENGTH);
158157
}
159158

160159
void AirQualitySensorUI::DrawFont(GLIB_Context_t * glibContext, uint8_t initial_x, uint8_t initial_y, uint8_t width, uint8_t * data,
161-
uint32_t size)
160+
uint32_t size)
162161
{
163162
uint8_t x = initial_x, y = initial_y;
164163
for (uint16_t i = 0; i < size; i++)

‎examples/air-quality-sensor-app/silabs/src/AppTask.cpp

+16-16
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
#endif // QR_CODE_ENABLED
3535
#endif // DISPLAY_ENABLED
3636

37+
#include <air-quality-sensor-manager.h>
3738
#include <app-common/zap-generated/attributes/Accessors.h>
3839
#include <app-common/zap-generated/callback.h>
3940
#include <app-common/zap-generated/cluster-objects.h>
@@ -47,7 +48,6 @@
4748
#include <platform/silabs/platformAbstraction/SilabsPlatform.h>
4849
#include <setup_payload/QRCodeSetupPayloadGenerator.h>
4950
#include <setup_payload/SetupPayload.h>
50-
#include <air-quality-sensor-manager.h>
5151

5252
/**********************************************************
5353
* Defines and Constants
@@ -68,7 +68,6 @@ using namespace chip::app::Clusters;
6868

6969
AppTask AppTask::sAppTask;
7070

71-
7271
CHIP_ERROR AppTask::Init()
7372
{
7473
CHIP_ERROR err = CHIP_NO_ERROR;
@@ -129,20 +128,21 @@ void AppTask::AppTaskMain(void * pvParameter)
129128

130129
void AppTask::UpdateAirQualitySensorUI()
131130
{
132-
// Update the LCD with the Stored value. Show QR Code if not provisioned
133-
#ifdef DISPLAY_ENABLED
134-
GetLCD().WriteDemoUI(false);
135-
#ifdef QR_CODE_ENABLED
136-
if (BaseApplication::GetProvisionStatus())
137-
{
138-
GetLCD().ShowQRCode(true);
139-
}
140-
#endif // QR_CODE_ENABLED
141-
#else
142-
PlatformMgr().LockChipStack();
143-
ChipLogDetail(AppServer, "Air Quality Sensor Status - AirQualityEnumValue:%d", chip::to_underlying(AirQualitySensorManager::GetInstance()->GetAirQuality()));
144-
PlatformMgr().UnlockChipStack();
145-
#endif
131+
// Update the LCD with the Stored value. Show QR Code if not provisioned
132+
#ifdef DISPLAY_ENABLED
133+
GetLCD().WriteDemoUI(false);
134+
#ifdef QR_CODE_ENABLED
135+
if (BaseApplication::GetProvisionStatus())
136+
{
137+
GetLCD().ShowQRCode(true);
138+
}
139+
#endif // QR_CODE_ENABLED
140+
#else
141+
PlatformMgr().LockChipStack();
142+
ChipLogDetail(AppServer, "Air Quality Sensor Status - AirQualityEnumValue:%d",
143+
chip::to_underlying(AirQualitySensorManager::GetInstance()->GetAirQuality()));
144+
PlatformMgr().UnlockChipStack();
145+
#endif
146146
}
147147

148148
void AppTask::ButtonEventHandler(uint8_t button, uint8_t btnAction)

‎examples/air-quality-sensor-app/silabs/src/SensorManager.cpp

+35-21
Original file line numberDiff line numberDiff line change
@@ -24,9 +24,8 @@
2424
#include "AppConfig.h"
2525
#include "AppEvent.h"
2626
#include "AppTask.h"
27-
#include <air-quality-sensor-manager.h>
2827
#include <AirQualityConfig.h>
29-
28+
#include <air-quality-sensor-manager.h>
3029

3130
#ifdef USE_AIR_QUALITY_SENSOR
3231
#include "AirQualitySensor.h"
@@ -44,15 +43,16 @@ using namespace chip::app::Clusters::AirQuality;
4443
* Variable declarations
4544
*********************************************************/
4645
SensorManager SensorManager::sSensorManager;
47-
namespace{
48-
constexpr uint16_t kSensorTImerPeriodMs = 30000; // 30s timer period
46+
namespace {
47+
constexpr uint16_t kSensorTImerPeriodMs = 30000; // 30s timer period
4948

5049
#ifndef USE_AIR_QUALITY_SENSOR
51-
constexpr uint16_t kSimulatedReadingFrequency = (60000 / kSensorTImerPeriodMs); // for every two timer cycles, a simulated sensor update is triggered.
52-
int32_t mSimulatedAirQuality[] = { 5, 55, 105, 155, 205, 255, 305, 355, 400 };
50+
constexpr uint16_t kSimulatedReadingFrequency =
51+
(60000 / kSensorTImerPeriodMs); // for every two timer cycles, a simulated sensor update is triggered.
52+
int32_t mSimulatedAirQuality[] = { 5, 55, 105, 155, 205, 255, 305, 355, 400 };
5353
#endif
5454

55-
}
55+
} // namespace
5656

5757
/**
5858
* @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,
6565
* @param value The sensor value used to classify air quality.
6666
* @return AirQualityEnum The classified air quality category.
6767
*/
68-
AirQualityEnum classifyAirQuality(int32_t value) {
69-
if (value < MIN_THRESHOLD) {
68+
AirQualityEnum classifyAirQuality(int32_t value)
69+
{
70+
if (value < MIN_THRESHOLD)
71+
{
7072
return AirQualityEnum::kUnknown;
71-
} else if (value < GOOD_THRESHOLD) {
73+
}
74+
else if (value < GOOD_THRESHOLD)
75+
{
7276
return AirQualityEnum::kGood;
73-
} else if (value < FAIR_THRESHOLD) {
77+
}
78+
else if (value < FAIR_THRESHOLD)
79+
{
7480
return AirQualityEnum::kFair;
75-
} else if (value < MODERATE_THRESHOLD) {
81+
}
82+
else if (value < MODERATE_THRESHOLD)
83+
{
7684
return AirQualityEnum::kModerate;
77-
} else if (value < POOR_THRESHOLD) {
85+
}
86+
else if (value < POOR_THRESHOLD)
87+
{
7888
return AirQualityEnum::kPoor;
79-
} else if (value < VERY_POOR_THRESHOLD) {
89+
}
90+
else if (value < VERY_POOR_THRESHOLD)
91+
{
8092
return AirQualityEnum::kVeryPoor;
81-
} else {
93+
}
94+
else
95+
{
8296
return AirQualityEnum::kExtremelyPoor;
8397
}
8498
}
@@ -87,9 +101,9 @@ CHIP_ERROR SensorManager::Init()
87101
{
88102

89103
PlatformMgr().LockChipStack();
90-
ChipLogDetail(AppServer ,"Int instnace");
104+
ChipLogDetail(AppServer, "Int instnace");
91105
AirQualitySensorManager::InitInstance(1);
92-
ChipLogDetail(AppServer ,"Int instnace success");
106+
ChipLogDetail(AppServer, "Int instnace success");
93107
PlatformMgr().UnlockChipStack();
94108
// Create cmsisos sw timer for air quality sensor timer.
95109
mSensorTimer = osTimerNew(SensorTimerEventHandler, osTimerPeriodic, nullptr, nullptr);
@@ -114,15 +128,15 @@ CHIP_ERROR SensorManager::Init()
114128
// Starts or restarts the function timer
115129
if (osTimerStart(mSensorTimer, delayTicks))
116130
{
117-
ChipLogDetail(AppServer ,"mSensor Timer start() failed");
131+
ChipLogDetail(AppServer, "mSensor Timer start() failed");
118132
appError(APP_ERROR_START_TIMER_FAILED);
119133
}
120134
return CHIP_NO_ERROR;
121135
}
122136

123137
void SensorManager::SensorTimerEventHandler(void * arg)
124138
{
125-
int32_t air_quality;
139+
int32_t air_quality;
126140
#ifdef USE_AIR_QUALITY_SENSOR
127141
if (SL_STATUS_OK != AirQualitySensor::GetAirQuality(air_quality))
128142
{
@@ -157,6 +171,6 @@ int32_t air_quality;
157171
AppTask::GetAppTask().UpdateAirQualitySensorUI();
158172
PlatformMgr().UnlockChipStack();
159173

160-
ChipLogDetail(AppServer , "RAW AirQuality value: %ld and corresponding Enum value : %d", air_quality,chip::to_underlying( AirQualitySensorManager::GetInstance()->GetAirQuality() ));
161-
174+
ChipLogDetail(AppServer, "RAW AirQuality value: %ld and corresponding Enum value : %d", air_quality,
175+
chip::to_underlying(AirQualitySensorManager::GetInstance()->GetAirQuality()));
162176
}

‎examples/air-quality-sensor-app/silabs/src/ZclCallbacks.cpp

+2-2
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ using namespace ::chip::app::Clusters;
3838
void MatterPostAttributeChangeCallback(const chip::app::ConcreteAttributePath & attributePath, uint8_t type, uint16_t size,
3939
uint8_t * value)
4040
{
41-
ClusterId clusterId = attributePath.mClusterId;
42-
[[maybe_unused]]AttributeId attributeId = attributePath.mAttributeId;
41+
ClusterId clusterId = attributePath.mClusterId;
42+
[[maybe_unused]] AttributeId attributeId = attributePath.mAttributeId;
4343
ChipLogProgress(Zcl, "Cluster callback: " ChipLogFormatMEI, ChipLogValueMEI(clusterId));
4444

4545
if (clusterId == Identify::Id)

‎examples/platform/silabs/sensors/AirQuality/AirQualitySensor.cpp

+22-21
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,9 @@ extern "C" {
2929
#include <sparkfun_sgp40_i2c.h>
3030
}
3131
#include "sl_i2cspm_instances.h"
32-
#endif //USE_SPARKFUN_AIR_QUALITY_SENSOR
32+
#endif // USE_SPARKFUN_AIR_QUALITY_SENSOR
3333

34-
namespace{
34+
namespace {
3535
bool initialized = false;
3636
}
3737

@@ -41,7 +41,8 @@ namespace AirQualitySensor {
4141
* @brief Initializes the air quality sensor.
4242
*
4343
* This function initializes the air quality sensor, specifically supporting the SparkFun SGP40 air quality sensor.
44-
* It uses the I2C protocol for communication and sets up the VOC (Volatile Organic Compounds) algorithm for air quality measurement.
44+
* It uses the I2C protocol for communication and sets up the VOC (Volatile Organic Compounds) algorithm for air quality
45+
* measurement.
4546
*
4647
* @note If the macro USE_SPARKFUN_AIR_QUALITY_SENSOR is defined, the SparkFun SGP40 sensor is initialized.
4748
* If initialization is successful, the function returns SL_STATUS_OK, indicating the sensor is ready for use.
@@ -53,20 +54,20 @@ namespace AirQualitySensor {
5354

5455
sl_status_t Init()
5556
{
56-
sl_status_t status = SL_STATUS_FAIL;
57+
sl_status_t status = SL_STATUS_FAIL;
5758

58-
#ifdef USE_SPARKFUN_AIR_QUALITY_SENSOR
59+
#ifdef USE_SPARKFUN_AIR_QUALITY_SENSOR
5960
status = sparkfun_sgp40_init(sl_i2cspm_qwiic);
6061
VerifyOrReturnError(status == SL_STATUS_OK, SL_STATUS_FAIL);
6162
initialized = true;
6263

6364
sparkfun_sgp40_voc_algorithm_init();
6465

65-
#else
66-
//User implementation of Init
67-
#endif //USE_SPARKFUN_AIR_QUALITY_SENSOR
66+
#else
67+
// User implementation of Init
68+
#endif // USE_SPARKFUN_AIR_QUALITY_SENSOR
6869

69-
return status;
70+
return status;
7071
}
7172

7273
/**
@@ -87,22 +88,22 @@ sl_status_t Init()
8788
* SL_STATUS_NOT_INITIALIZED if the sensor has not been initialized, or other error codes as defined.
8889
*/
8990

90-
sl_status_t GetAirQuality(int32_t &air_quality)
91+
sl_status_t GetAirQuality(int32_t & air_quality)
9192
{
92-
sl_status_t status = SL_STATUS_FAIL;
93-
VerifyOrReturnError(initialized, SL_STATUS_NOT_INITIALIZED);
93+
sl_status_t status = SL_STATUS_FAIL;
94+
VerifyOrReturnError(initialized, SL_STATUS_NOT_INITIALIZED);
9495

95-
#ifdef USE_SPARKFUN_AIR_QUALITY_SENSOR
96-
constexpr float relativeHumidity = 50; //50%
97-
constexpr float temperature = 25; //25°C
96+
#ifdef USE_SPARKFUN_AIR_QUALITY_SENSOR
97+
constexpr float relativeHumidity = 50; // 50%
98+
constexpr float temperature = 25; // 25°C
9899

99-
status = sparkfun_sgp40_get_voc_index(&air_quality, relativeHumidity, temperature);
100-
VerifyOrReturnError(status == SL_STATUS_OK, status);
100+
status = sparkfun_sgp40_get_voc_index(&air_quality, relativeHumidity, temperature);
101+
VerifyOrReturnError(status == SL_STATUS_OK, status);
101102

102-
#else
103-
//User implementation of GetAirQuality
104-
#endif //USE_SPARKFUN_AIR_QUALITY_SENSOR
103+
#else
104+
// User implementation of GetAirQuality
105+
#endif // USE_SPARKFUN_AIR_QUALITY_SENSOR
105106

106-
return status;
107+
return status;
107108
}
108109
}; // namespace AirQualitySensor

0 commit comments

Comments
 (0)
Please sign in to comment.