Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions applications/nrf_desktop/src/modules/failsafe.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,6 @@ static bool failsafe_check(void)

uint32_t reas = nrfx_reset_reason_get();

nrfx_reset_reason_clear(reas);

return (reas & mask) != 0;
}

Expand All @@ -45,6 +43,11 @@ static void failsafe_erase(void)
}
}

static void failsafe_clear(void)
{
nrfx_reset_reason_clear(nrfx_reset_reason_get());
}

static bool app_event_handler(const struct app_event_header *aeh)
{
if (is_module_state_event(aeh)) {
Expand All @@ -60,6 +63,8 @@ static bool app_event_handler(const struct app_event_header *aeh)
if (failsafe_check()) {
failsafe_erase();
}
failsafe_clear();

module_set_state(MODULE_STATE_READY);
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ top_table:
Thread: NET_L2_OPENTHREAD
LTE: LTE_LINK_CONTROL
HomeKit: HOMEKIT
Matter: CHIP
features:
zigbee:
Zigbee (Sleepy) End Device: ZIGBEE_ROLE_END_DEVICE
Expand All @@ -27,7 +28,7 @@ features:
Thread + nRF21540 (GPIO): NET_L2_OPENTHREAD && (MPSL_FEM_NRF21540_GPIO_SUPPORT || MPSL_FEM_GENERIC_TWO_CTRL_PINS_SUPPORT)
matter:
Matter over Thread: CHIP && NET_L2_OPENTHREAD
Matter over Wi-Fi: CHIP && WIFI_NRF700X
Matter over Wi-Fi: CHIP_OVER_WIFI
Matter commissioning over IP: CHIP
Matter commissioning over Bluetooth LE with QR code onboarding: CHIP && BT
Matter commissioning over Bluetooth LE with NFC onboarding: CHIP && BT && CHIP_NFC_COMMISSIONING
Expand Down
5 changes: 3 additions & 2 deletions subsys/matter/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@
#

# Support for Matter (formerly Connected Home over IP) protocol in NCS is experimental for Wi-Fi technology
config CHIP
config CHIP_OVER_WIFI
bool
select EXPERIMENTAL if WIFI_NRF700X
default y if CHIP && WIFI_NRF700X
select EXPERIMENTAL