Skip to content

Commit

Permalink
Restyled by clang-format
Browse files Browse the repository at this point in the history
  • Loading branch information
@restyled-commits @shgutte
restyled-commits authored and shgutte committed Sep 18, 2024
1 parent 10944f2 commit dff3955
Show file tree
Hide file tree
Showing 6 changed files with 65 additions and 58 deletions.
1 change: 0 additions & 1 deletion examples/refrigerator-app/silabs/include/AppTask.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,5 +107,4 @@ class AppTask : public BaseApplication
* @param aEvent button event being processed
*/
static void RefrigeratorActionEventHandler(AppEvent * aEvent);

};
4 changes: 2 additions & 2 deletions examples/refrigerator-app/silabs/include/RefrigeratorUI.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ class RefrigeratorUI
{

public:

static void DrawUI(GLIB_Context_t * glibContext);
static void SetCurrentTemp(int8_t temp);
static void SetMode(uint8_t mode);
Expand All @@ -35,6 +34,7 @@ class RefrigeratorUI
static void DrawHeader(GLIB_Context_t * glibContext);
static void DrawFooter(GLIB_Context_t * glibContext, bool autoMode = true);
static void DrawCurrentTemp(GLIB_Context_t * glibContext, int8_t temp, bool isCelsius = true);
static void DrawFont(GLIB_Context_t * glibContext, uint8_t initial_x, uint8_t initial_y, uint8_t width, uint8_t * data, uint32_t size);
static void DrawFont(GLIB_Context_t * glibContext, uint8_t initial_x, uint8_t initial_y, uint8_t width, uint8_t * data,
uint32_t size);
static void DrawSetPoint(GLIB_Context_t * glibContext, int8_t setPoint, bool secondLine);
};
10 changes: 5 additions & 5 deletions ...es/refrigerator-app/silabs/include/refrigerator-and-temperature-controlled-cabinet-mode.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,10 +36,10 @@ const uint8_t ModeRapidFreeze = 1;
class RefrigeratorAndTemperatureControlledCabinetModeDelegate : public ModeBase::Delegate
{
private:
using ModeTagStructType = detail::Structs::ModeTagStruct::Type;
ModeTagStructType modeTagsRapidCool[1] = { { .value = to_underlying(ModeTag::kRapidCool) } };
ModeTagStructType modeTagsRapidFreeze[2] = { { .value = to_underlying(ModeBase::ModeTag::kMax) },
{ .value = to_underlying(ModeTag::kRapidFreeze) } };
using ModeTagStructType = detail::Structs::ModeTagStruct::Type;
ModeTagStructType modeTagsRapidCool[1] = { { .value = to_underlying(ModeTag::kRapidCool) } };
ModeTagStructType modeTagsRapidFreeze[2] = { { .value = to_underlying(ModeBase::ModeTag::kMax) },
{ .value = to_underlying(ModeTag::kRapidFreeze) } };

const detail::Structs::ModeOptionStruct::Type kModeOptions[2] = {
detail::Structs::ModeOptionStruct::Type{ .label = CharSpan::fromCharString("Rapid Cool"),
Expand All @@ -64,7 +64,7 @@ ModeBase::Instance * Instance();

void Shutdown();

} // namespace LaundryWasherMode
} // namespace RefrigeratorAndTemperatureControlledCabinetMode

} // namespace Clusters
} // namespace app
Expand Down
2 changes: 1 addition & 1 deletion examples/refrigerator-app/silabs/src/AppTask.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -44,11 +44,11 @@
#include <app/util/attribute-storage.h>
#include <assert.h>
#include <lib/support/CodeUtils.h>
#include <lib/support/logging/CHIPLogging.h>
#include <platform/CHIPDeviceLayer.h>
#include <platform/silabs/platformAbstraction/SilabsPlatform.h>
#include <setup_payload/QRCodeSetupPayloadGenerator.h>
#include <setup_payload/SetupPayload.h>
#include <lib/support/logging/CHIPLogging.h>

/**********************************************************
* Defines and Constants
Expand Down
86 changes: 44 additions & 42 deletions examples/refrigerator-app/silabs/src/RefrigeratorManager.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,8 @@ int8_t RefrigeratorManager::ConvertToPrintableTemp(int16_t temperature)
return static_cast<int8_t>(temperature / 100);
}

void RefrigeratorManager::RefAndTempCtrlAttributeChangeHandler(EndpointId endpointId, AttributeId attributeId, uint8_t * value, uint16_t size)
void RefrigeratorManager::RefAndTempCtrlAttributeChangeHandler(EndpointId endpointId, AttributeId attributeId, uint8_t * value,
uint16_t size)
{
switch (attributeId)
{
Expand Down Expand Up @@ -124,54 +125,55 @@ void RefrigeratorManager::RefAndTempCtrlAttributeChangeHandler(EndpointId endpoi
}
}

void RefrigeratorManager::TempCtrlAttributeChangeHandler(EndpointId endpointId, AttributeId attributeId, uint8_t * value, uint16_t size)
void RefrigeratorManager::TempCtrlAttributeChangeHandler(EndpointId endpointId, AttributeId attributeId, uint8_t * value,
uint16_t size)
{
switch (attributeId)
{
case TempCtrlAttr::TemperatureSetpoint::Id: {
int16_t temperatureSetpoint = ConvertToPrintableTemp(static_cast<int16_t>(*value));
mTemperatureSetpoint = temperatureSetpoint;
TempCtrlAttr::TemperatureSetpoint::Set(endpointId, temperatureSetpoint);
}
break;

case TempCtrlAttr::MinTemperature::Id: {
int16_t minTemperature = ConvertToPrintableTemp(static_cast<int16_t>(*value));
mMinTemperature = minTemperature;
TempCtrlAttr::MinTemperature::Set(endpointId, minTemperature);
}
break;

case TempCtrlAttr::MaxTemperature::Id: {
int16_t maxTemperature = ConvertToPrintableTemp(static_cast<int16_t>(*value));
mMaxTemperature = maxTemperature;
TempCtrlAttr::MaxTemperature::Set(endpointId, maxTemperature);
}
break;

case TempCtrlAttr::SelectedTemperatureLevel::Id: {
int16_t selectedTemperatureLevel = ConvertToPrintableTemp(static_cast<int16_t>(*value));
mSelectedTemperatureLevel = selectedTemperatureLevel;
TempCtrlAttr::SelectedTemperatureLevel::Set(endpointId, selectedTemperatureLevel);
}
break;

case TempCtrlAttr::Step::Id: {
int16_t step = ConvertToPrintableTemp(static_cast<int16_t>(*value));
TempCtrlAttr::MaxTemperature::Set(endpointId, step);
}
break;

default: {
ChipLogError(AppServer, "Unhandled Temperature controlled attribute %ld", attributeId);
return;
}
break;
case TempCtrlAttr::TemperatureSetpoint::Id: {
int16_t temperatureSetpoint = ConvertToPrintableTemp(static_cast<int16_t>(*value));
mTemperatureSetpoint = temperatureSetpoint;
TempCtrlAttr::TemperatureSetpoint::Set(endpointId, temperatureSetpoint);
}
break;

case TempCtrlAttr::MinTemperature::Id: {
int16_t minTemperature = ConvertToPrintableTemp(static_cast<int16_t>(*value));
mMinTemperature = minTemperature;
TempCtrlAttr::MinTemperature::Set(endpointId, minTemperature);
}
break;

case TempCtrlAttr::MaxTemperature::Id: {
int16_t maxTemperature = ConvertToPrintableTemp(static_cast<int16_t>(*value));
mMaxTemperature = maxTemperature;
TempCtrlAttr::MaxTemperature::Set(endpointId, maxTemperature);
}
break;

case TempCtrlAttr::SelectedTemperatureLevel::Id: {
int16_t selectedTemperatureLevel = ConvertToPrintableTemp(static_cast<int16_t>(*value));
mSelectedTemperatureLevel = selectedTemperatureLevel;
TempCtrlAttr::SelectedTemperatureLevel::Set(endpointId, selectedTemperatureLevel);
}
break;

case TempCtrlAttr::Step::Id: {
int16_t step = ConvertToPrintableTemp(static_cast<int16_t>(*value));
TempCtrlAttr::MaxTemperature::Set(endpointId, step);
}
break;

default: {
ChipLogError(AppServer, "Unhandled Temperature controlled attribute %ld", attributeId);
return;
}
break;
}
}

void RefrigeratorManager::RefAlaramAttributeChangeHandler(EndpointId endpointId, AttributeId attributeId, uint8_t * value, uint16_t size)
void RefrigeratorManager::RefAlaramAttributeChangeHandler(EndpointId endpointId, AttributeId attributeId, uint8_t * value,
uint16_t size)
{
switch (attributeId)
{
Expand Down
20 changes: 13 additions & 7 deletions ...ples/refrigerator-app/silabs/src/refrigerator-and-temperature-controlled-cabinet-mode.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,19 +26,21 @@ using List = chip::app::DataModel::List<T>;
using ModeTagStructType = chip::app::Clusters::detail::Structs::ModeTagStruct::Type;

static RefrigeratorAndTemperatureControlledCabinetModeDelegate * gRefrigeratorAndTemperatureControlledCabinetModeDelegate = nullptr;
static ModeBase::Instance * gRefrigeratorAndTemperatureControlledCabinetModeInstance = nullptr;
static ModeBase::Instance * gRefrigeratorAndTemperatureControlledCabinetModeInstance = nullptr;

CHIP_ERROR RefrigeratorAndTemperatureControlledCabinetModeDelegate::Init()
{
return CHIP_NO_ERROR;
}

void RefrigeratorAndTemperatureControlledCabinetModeDelegate::HandleChangeToMode(uint8_t NewMode, ModeBase::Commands::ChangeToModeResponse::Type & response)
void RefrigeratorAndTemperatureControlledCabinetModeDelegate::HandleChangeToMode(
uint8_t NewMode, ModeBase::Commands::ChangeToModeResponse::Type & response)
{
response.status = to_underlying(ModeBase::StatusCode::kSuccess);
}

CHIP_ERROR RefrigeratorAndTemperatureControlledCabinetModeDelegate::GetModeLabelByIndex(uint8_t modeIndex, chip::MutableCharSpan & label)
CHIP_ERROR RefrigeratorAndTemperatureControlledCabinetModeDelegate::GetModeLabelByIndex(uint8_t modeIndex,
chip::MutableCharSpan & label)
{
if (modeIndex >= ArraySize(kModeOptions))
{
Expand All @@ -57,7 +59,8 @@ CHIP_ERROR RefrigeratorAndTemperatureControlledCabinetModeDelegate::GetModeValue
return CHIP_NO_ERROR;
}

CHIP_ERROR RefrigeratorAndTemperatureControlledCabinetModeDelegate::GetModeTagsByIndex(uint8_t modeIndex, List<ModeTagStructType> & tags)
CHIP_ERROR RefrigeratorAndTemperatureControlledCabinetModeDelegate::GetModeTagsByIndex(uint8_t modeIndex,
List<ModeTagStructType> & tags)
{
if (modeIndex >= ArraySize(kModeOptions))
{
Expand Down Expand Up @@ -97,9 +100,12 @@ void RefrigeratorAndTemperatureControlledCabinetMode::Shutdown()
void emberAfRefrigeratorAndTemperatureControlledCabinetModeClusterInitCallback(chip::EndpointId endpointId)
{
VerifyOrDie(endpointId == 1); // this cluster is only enabled for endpoint 1.
VerifyOrDie(gRefrigeratorAndTemperatureControlledCabinetModeDelegate == nullptr && gRefrigeratorAndTemperatureControlledCabinetModeInstance == nullptr);
gRefrigeratorAndTemperatureControlledCabinetModeDelegate = new RefrigeratorAndTemperatureControlledCabinetMode::RefrigeratorAndTemperatureControlledCabinetModeDelegate;
VerifyOrDie(gRefrigeratorAndTemperatureControlledCabinetModeDelegate == nullptr &&
gRefrigeratorAndTemperatureControlledCabinetModeInstance == nullptr);
gRefrigeratorAndTemperatureControlledCabinetModeDelegate =
new RefrigeratorAndTemperatureControlledCabinetMode::RefrigeratorAndTemperatureControlledCabinetModeDelegate;
gRefrigeratorAndTemperatureControlledCabinetModeInstance =
new ModeBase::Instance(gRefrigeratorAndTemperatureControlledCabinetModeDelegate, 0x1, RefrigeratorAndTemperatureControlledCabinetMode::Id, chip::to_underlying(Feature::kOnOff));
new ModeBase::Instance(gRefrigeratorAndTemperatureControlledCabinetModeDelegate, 0x1,
RefrigeratorAndTemperatureControlledCabinetMode::Id, chip::to_underlying(Feature::kOnOff));
gRefrigeratorAndTemperatureControlledCabinetModeInstance->Init();
}

0 comments on commit dff3955

Please sign in to comment.