Skip to content

Commit b305fb9

Browse files
committed
feat(matter): implements Thread connected function and add feature enabled functions
1 parent cc06c3e commit b305fb9

File tree

3 files changed

+11
-22
lines changed

3 files changed

+11
-22
lines changed

libraries/Matter/keywords.txt

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,10 +63,14 @@ begin KEYWORD2
6363
end KEYWORD2
6464
getManualPairingCode KEYWORD2
6565
getOnboardingQRCodeUrl KEYWORD2
66+
isBLECommissioningEnabled KEYWORD2
6667
isDeviceCommissioned KEYWORD2
67-
isWiFiConnected KEYWORD2
68-
isThreadConnected KEYWORD2
6968
isDeviceConnected KEYWORD2
69+
isThreadConnected KEYWORD2
70+
isThreadEnabled KEYWORD2
71+
isWiFiAccessPointEnabled KEYWORD2
72+
isWiFiConnected KEYWORD2
73+
isWiFiStationEnabled KEYWORD2
7074
decommission KEYWORD2
7175
attributeChangeCB KEYWORD2
7276
setOnOff KEYWORD2

libraries/Matter/src/Matter.cpp

Lines changed: 5 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -233,31 +233,20 @@ bool ArduinoMatter::isBLECommissioningEnabled() {
233233
}
234234

235235

236-
#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
237-
bool ArduinoMatter::isThreadConnected() {
238-
return chip::DeviceLayer::ConnectivityMgr().IsThreadAttached();
239-
}
240-
#endif
241-
242236
bool ArduinoMatter::isDeviceCommissioned() {
243237
return chip::Server::GetInstance().GetFabricTable().FabricCount() > 0;
244238
}
245239

246-
#if CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION
247240
bool ArduinoMatter::isWiFiConnected() {
248241
return chip::DeviceLayer::ConnectivityMgr().IsWiFiStationConnected();
249242
}
250-
#endif
243+
244+
bool ArduinoMatter::isThreadConnected() {
245+
return chip::DeviceLayer::ConnectivityMgr().IsThreadAttached();
246+
}
251247

252248
bool ArduinoMatter::isDeviceConnected() {
253-
bool retCode = false;
254-
#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
255-
retCode |= ArduinoMatter::isThreadConnected();
256-
#endif
257-
#if CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION
258-
retCode |= ArduinoMatter::isWiFiConnected();
259-
#endif
260-
return retCode;
249+
return ArduinoMatter::isWiFiConnected() || ArduinoMatter::isThreadConnected();
261250
}
262251

263252
void ArduinoMatter::decommission() {

libraries/Matter/src/Matter.h

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -188,12 +188,8 @@ class ArduinoMatter {
188188
static bool isBLECommissioningEnabled(); // Check if BLE commissioning is supported and enabled
189189

190190
static bool isDeviceCommissioned();
191-
#if CHIP_DEVICE_CONFIG_ENABLE_WIFI_STATION
192191
static bool isWiFiConnected();
193-
#endif
194-
#if CHIP_DEVICE_CONFIG_ENABLE_THREAD
195192
static bool isThreadConnected();
196-
#endif
197193
static bool isDeviceConnected();
198194
static void decommission();
199195

0 commit comments

Comments
 (0)