Skip to content

Commit 14d41b7

Browse files
Sarthak-ShahaSarthak-Shaha
committed
SL-only changes
1 parent 12feaf8 commit 14d41b7

16 files changed

Lines changed: 72 additions & 64 deletions

File tree

‎.github/silabs-builds-mg24.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
},
88
{
99
"boards": ["BRD4187C"],
10-
"arguments": ["--docker", "--wifi wf200"]
10+
"arguments": ["--docker"]
1111
},
1212
{
1313
"boards": ["BRD4187C"],

‎.github/workflows/release_artifacts.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ jobs:
6464
runs-on: ubuntu-latest
6565

6666
container:
67-
image: ghcr.io/project-chip/chip-build-efr32:181
67+
image: ghcr.io/project-chip/chip-build-efr32:190
6868
steps:
6969
- name: Checkout
7070
uses: actions/checkout@v6

‎.github/workflows/silabs-common-build.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ jobs:
1818
runs-on: ubuntu-latest
1919

2020
container:
21-
image: ghcr.io/project-chip/chip-build-efr32:171
21+
image: ghcr.io/project-chip/chip-build-efr32:190
2222

2323
strategy:
2424
fail-fast: false

‎examples/fan-control-app/silabs/src/FanControlManager.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
*/
1818

1919
#include "FanControlManager.h"
20-
#if DISPLAY_ENABLED
20+
#if defined (DISPLAY_ENABLED) && DISPLAY_ENABLED
2121
#include "FanControlUI.h"
2222
#endif
2323

@@ -178,7 +178,7 @@ void FanControlManager::HandleFanControlAttributeChange(AttributeId attributeId,
178178
mFanMode = *reinterpret_cast<FanModeEnum *>(value);
179179
FanModeWriteCallback(mFanMode);
180180
UpdateFanControlLED();
181-
#if DISPLAY_ENABLED
181+
#if defined (DISPLAY_ENABLED) && DISPLAY_ENABLED
182182
UpdateFanControlLCD();
183183
#endif
184184
break;

‎examples/fan-control-app/silabs/src/FanControlUI.cpp‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,13 @@ void FanControlUI::DrawUI(GLIB_Context_t * glibContext)
5858
DrawHeader(glibContext);
5959
DrawCurrentFanMode(glibContext);
6060

61-
#if SL_LCDCTRL_MUX
61+
#if defined (SL_LCDCTRL_MUX) && SL_LCDCTRL_MUX
6262
sl_wfx_host_pre_lcd_spi_transfer();
63-
#endif // SL_LCDCTRL_MUX
63+
#endif // defined (SL_LCDCTRL_MUX) && SL_LCDCTRL_MUX
6464
DMD_updateDisplay();
65-
#if SL_LCDCTRL_MUX
65+
#if defined (SL_LCDCTRL_MUX) && SL_LCDCTRL_MUX
6666
sl_wfx_host_post_lcd_spi_transfer();
67-
#endif // SL_LCDCTRL_MUX
67+
#endif // defined (SL_LCDCTRL_MUX) && SL_LCDCTRL_MUX
6868
}
6969

7070
void FanControlUI::DrawHeader(GLIB_Context_t * glibContext)
@@ -78,13 +78,13 @@ void FanControlUI::DrawHeader(GLIB_Context_t * glibContext)
7878
WIFI_BITMAP_HEIGHT, (UI_WIFI) ? wifiLogo : threadLogo);
7979
// Draw Matter Icon
8080
GLIB_drawBitmap(glibContext, MATTER_ICON_POSITION_X, STATUS_ICON_LINE, MATTER_LOGO_WIDTH, MATTER_LOGO_HEIGHT, matterLogoBitmap);
81-
#if SL_LCDCTRL_MUX
81+
#if defined (SL_LCDCTRL_MUX) && SL_LCDCTRL_MUX
8282
sl_wfx_host_pre_lcd_spi_transfer();
83-
#endif // SL_LCDCTRL_MUX
83+
#endif // defined (SL_LCDCTRL_MUX) && SL_LCDCTRL_MUX
8484
DMD_updateDisplay();
85-
#if SL_LCDCTRL_MUX
85+
#if defined (SL_LCDCTRL_MUX) && SL_LCDCTRL_MUX
8686
sl_wfx_host_post_lcd_spi_transfer();
87-
#endif // SL_LCDCTRL_MUX
87+
#endif // defined (SL_LCDCTRL_MUX) && SL_LCDCTRL_MUX
8888
}
8989

9090
/**
@@ -140,13 +140,13 @@ void FanControlUI::DrawCurrentFanMode(GLIB_Context_t * glibContext)
140140
break;
141141
}
142142

143-
#if SL_LCDCTRL_MUX
143+
#if defined (SL_LCDCTRL_MUX) && SL_LCDCTRL_MUX
144144
sl_wfx_host_pre_lcd_spi_transfer();
145-
#endif // SL_LCDCTRL_MUX
145+
#endif // defined (SL_LCDCTRL_MUX) && SL_LCDCTRL_MUX
146146
DMD_updateDisplay();
147-
#if SL_LCDCTRL_MUX
147+
#if defined (SL_LCDCTRL_MUX) && SL_LCDCTRL_MUX
148148
sl_wfx_host_post_lcd_spi_transfer();
149-
#endif // SL_LCDCTRL_MUX
149+
#endif // defined (SL_LCDCTRL_MUX) && SL_LCDCTRL_MUX
150150
}
151151

152152
void FanControlUI::DrawFont(GLIB_Context_t * glibContext, uint8_t initial_x, uint8_t initial_y, uint8_t width, uint8_t * data,

‎examples/multi-sensor-app/silabs/include/SensorManager.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
#include <lib/core/CHIPError.h>
2727
#include <protocols/interaction_model/StatusCode.h>
2828

29-
#if DISPLAY_ENABLED
29+
#if defined (DISPLAY_ENABLED) && DISPLAY_ENABLED
3030
#include "glib.h"
3131
#endif
3232

‎examples/multi-sensor-app/silabs/src/AppTask.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
#include <setup_payload/SetupPayload.h>
3434
#include <sl_cmsis_os2_common.h>
3535

36-
#if DISPLAY_ENABLED
36+
#if defined (DISPLAY_ENABLED) && DISPLAY_ENABLED
3737
#include <SensorsUI.h>
3838
#endif
3939

‎examples/multi-sensor-app/silabs/src/SensorsUI.cpp‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@
2727
#include <stdio.h>
2828
#include <string.h>
2929

30-
#if SL_WIFI && !SLI_SI91X_MCU_INTERFACE
30+
#if defined (SL_WIFI) && SL_WIFI && !defined(SLI_SI91X_MCU_INTERFACE)
3131
#include <platform/silabs/wifi/ncp/spi_multiplex.h>
32-
#endif // SL_WIFI && !SLI_SI91X_MCU_INTERFACE
32+
#endif // defined (SL_WIFI) && SL_WIFI && !defined(SLI_SI91X_MCU_INTERFACE)
3333

3434
using namespace chip::Protocols::InteractionModel;
3535

@@ -134,31 +134,31 @@ void GetTemperatureHumidityWork(intptr_t contextPtr)
134134
}
135135
}
136136

137-
#if SL_LCDCTRL_MUX
137+
#if defined (SL_LCDCTRL_MUX) && SL_LCDCTRL_MUX
138138
VerifyOrReturn(sl_wfx_host_pre_lcd_spi_transfer == SL_STATUS_OK);
139-
#endif // SL_LCDCTRL_MUX
139+
#endif // defined (SL_LCDCTRL_MUX) && SL_LCDCTRL_MUX
140140

141141
DMD_updateDisplay();
142142

143-
#if SL_LCDCTRL_MUX
143+
#if defined (SL_LCDCTRL_MUX) && SL_LCDCTRL_MUX
144144
VerifyOrReturn(sl_wfx_host_post_lcd_spi_transfer() == SL_STATUS_OK);
145-
#endif // SL_LCDCTRL_MUX
145+
#endif // defined (SL_LCDCTRL_MUX) && SL_LCDCTRL_MUX
146146

147-
#if SLI_SI91X_MCU_INTERFACE && CHIP_CONFIG_ENABLE_ICD_SERVER
147+
#if defined (SLI_SI91X_MCU_INTERFACE) && SLI_SI91X_MCU_INTERFACE && defined (CHIP_CONFIG_ENABLE_ICD_SERVER) && CHIP_CONFIG_ENABLE_ICD_SERVER
148148
// MEMLCD is not a UULP component and not available in sleep so powering down before sleep and need to be re-initialized after
149149
// sleep-wakeup
150150
sl_memlcd_power_on(NULL, false);
151-
#endif // SLI_SI91X_MCU_INTERFACE && CHIP_CONFIG_ENABLE_ICD_SERVER
151+
#endif // defined (SLI_SI91X_MCU_INTERFACE) && SLI_SI91X_MCU_INTERFACE && defined (CHIP_CONFIG_ENABLE_ICD_SERVER) && CHIP_CONFIG_ENABLE_ICD_SERVER
152152
}
153153

154154
void SensorUI(GLIB_Context_t * glibContext)
155155
{
156156
uint8_t line = 1;
157157

158-
#if SLI_SI91X_MCU_INTERFACE && CHIP_CONFIG_ENABLE_ICD_SERVER
158+
#if defined (SLI_SI91X_MCU_INTERFACE) && SLI_SI91X_MCU_INTERFACE && defined (CHIP_CONFIG_ENABLE_ICD_SERVER) && CHIP_CONFIG_ENABLE_ICD_SERVER
159159
// In sleep, memlcd will not be retained so re-initialize MEMLCD interface after sleep wakeup
160160
sl_memlcd_post_wakeup_init();
161-
#endif // SLI_SI91X_MCU_INTERFACE && SL_ICD_ENABLED && CHIP_CONFIG_ENABLE_ICD_SERVER
161+
#endif // defined (SLI_SI91X_MCU_INTERFACE) && SLI_SI91X_MCU_INTERFACE && defined (CHIP_CONFIG_ENABLE_ICD_SERVER) && CHIP_CONFIG_ENABLE_ICD_SERVER
162162

163163
GLIB_clear(glibContext);
164164

‎examples/oven-app/silabs/src/OvenUI.cpp‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@ void OvenUI::DrawUI(GLIB_Context_t * glibContext)
6363
DrawCookTopState(glibContext);
6464
DrawOvenMode(glibContext);
6565

66-
#if SL_LCDCTRL_MUX
66+
#if defined (SL_LCDCTRL_MUX) && SL_LCDCTRL_MUX
6767
sl_wfx_host_pre_lcd_spi_transfer();
68-
#endif // SL_LCDCTRL_MUX
68+
#endif // defined (SL_LCDCTRL_MUX) && SL_LCDCTRL_MUX
6969
DMD_updateDisplay();
70-
#if SL_LCDCTRL_MUX
70+
#if defined (SL_LCDCTRL_MUX) && SL_LCDCTRL_MUX
7171
sl_wfx_host_post_lcd_spi_transfer();
72-
#endif // SL_LCDCTRL_MUX
72+
#endif // defined (SL_LCDCTRL_MUX) && SL_LCDCTRL_MUX
7373
}
7474

7575
void OvenUI::DrawHeader(GLIB_Context_t * glibContext)

‎examples/platform/silabs/BaseApplication.cpp‎

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -109,9 +109,9 @@
109109
#endif // MATTER_TRACING_ENABLED
110110

111111
// sl-only
112-
#if SL_MATTER_ENABLE_APP_SLEEP_MANAGER
112+
#if defined(SL_MATTER_ENABLE_APP_SLEEP_MANAGER) && SL_MATTER_ENABLE_APP_SLEEP_MANAGER
113113
#include <ApplicationSleepManager.h>
114-
#endif // SL_MATTER_ENABLE_APP_SLEEP_MANAGER
114+
#endif // defined(SL_MATTER_ENABLE_APP_SLEEP_MANAGER) && SL_MATTER_ENABLE_APP_SLEEP_MANAGER
115115

116116
/**********************************************************
117117
* Defines and Constants
@@ -226,16 +226,16 @@ void BaseApplicationDelegate::OnCommissioningSessionEstablishmentError(CHIP_ERRO
226226

227227
void BaseApplicationDelegate::OnCommissioningWindowOpened()
228228
{
229-
#if SL_MATTER_ENABLE_APP_SLEEP_MANAGER
229+
#if defined(SL_MATTER_ENABLE_APP_SLEEP_MANAGER) && SL_MATTER_ENABLE_APP_SLEEP_MANAGER
230230
app::Silabs::ApplicationSleepManager::GetInstance().OnCommissioningWindowOpened();
231-
#endif // SL_MATTER_ENABLE_APP_SLEEP_MANAGER
231+
#endif // defined(SL_MATTER_ENABLE_APP_SLEEP_MANAGER) && SL_MATTER_ENABLE_APP_SLEEP_MANAGER
232232
}
233233

234234
void BaseApplicationDelegate::OnCommissioningWindowClosed()
235235
{
236-
#if SL_MATTER_ENABLE_APP_SLEEP_MANAGER
236+
#if defined(SL_MATTER_ENABLE_APP_SLEEP_MANAGER) && SL_MATTER_ENABLE_APP_SLEEP_MANAGER
237237
app::Silabs::ApplicationSleepManager::GetInstance().OnCommissioningWindowClosed();
238-
#endif // SL_MATTER_ENABLE_APP_SLEEP_MANAGER
238+
#endif // defined(SL_MATTER_ENABLE_APP_SLEEP_MANAGER) && SL_MATTER_ENABLE_APP_SLEEP_MANAGER
239239

240240
if (BaseApplication::GetProvisionStatus())
241241
{
@@ -986,12 +986,20 @@ void BaseApplication::DoProvisioningReset()
986986
});
987987
}
988988

989+
<<<<<<< HEAD
989990
#if defined(SILABS_OTA_ENABLED) && SILABS_OTA_ENABLED
991+
=======
992+
#if defined (SILABS_OTA_ENABLED) && SILABS_OTA_ENABLED
993+
>>>>>>> 504e8259c8 (SL-only)
990994
void BaseApplication::InitOTARequestorHandler(System::Layer * systemLayer, void * appState)
991995
{
992996
OTAConfig::Init();
993997
}
998+
<<<<<<< HEAD
994999
#endif // defined(SILABS_OTA_ENABLED) && SILABS_OTA_ENABLED
1000+
=======
1001+
#endif // defined (SILABS_OTA_ENABLED) && SILABS_OTA_ENABLED
1002+
>>>>>>> 504e8259c8 (SL-only)
9951003

9961004
void BaseApplication::OnPlatformEvent(const ChipDeviceEvent * event, intptr_t)
9971005
{

0 commit comments

Comments
 (0)