applications: nrf_desktop: Decentralize settings handling

MarekPieta · pdunaj · commit d89be110b5bf · 2020-03-02T15:33:18.000+01:00
Change switches to handle setttings separately in every module.
This is required to switch to dynamic module IDs in config channel.

Jira:DESK-593

Signed-off-by: Marek Pieta &lt;Marek.Pieta@nordicsemi.no&gt;
diff --git a/applications/nrf_desktop/configuration/nrf52810_pca20045/app_ZDebug.conf b/applications/nrf_desktop/configuration/nrf52810_pca20045/app_ZDebug.conf
@@ -54,7 +54,6 @@ CONFIG_DESKTOP_BLE_PEER_CONTROL=y
 CONFIG_DESKTOP_BLE_PEER_CONTROL_BUTTON=0x0002
 CONFIG_DESKTOP_BLE_PEER_ERASE_ON_START=y
 
-CONFIG_DESKTOP_CONFIG_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_ENABLE=n
 
 ################################################################################
diff --git a/applications/nrf_desktop/configuration/nrf52810_pca20045/app_ZRelease.conf b/applications/nrf_desktop/configuration/nrf52810_pca20045/app_ZRelease.conf
@@ -50,7 +50,6 @@ CONFIG_DESKTOP_BLE_PEER_ERASE_ON_START=y
 
 CONFIG_DESKTOP_WATCHDOG_ENABLE=y
 
-CONFIG_DESKTOP_CONFIG_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_ENABLE=n
 
 ################################################################################
diff --git a/applications/nrf_desktop/configuration/nrf52833_pca10100/app_ZDebug.conf b/applications/nrf_desktop/configuration/nrf52833_pca10100/app_ZDebug.conf
@@ -40,7 +40,6 @@ CONFIG_DESKTOP_BLE_SCAN_DURATION_S=5
 
 CONFIG_DESKTOP_BLE_DISCOVERY_ENABLE=y
 
-CONFIG_DESKTOP_CONFIG_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_ENABLE=y
 
 CONFIG_DESKTOP_BLE_QOS_ENABLE=y
diff --git a/applications/nrf_desktop/configuration/nrf52833_pca10100/app_ZDebugMCUBoot.conf b/applications/nrf_desktop/configuration/nrf52833_pca10100/app_ZDebugMCUBoot.conf
@@ -40,7 +40,6 @@ CONFIG_DESKTOP_BLE_SCAN_DURATION_S=5
 
 CONFIG_DESKTOP_BLE_DISCOVERY_ENABLE=y
 
-CONFIG_DESKTOP_CONFIG_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_DFU_ENABLE=y
 
diff --git a/applications/nrf_desktop/configuration/nrf52833_pca10100/app_ZDebugWithShell.conf b/applications/nrf_desktop/configuration/nrf52833_pca10100/app_ZDebugWithShell.conf
@@ -40,7 +40,6 @@ CONFIG_DESKTOP_BLE_SCAN_DURATION_S=5
 
 CONFIG_DESKTOP_BLE_DISCOVERY_ENABLE=y
 
-CONFIG_DESKTOP_CONFIG_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_ENABLE=y
 
 CONFIG_DESKTOP_BLE_QOS_ENABLE=y
diff --git a/applications/nrf_desktop/configuration/nrf52833_pca10100/app_ZRelease.conf b/applications/nrf_desktop/configuration/nrf52833_pca10100/app_ZRelease.conf
@@ -38,7 +38,6 @@ CONFIG_DESKTOP_BLE_DISCOVERY_ENABLE=y
 
 CONFIG_DESKTOP_WATCHDOG_ENABLE=y
 
-CONFIG_DESKTOP_CONFIG_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_ENABLE=y
 
 CONFIG_DESKTOP_BLE_QOS_ENABLE=y
diff --git a/applications/nrf_desktop/configuration/nrf52833_pca10100/app_ZReleaseMCUBoot.conf b/applications/nrf_desktop/configuration/nrf52833_pca10100/app_ZReleaseMCUBoot.conf
@@ -38,7 +38,6 @@ CONFIG_DESKTOP_BLE_DISCOVERY_ENABLE=y
 
 CONFIG_DESKTOP_WATCHDOG_ENABLE=y
 
-CONFIG_DESKTOP_CONFIG_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_DFU_ENABLE=y
 
diff --git a/applications/nrf_desktop/configuration/nrf52833_pca10111/app_ZDebug.conf b/applications/nrf_desktop/configuration/nrf52833_pca10111/app_ZDebug.conf
@@ -40,7 +40,6 @@ CONFIG_DESKTOP_BLE_SCAN_DURATION_S=5
 
 CONFIG_DESKTOP_BLE_DISCOVERY_ENABLE=y
 
-CONFIG_DESKTOP_CONFIG_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_ENABLE=y
 
 CONFIG_DESKTOP_BLE_QOS_ENABLE=y
diff --git a/applications/nrf_desktop/configuration/nrf52833_pca10111/app_ZDebugMCUBoot.conf b/applications/nrf_desktop/configuration/nrf52833_pca10111/app_ZDebugMCUBoot.conf
@@ -40,7 +40,6 @@ CONFIG_DESKTOP_BLE_SCAN_DURATION_S=5
 
 CONFIG_DESKTOP_BLE_DISCOVERY_ENABLE=y
 
-CONFIG_DESKTOP_CONFIG_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_DFU_ENABLE=y
 
diff --git a/applications/nrf_desktop/configuration/nrf52833_pca10111/app_ZDebugWithShell.conf b/applications/nrf_desktop/configuration/nrf52833_pca10111/app_ZDebugWithShell.conf
@@ -40,7 +40,6 @@ CONFIG_DESKTOP_BLE_SCAN_DURATION_S=5
 
 CONFIG_DESKTOP_BLE_DISCOVERY_ENABLE=y
 
-CONFIG_DESKTOP_CONFIG_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_ENABLE=y
 
 CONFIG_DESKTOP_BLE_QOS_ENABLE=y
diff --git a/applications/nrf_desktop/configuration/nrf52833_pca10111/app_ZRelease.conf b/applications/nrf_desktop/configuration/nrf52833_pca10111/app_ZRelease.conf
@@ -38,7 +38,6 @@ CONFIG_DESKTOP_BLE_DISCOVERY_ENABLE=y
 
 CONFIG_DESKTOP_WATCHDOG_ENABLE=y
 
-CONFIG_DESKTOP_CONFIG_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_ENABLE=y
 
 CONFIG_DESKTOP_BLE_QOS_ENABLE=y
diff --git a/applications/nrf_desktop/configuration/nrf52833_pca10111/app_ZReleaseMCUBoot.conf b/applications/nrf_desktop/configuration/nrf52833_pca10111/app_ZReleaseMCUBoot.conf
@@ -38,7 +38,6 @@ CONFIG_DESKTOP_BLE_DISCOVERY_ENABLE=y
 
 CONFIG_DESKTOP_WATCHDOG_ENABLE=y
 
-CONFIG_DESKTOP_CONFIG_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_DFU_ENABLE=y
 
diff --git a/applications/nrf_desktop/configuration/nrf52840_pca10056/app_ZDebug.conf b/applications/nrf_desktop/configuration/nrf52840_pca10056/app_ZDebug.conf
@@ -41,7 +41,6 @@ CONFIG_DESKTOP_BLE_SWIFT_PAIR=y
 CONFIG_DESKTOP_BLE_SHORT_NAME="Mouse nRF52"
 CONFIG_DESKTOP_BLE_SECURITY_FAIL_TIMEOUT_S=10
 
-CONFIG_DESKTOP_CONFIG_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_ENABLE=y
 
 CONFIG_DESKTOP_HFCLK_LOCK_ENABLE=y
diff --git a/applications/nrf_desktop/configuration/nrf52840_pca10056/app_ZDebugMCUBoot.conf b/applications/nrf_desktop/configuration/nrf52840_pca10056/app_ZDebugMCUBoot.conf
@@ -41,7 +41,6 @@ CONFIG_DESKTOP_BLE_SWIFT_PAIR=y
 CONFIG_DESKTOP_BLE_SHORT_NAME="Mouse nRF52"
 CONFIG_DESKTOP_BLE_SECURITY_FAIL_TIMEOUT_S=10
 
-CONFIG_DESKTOP_CONFIG_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_DFU_ENABLE=y
 
diff --git a/applications/nrf_desktop/configuration/nrf52840_pca10056/app_ZDebugWithShell.conf b/applications/nrf_desktop/configuration/nrf52840_pca10056/app_ZDebugWithShell.conf
@@ -41,7 +41,6 @@ CONFIG_DESKTOP_BLE_SWIFT_PAIR=y
 CONFIG_DESKTOP_BLE_SHORT_NAME="Mouse nRF52"
 CONFIG_DESKTOP_BLE_SECURITY_FAIL_TIMEOUT_S=10
 
-CONFIG_DESKTOP_CONFIG_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_ENABLE=y
 
 CONFIG_DESKTOP_SHELL_ENABLE=y
diff --git a/applications/nrf_desktop/configuration/nrf52840_pca10056/app_ZDebug_keyboard.conf b/applications/nrf_desktop/configuration/nrf52840_pca10056/app_ZDebug_keyboard.conf
@@ -42,7 +42,6 @@ CONFIG_DESKTOP_BLE_SWIFT_PAIR=y
 CONFIG_DESKTOP_BLE_SHORT_NAME="Kbd nRF52"
 CONFIG_DESKTOP_BLE_SECURITY_FAIL_TIMEOUT_S=10
 
-CONFIG_DESKTOP_CONFIG_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_ENABLE=y
 
 CONFIG_DESKTOP_HFCLK_LOCK_ENABLE=y
diff --git a/applications/nrf_desktop/configuration/nrf52840_pca10056/app_ZRelease.conf b/applications/nrf_desktop/configuration/nrf52840_pca10056/app_ZRelease.conf
@@ -37,7 +37,6 @@ CONFIG_DESKTOP_BLE_SECURITY_FAIL_TIMEOUT_S=10
 
 CONFIG_DESKTOP_WATCHDOG_ENABLE=y
 
-CONFIG_DESKTOP_CONFIG_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_ENABLE=y
 
 CONFIG_DESKTOP_HFCLK_LOCK_ENABLE=y
diff --git a/applications/nrf_desktop/configuration/nrf52840_pca10056/app_ZReleaseMCUBoot.conf b/applications/nrf_desktop/configuration/nrf52840_pca10056/app_ZReleaseMCUBoot.conf
@@ -37,7 +37,6 @@ CONFIG_DESKTOP_BLE_SECURITY_FAIL_TIMEOUT_S=10
 
 CONFIG_DESKTOP_WATCHDOG_ENABLE=y
 
-CONFIG_DESKTOP_CONFIG_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_DFU_ENABLE=y
 
diff --git a/applications/nrf_desktop/configuration/nrf52840_pca10059/app_ZDebug.conf b/applications/nrf_desktop/configuration/nrf52840_pca10059/app_ZDebug.conf
@@ -40,7 +40,6 @@ CONFIG_DESKTOP_BLE_SCAN_DURATION_S=5
 
 CONFIG_DESKTOP_BLE_DISCOVERY_ENABLE=y
 
-CONFIG_DESKTOP_CONFIG_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_ENABLE=y
 
 CONFIG_DESKTOP_BLE_QOS_ENABLE=y
diff --git a/applications/nrf_desktop/configuration/nrf52840_pca10059/app_ZDebugMCUBoot.conf b/applications/nrf_desktop/configuration/nrf52840_pca10059/app_ZDebugMCUBoot.conf
@@ -40,7 +40,6 @@ CONFIG_DESKTOP_BLE_SCAN_DURATION_S=5
 
 CONFIG_DESKTOP_BLE_DISCOVERY_ENABLE=y
 
-CONFIG_DESKTOP_CONFIG_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_DFU_ENABLE=y
 
diff --git a/applications/nrf_desktop/configuration/nrf52840_pca10059/app_ZDebugWithShell.conf b/applications/nrf_desktop/configuration/nrf52840_pca10059/app_ZDebugWithShell.conf
@@ -40,7 +40,6 @@ CONFIG_DESKTOP_BLE_SCAN_DURATION_S=5
 
 CONFIG_DESKTOP_BLE_DISCOVERY_ENABLE=y
 
-CONFIG_DESKTOP_CONFIG_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_ENABLE=y
 
 CONFIG_DESKTOP_BLE_QOS_ENABLE=y
diff --git a/applications/nrf_desktop/configuration/nrf52840_pca10059/app_ZRelease.conf b/applications/nrf_desktop/configuration/nrf52840_pca10059/app_ZRelease.conf
@@ -38,7 +38,6 @@ CONFIG_DESKTOP_BLE_DISCOVERY_ENABLE=y
 
 CONFIG_DESKTOP_WATCHDOG_ENABLE=y
 
-CONFIG_DESKTOP_CONFIG_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_ENABLE=y
 
 CONFIG_DESKTOP_BLE_QOS_ENABLE=y
diff --git a/applications/nrf_desktop/configuration/nrf52840_pca10059/app_ZReleaseMCUBoot.conf b/applications/nrf_desktop/configuration/nrf52840_pca10059/app_ZReleaseMCUBoot.conf
@@ -38,7 +38,6 @@ CONFIG_DESKTOP_BLE_DISCOVERY_ENABLE=y
 
 CONFIG_DESKTOP_WATCHDOG_ENABLE=y
 
-CONFIG_DESKTOP_CONFIG_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_DFU_ENABLE=y
 
diff --git a/applications/nrf_desktop/configuration/nrf52840_pca20041/app_ZDebug.conf b/applications/nrf_desktop/configuration/nrf52840_pca20041/app_ZDebug.conf
@@ -82,7 +82,6 @@ CONFIG_DESKTOP_BLE_SWIFT_PAIR=y
 CONFIG_DESKTOP_BLE_SHORT_NAME="Mouse nRF52"
 CONFIG_DESKTOP_BLE_SECURITY_FAIL_TIMEOUT_S=10
 
-CONFIG_DESKTOP_CONFIG_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_ENABLE=y
 
 CONFIG_DESKTOP_HFCLK_LOCK_ENABLE=y
diff --git a/applications/nrf_desktop/configuration/nrf52840_pca20041/app_ZDebugMCUBoot.conf b/applications/nrf_desktop/configuration/nrf52840_pca20041/app_ZDebugMCUBoot.conf
@@ -82,7 +82,6 @@ CONFIG_DESKTOP_BLE_SWIFT_PAIR=y
 CONFIG_DESKTOP_BLE_SHORT_NAME="Mouse nRF52"
 CONFIG_DESKTOP_BLE_SECURITY_FAIL_TIMEOUT_S=10
 
-CONFIG_DESKTOP_CONFIG_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_DFU_ENABLE=y
 
diff --git a/applications/nrf_desktop/configuration/nrf52840_pca20041/app_ZDebugWithShell.conf b/applications/nrf_desktop/configuration/nrf52840_pca20041/app_ZDebugWithShell.conf
@@ -82,7 +82,6 @@ CONFIG_DESKTOP_BLE_SWIFT_PAIR=y
 CONFIG_DESKTOP_BLE_SHORT_NAME="Mouse nRF52"
 CONFIG_DESKTOP_BLE_SECURITY_FAIL_TIMEOUT_S=10
 
-CONFIG_DESKTOP_CONFIG_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_ENABLE=y
 
 CONFIG_DESKTOP_SHELL_ENABLE=y
diff --git a/applications/nrf_desktop/configuration/nrf52840_pca20041/app_ZRelease.conf b/applications/nrf_desktop/configuration/nrf52840_pca20041/app_ZRelease.conf
@@ -77,7 +77,6 @@ CONFIG_DESKTOP_BLE_SECURITY_FAIL_TIMEOUT_S=10
 
 CONFIG_DESKTOP_WATCHDOG_ENABLE=y
 
-CONFIG_DESKTOP_CONFIG_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_ENABLE=y
 
 CONFIG_DESKTOP_HFCLK_LOCK_ENABLE=y
diff --git a/applications/nrf_desktop/configuration/nrf52840_pca20041/app_ZReleaseMCUBoot.conf b/applications/nrf_desktop/configuration/nrf52840_pca20041/app_ZReleaseMCUBoot.conf
@@ -77,7 +77,6 @@ CONFIG_DESKTOP_BLE_SECURITY_FAIL_TIMEOUT_S=10
 
 CONFIG_DESKTOP_WATCHDOG_ENABLE=y
 
-CONFIG_DESKTOP_CONFIG_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_DFU_ENABLE=y
 
diff --git a/applications/nrf_desktop/configuration/nrf52_pca20037/app_ZDebug.conf b/applications/nrf_desktop/configuration/nrf52_pca20037/app_ZDebug.conf
@@ -54,7 +54,6 @@ CONFIG_DESKTOP_BLE_SHORT_NAME="Kbd nRF52"
 CONFIG_DESKTOP_BLE_SECURITY_FAIL_TIMEOUT_S=300
 CONFIG_DESKTOP_BLE_ENABLE_PASSKEY=y
 
-CONFIG_DESKTOP_CONFIG_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_ENABLE=y
 
 CONFIG_DESKTOP_FN_KEYS_ENABLE=y
diff --git a/applications/nrf_desktop/configuration/nrf52_pca20037/app_ZDebugMCUBoot.conf b/applications/nrf_desktop/configuration/nrf52_pca20037/app_ZDebugMCUBoot.conf
@@ -54,7 +54,6 @@ CONFIG_DESKTOP_BLE_SHORT_NAME="Kbd nRF52"
 CONFIG_DESKTOP_BLE_SECURITY_FAIL_TIMEOUT_S=300
 CONFIG_DESKTOP_BLE_ENABLE_PASSKEY=y
 
-CONFIG_DESKTOP_CONFIG_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_DFU_ENABLE=y
 
diff --git a/applications/nrf_desktop/configuration/nrf52_pca20037/app_ZDebugWithShell.conf b/applications/nrf_desktop/configuration/nrf52_pca20037/app_ZDebugWithShell.conf
@@ -54,7 +54,6 @@ CONFIG_DESKTOP_BLE_SHORT_NAME="Kbd nRF52"
 CONFIG_DESKTOP_BLE_SECURITY_FAIL_TIMEOUT_S=300
 CONFIG_DESKTOP_BLE_ENABLE_PASSKEY=y
 
-CONFIG_DESKTOP_CONFIG_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_ENABLE=y
 
 CONFIG_DESKTOP_FN_KEYS_ENABLE=y
diff --git a/applications/nrf_desktop/configuration/nrf52_pca20037/app_ZRelease.conf b/applications/nrf_desktop/configuration/nrf52_pca20037/app_ZRelease.conf
@@ -50,7 +50,6 @@ CONFIG_DESKTOP_BLE_ENABLE_PASSKEY=y
 
 CONFIG_DESKTOP_WATCHDOG_ENABLE=y
 
-CONFIG_DESKTOP_CONFIG_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_ENABLE=y
 
 CONFIG_DESKTOP_FN_KEYS_ENABLE=y
diff --git a/applications/nrf_desktop/configuration/nrf52_pca20037/app_ZReleaseMCUBoot.conf b/applications/nrf_desktop/configuration/nrf52_pca20037/app_ZReleaseMCUBoot.conf
@@ -50,7 +50,6 @@ CONFIG_DESKTOP_BLE_ENABLE_PASSKEY=y
 
 CONFIG_DESKTOP_WATCHDOG_ENABLE=y
 
-CONFIG_DESKTOP_CONFIG_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_DFU_ENABLE=y
 
diff --git a/applications/nrf_desktop/configuration/nrf52_pca20044/app_ZDebug.conf b/applications/nrf_desktop/configuration/nrf52_pca20044/app_ZDebug.conf
@@ -54,7 +54,6 @@ CONFIG_DESKTOP_BLE_PEER_CONTROL=y
 CONFIG_DESKTOP_BLE_PEER_CONTROL_BUTTON=0x0002
 CONFIG_DESKTOP_BLE_PEER_ERASE_ON_START=y
 
-CONFIG_DESKTOP_CONFIG_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_ENABLE=y
 
 ################################################################################
diff --git a/applications/nrf_desktop/configuration/nrf52_pca20044/app_ZRelease.conf b/applications/nrf_desktop/configuration/nrf52_pca20044/app_ZRelease.conf
@@ -49,7 +49,6 @@ CONFIG_DESKTOP_BLE_PEER_ERASE_ON_START=y
 
 CONFIG_DESKTOP_WATCHDOG_ENABLE=y
 
-CONFIG_DESKTOP_CONFIG_ENABLE=y
 CONFIG_DESKTOP_CONFIG_CHANNEL_ENABLE=y
 
 ################################################################################
diff --git a/applications/nrf_desktop/src/events/config_event.c b/applications/nrf_desktop/src/events/config_event.c
@@ -8,9 +8,6 @@
 
 #include "config_event.h"
 
-#include <logging/log.h>
-LOG_MODULE_REGISTER(config_event, CONFIG_DESKTOP_CONFIG_LOG_LEVEL);
-
 static int log_config_event(const struct event_header *eh, char *buf,
 			   size_t buf_len)
 {
diff --git a/applications/nrf_desktop/src/events/config_event.h b/applications/nrf_desktop/src/events/config_event.h
@@ -100,7 +100,6 @@ struct config_event {
 	struct event_header header;
 
 	u8_t id;
-	bool store_needed;
 	struct event_dyndata dyndata;
 };
 
diff --git a/applications/nrf_desktop/src/hw_interface/motion_sensor.c b/applications/nrf_desktop/src/hw_interface/motion_sensor.c
diff --git a/applications/nrf_desktop/src/modules/CMakeLists.txt b/applications/nrf_desktop/src/modules/CMakeLists.txt
diff --git a/applications/nrf_desktop/src/modules/Kconfig b/applications/nrf_desktop/src/modules/Kconfig
diff --git a/applications/nrf_desktop/src/modules/Kconfig.config_channel b/applications/nrf_desktop/src/modules/Kconfig.config_channel
diff --git a/applications/nrf_desktop/src/modules/Kconfig.settings_load b/applications/nrf_desktop/src/modules/Kconfig.settings_load
diff --git a/applications/nrf_desktop/src/modules/ble_adv.c b/applications/nrf_desktop/src/modules/ble_adv.c
diff --git a/applications/nrf_desktop/src/modules/ble_bond.c b/applications/nrf_desktop/src/modules/ble_bond.c
diff --git a/applications/nrf_desktop/src/modules/ble_qos.c b/applications/nrf_desktop/src/modules/ble_qos.c
diff --git a/applications/nrf_desktop/src/modules/ble_scan.c b/applications/nrf_desktop/src/modules/ble_scan.c
diff --git a/applications/nrf_desktop/src/modules/config.c b/applications/nrf_desktop/src/modules/config.c
diff --git a/applications/nrf_desktop/src/modules/dfu.c b/applications/nrf_desktop/src/modules/dfu.c
diff --git a/applications/nrf_desktop/src/modules/fn_keys.c b/applications/nrf_desktop/src/modules/fn_keys.c
diff --git a/applications/nrf_desktop/src/modules/led_stream.c b/applications/nrf_desktop/src/modules/led_stream.c
diff --git a/applications/nrf_desktop/src/modules/settings_load.c b/applications/nrf_desktop/src/modules/settings_load.c
diff --git a/applications/nrf_desktop/src/util/config_channel.c b/applications/nrf_desktop/src/util/config_channel.c
