From bc3d834b20972476246cb8a6efab0c3ffa3c3bf7 Mon Sep 17 00:00:00 2001 From: rbaron Date: Sat, 1 Jul 2023 08:26:21 +0200 Subject: [PATCH] Make it mandatory to select a factory reset method ... in order to avoid unhappy surprises --- code/nrf-connect/samples/zigbee/src/factory_reset.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/code/nrf-connect/samples/zigbee/src/factory_reset.c b/code/nrf-connect/samples/zigbee/src/factory_reset.c index 5b64cdc..3495799 100644 --- a/code/nrf-connect/samples/zigbee/src/factory_reset.c +++ b/code/nrf-connect/samples/zigbee/src/factory_reset.c @@ -66,7 +66,10 @@ int prst_zb_factory_reset_check() { LOG_DBG("SW1 pressed. Scheduling timer"); k_timer_start(&sw1_factory_reset_check_timer, K_SECONDS(5), K_NO_WAIT); } + return 0; #elif CONFIG_PRST_ZB_FACTORY_RESET_DISABLED return 0; +#else +#error "No factory reset method selected -- explicitly select CONFIG_PRST_ZB_FACTORY_RESET_DISABLED=y to disable it" #endif // CONFIG_PRST_ZB_FACTORY_RESET_VIA_RESET_PIN } \ No newline at end of file