Skip to content

Commit 260a7d3

Browse files
committed
Fix THINGSET_OBJECT_LOOKUP_MAP Kconfig dependencies
If the object lookup map is enabled, the linked list is stored as part of the ThingSet object database, so this must not be stored in read-only memory. Also removing discouraged `default n` settings.
1 parent d4a4540 commit 260a7d3

File tree

1 file changed

+1
-7
lines changed

1 file changed

+1
-7
lines changed

Kconfig.thingset

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@ config THINGSET_TEXT_MODE
2424

2525
config THINGSET_IMMUTABLE_OBJECTS
2626
bool "Make data objects immutable and store them in ROM"
27-
default n
2827
help
2928
This option adds const specifiers to the data object structs and stores them in iterable
3029
sections in ROM instead of RAM.
@@ -39,7 +38,7 @@ config THINGSET_IMMUTABLE_OBJECTS
3938

4039
config THINGSET_OBJECT_LOOKUP_MAP
4140
bool "Enable hashmap for object lookup"
42-
default n
41+
depends on !THINGSET_IMMUTABLE_OBJECTS
4342
help
4443
Enable to speed up performance of object lookup.
4544

@@ -79,21 +78,18 @@ config THINGSET_BINARY_MAX_DEPTH
7978

8079
config THINGSET_REPORT_RECORD_SERIALIZATION
8180
bool "Enable full record serialization in reports."
82-
default n
8381
help
8482
Switch on support for record serialisation in reports. It may be necessary
8583
to increase THINGSET_BINARY_MAX_DEPTH when using this feature.
8684

8785
config THINGSET_64BIT_TYPES_SUPPORT
8886
bool "Enable support for 64 bit variable types."
89-
default n
9087
help
9188
Switch on support for 64 bit variable types (uint64_t, int64_t, double).
9289
This should be disabled for most 8-bit microcontrollers to increase performance.
9390

9491
config THINGSET_DECFRAC_TYPE_SUPPORT
9592
bool "Enable support for decimal fraction variable type."
96-
default n
9793
help
9894
Switch on support for CBOR decimal fraction data type which stores a decimal mantissa
9995
and a constant decimal exponent. This allows to use e.g. millivolts internally instead
@@ -102,14 +98,12 @@ config THINGSET_DECFRAC_TYPE_SUPPORT
10298
config THINGSET_BYTES_TYPE_SUPPORT
10399
bool "Enable support for byte buffer variable type."
104100
select BASE64
105-
default n
106101
help
107102
Switch on support for CBOR byte strings, which can store any sort of binary data and
108103
can be used e.g. for firmware upgrades. JSON uses base64-encoded data.
109104

110105
config THINGSET_JSON_STRING_ESCAPING
111106
bool "Escape/unescape C strings when serializing/deserializing them to JSON"
112-
default n
113107
help
114108
This is only required if arbitrary strings may end up in data objects of type String,
115109
containing characters like the quotation mark that have to be escaped in JSON. This may

0 commit comments

Comments
 (0)