Skip to content

Commit 7ce3f77

Browse files
skargskarg
committed
enable NVS storage in samples
1 parent 43ef173 commit 7ce3f77

File tree

4 files changed

+29
-38
lines changed

4 files changed

+29
-38
lines changed

‎zephyr/samples/profiles/b-ld/prj.conf‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ CONFIG_INIT_STACKS=y
2424
CONFIG_BACNETSTACK=y
2525
CONFIG_BACNETSTACK_LOG_LEVEL=3
2626
CONFIG_BACNETSTACK_BACNET_BASIC=y
27+
# BACnet settings subsystem
28+
CONFIG_BACNETSTACK_BACNET_SETTINGS=y
29+
CONFIG_BACNET_SETTINGS_SHELL=y
2730
# BACnet Library - options
2831
CONFIG_BACNET_MAX_CHARACTER_STRING_BYTES=128
2932
CONFIG_BACAPP_MINIMAL=y
@@ -34,10 +37,6 @@ CONFIG_BACNET_BASIC_OBJECT_LIGHTING_OUTPUT=y
3437
CONFIG_BACAPP_LIGHTING_COMMAND=y
3538
# BACnet Library - shell
3639
CONFIG_BACNET_BASIC_DEVICE_SHELL=y
37-
# BACnet settings subsystem
38-
#CONFIG_BACNETSTACK_BACNET_SETTINGS=y
39-
#CONFIG_BACNET_SETTINGS=y
40-
#CONFIG_BACNET_SETTINGS_SHELL=y
4140

4241
# BACnet Datalink Options
4342
CONFIG_BACDL_BIP=y
@@ -120,19 +119,19 @@ CONFIG_STATS_SHELL=y
120119
#
121120
# Storage
122121
#
123-
#CONFIG_FLASH=y
124-
#CONFIG_FLASH_MAP=y
122+
CONFIG_FLASH=y
123+
CONFIG_FLASH_MAP=y
125124
#CONFIG_FLASH_PAGE_LAYOUT=y
126125
# native_posix uses a simulated flash
127126
#CONFIG_FLASH_SIMULATOR=y
128127
#CONFIG_DISK_ACCESS=y.
129128
#CONFIG_FILE_SYSTEM=y
130129
#CONFIG_FILE_SYSTEM_LITTLEFS=y
131130
#CONFIG_FILE_SYSTEM_SHELL=y
132-
#CONFIG_NVS=y
133-
#CONFIG_SETTINGS=y
134-
#CONFIG_SETTINGS_NVS=y
135-
#CONFIG_SETTINGS_RUNTIME=y
131+
CONFIG_NVS=y
132+
CONFIG_SETTINGS=y
133+
CONFIG_SETTINGS_NVS=y
134+
CONFIG_SETTINGS_RUNTIME=y
136135
#CONFIG_SETTINGS_FILE=y
137136
#CONFIG_SETTINGS_SHELL=y
138137

‎zephyr/samples/profiles/b-ld/src/main.c‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@
2929
LOG_MODULE_DECLARE(bacnet, CONFIG_BACNETSTACK_LOG_LEVEL);
3030

3131
/* FIXME: get the device instance and name from settings! */
32-
static const uint32_t Device_Instance = 260125;
3332
static const char *Device_Name = "BACnet Lighting Device (B-LD)";
3433
/* object instances */
3534
static const uint32_t Lighting_Instance = 1;

‎zephyr/samples/profiles/b-ls/prj.conf‎

Lines changed: 11 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,9 @@ CONFIG_INIT_STACKS=y
2424
CONFIG_BACNETSTACK=y
2525
CONFIG_BACNETSTACK_LOG_LEVEL=3
2626
CONFIG_BACNETSTACK_BACNET_BASIC=y
27+
# BACnet settings subsystem
28+
CONFIG_BACNETSTACK_BACNET_SETTINGS=y
29+
CONFIG_BACNET_SETTINGS_SHELL=y
2730
# BACnet Library - options
2831
CONFIG_BACNET_MAX_CHARACTER_STRING_BYTES=128
2932
CONFIG_BACAPP_MINIMAL=y
@@ -40,10 +43,6 @@ CONFIG_BACAPP_DOUBLE=y
4043
CONFIG_BACAPP_COLOR_COMMAND=y
4144
# BACnet Library - shell
4245
CONFIG_BACNET_BASIC_DEVICE_SHELL=y
43-
# BACnet settings subsystem
44-
#CONFIG_BACNETSTACK_BACNET_SETTINGS=y
45-
#CONFIG_BACNET_SETTINGS=y
46-
#CONFIG_BACNET_SETTINGS_SHELL=y
4746

4847
# BACnet Datalink Options
4948
CONFIG_BACDL_BIP=y
@@ -125,21 +124,21 @@ CONFIG_STATS_SHELL=y
125124
#
126125
# Storage
127126
#
128-
#CONFIG_FLASH=y
129-
#CONFIG_FLASH_MAP=y
127+
CONFIG_FLASH=y
128+
CONFIG_FLASH_MAP=y
130129
#CONFIG_FLASH_PAGE_LAYOUT=y
130+
CONFIG_NVS=y
131+
CONFIG_SETTINGS=y
132+
CONFIG_SETTINGS_NVS=y
133+
CONFIG_SETTINGS_RUNTIME=y
134+
#CONFIG_SETTINGS_FILE=y
135+
#CONFIG_SETTINGS_SHELL=y
131136
# native_posix uses a simulated flash
132137
#CONFIG_FLASH_SIMULATOR=y
133138
#CONFIG_DISK_ACCESS=y.
134139
#CONFIG_FILE_SYSTEM=y
135140
#CONFIG_FILE_SYSTEM_LITTLEFS=y
136141
#CONFIG_FILE_SYSTEM_SHELL=y
137-
#CONFIG_NVS=y
138-
#CONFIG_SETTINGS=y
139-
#CONFIG_SETTINGS_NVS=y
140-
#CONFIG_SETTINGS_RUNTIME=y
141-
#CONFIG_SETTINGS_FILE=y
142-
#CONFIG_SETTINGS_SHELL=y
143142

144143
CONFIG_TEST_RANDOM_GENERATOR=y
145144
CONFIG_TIMER_RANDOM_GENERATOR=y

‎zephyr/samples/profiles/b-sa/prj.conf‎

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,6 @@ CONFIG_BACNETSTACK_BACNET_BASIC=y
2727
# BACnet settings subsystem
2828
CONFIG_BACNETSTACK_BACNET_SETTINGS=y
2929
CONFIG_BACNET_SETTINGS_SHELL=y
30-
# the dependencies of the SETTINGS option.
31-
CONFIG_FLASH=y
32-
CONFIG_FLASH_MAP=y
33-
CONFIG_NVS=y
34-
CONFIG_SETTINGS=y
35-
CONFIG_SETTINGS_NVS=y
36-
CONFIG_SETTINGS_RUNTIME=y
3730
# BACnet Library - options
3831
CONFIG_BACNET_MAX_CHARACTER_STRING_BYTES=128
3932
CONFIG_BACAPP_MINIMAL=y
@@ -124,21 +117,22 @@ CONFIG_STATS_SHELL=y
124117
#
125118
# Storage
126119
#
127-
#CONFIG_FLASH=y
128-
#CONFIG_FLASH_MAP=y
120+
# the dependencies of the SETTINGS option.
121+
CONFIG_FLASH=y
122+
CONFIG_FLASH_MAP=y
129123
#CONFIG_FLASH_PAGE_LAYOUT=y
124+
CONFIG_NVS=y
125+
CONFIG_SETTINGS=y
126+
CONFIG_SETTINGS_NVS=y
127+
CONFIG_SETTINGS_RUNTIME=y
128+
#CONFIG_SETTINGS_FILE=y
129+
#CONFIG_SETTINGS_SHELL=y
130130
# native_posix uses a simulated flash
131131
#CONFIG_FLASH_SIMULATOR=y
132132
#CONFIG_DISK_ACCESS=y.
133133
#CONFIG_FILE_SYSTEM=y
134134
#CONFIG_FILE_SYSTEM_LITTLEFS=y
135135
#CONFIG_FILE_SYSTEM_SHELL=y
136-
#CONFIG_NVS=y
137-
#CONFIG_SETTINGS=y
138-
#CONFIG_SETTINGS_NVS=y
139-
#CONFIG_SETTINGS_RUNTIME=y
140-
#CONFIG_SETTINGS_FILE=y
141-
#CONFIG_SETTINGS_SHELL=y
142136

143137
CONFIG_TEST_RANDOM_GENERATOR=y
144138
CONFIG_TIMER_RANDOM_GENERATOR=y

0 commit comments

Comments
 (0)