Skip to content

Commit 5523baa

Browse files
committed
ci,kconfig: fix NCS 3.3 compliance failures
Install zephyr/scripts/requirements-compliance.txt before running compliance (NCS 3.3 check_compliance.py requires python-dotenv, reuse, and other packages not present by default). Fix KconfigBasic failures introduced by NCS 3.3 check_compliance.py: - Remove "Enable"/"Enables" prefix from boolean Kconfig prompts across Kconfig, utils/tlv/Kconfig, utils/settings_utils/Kconfig, samples/sid_end_device/Kconfig, and tests/unit_tests/mfg_parsers/Kconfig - Replace deprecated per-instance NRFX_SPI0/1/2 selects with NRFX_SPI (per-instance symbols were removed in NCS 3.3 hal_nordic) Signed-off-by: Krzysztof Taborowski <krzysztof.taborowski@nordicsemi.no>
1 parent f022b3c commit 5523baa

6 files changed

Lines changed: 30 additions & 26 deletions

File tree

.github/workflows/validate_code_style.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,10 @@ jobs:
6464
west init -l sidewalk --mf west.yml &&
6565
west update -n -o=--depth=1 --path-cache /workdir/
6666
67+
- name: Install compliance requirements
68+
run: |
69+
pip3 install -r zephyr/scripts/requirements-compliance.txt
70+
6771
- name: Run Compliance Tests
6872
run: |
6973
source zephyr/zephyr-env.sh

Kconfig

Lines changed: 13 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66

77
menuconfig SIDEWALK
8-
bool "Enable Amazon Sidewalk"
8+
bool "Amazon Sidewalk support"
99
imply SIDEWALK_DFU
1010

1111
if SIDEWALK
@@ -17,7 +17,7 @@ config MAIN_STACK_SIZE
1717
DT_CHOSEN_Z_LORA_TRANSCEIVER := zephyr,lora-transceiver
1818

1919
config SIDEWALK_SUBGHZ_SUPPORT
20-
bool "Enable Sub-GHz link type support in Sidewalk libraries"
20+
bool "Sub-GHz link type support in Sidewalk libraries"
2121
default y if $(dt_chosen_enabled,$(DT_CHOSEN_Z_LORA_TRANSCEIVER))
2222
help
2323
Use Sidewalk with support for BLE, LoRa and FSK.
@@ -137,7 +137,7 @@ module-str = Sidewalk spi bus interface
137137
source "${ZEPHYR_BASE}/subsys/logging/Kconfig.template.log_config"
138138

139139
config DEPRECATED_SIDEWALK_PAL_INIT
140-
bool "Enable Sidewalk platform init module [DEPRICATED]"
140+
bool "Sidewalk platform init module [DEPRECATED]"
141141
help
142142
Sidewalk 1.16 stack introduces new sid api sid_platform_init.
143143
Now new api togehter with sid_common pal are used by default.
@@ -169,27 +169,27 @@ config SIDEWALK_BLE_ADV_INT_TRANSITION
169169
default 30
170170

171171
config SIDEWALK_VENDOR_SERVICE
172-
bool "Enable Sidewalk BLE vendor service"
172+
bool "Sidewalk BLE vendor service"
173173

174174
config SIDEWALK_LOGGING_SERVICE
175-
bool "Enable Sidewalk BLE logging service"
175+
bool "Sidewalk BLE logging service"
176176

177177
config SIDEWALK_DEMO_PARSER
178-
bool "Enable sensor monitoring demo parser module"
178+
bool "Sensor monitoring demo parser module"
179179

180180
config SIDEWALK_ON_DEV_CERT
181-
bool "Enable Sidewalk on device certification"
181+
bool "Sidewalk on device certification"
182182
depends on SHELL
183183

184184
config DEPRECATED_SIDEWALK_MFG_STORAGE
185-
bool "Enable previous implementation of manufacturing module [DEPREACATED]"
185+
bool "Previous implementation of manufacturing module [DEPRECATED]"
186186
imply FLASH
187187
help
188188
Previous Sidewalk manufacturing storage module
189189
This implementation is DEPRECATED.
190190

191191
config SIDEWALK_MFG_STORAGE_SUPPORT_HEX_v7
192-
bool "Enable support for old Sidewalk manufaturing hex format"
192+
bool "Support for old Sidewalk manufacturing hex format"
193193
default y
194194
depends on SIDEWALK_MFG_STORAGE
195195
help
@@ -198,7 +198,7 @@ config SIDEWALK_MFG_STORAGE_SUPPORT_HEX_v7
198198
and will be supported after enabling this configuration.
199199

200200
config SIDEWALK_CRYPTO_PSA_KEY_STORAGE
201-
bool "Enable psa crypto storage for persistent Sidewalk keys [EXPERIMENTAL]"
201+
bool "PSA crypto storage for persistent Sidewalk keys [EXPERIMENTAL]"
202202
default SIDEWALK
203203
select EXPERIMENTAL
204204
help
@@ -225,15 +225,15 @@ choice SIDEWALK_NRFX_SPI_INSTANCE_ID
225225

226226
config SIDEWALK_NRFX_SPI0
227227
bool "SPI0"
228-
select NRFX_SPI0
228+
select NRFX_SPI
229229

230230
config SIDEWALK_NRFX_SPI1
231231
bool "SPI1"
232-
select NRFX_SPI1
232+
select NRFX_SPI
233233

234234
config SIDEWALK_NRFX_SPI2
235235
bool "SPI2"
236-
select NRFX_SPI2
236+
select NRFX_SPI
237237

238238
endchoice # SIDEWALK_NRFX_SPI_INSTANCE_ID
239239

samples/sid_end_device/Kconfig

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ rsource "Kconfig.sensor_monitoring"
3838
endif #SID_END_DEVICE_SENSOR_MONITORING
3939

4040
config SID_END_DEVICE_CLI
41-
bool "Enable Sidewalk CLI (DUT)"
41+
bool "Sidewalk CLI (DUT)"
4242
imply SHELL
4343
help
4444
Enables Sidewalk command line interface.
@@ -59,7 +59,7 @@ config SHELL_BACKEND_SERIAL_RX_RING_BUFFER_SIZE
5959
default 1024
6060

6161
config SID_END_DEVICE_CLI_ALIVE_MAKRER
62-
bool "Enable alive marker"
62+
bool "Alive marker"
6363
help
6464
Enable alive marker that periodically prints "alive" message to log.
6565
Useful to verify that application is running and not stuck.
@@ -68,14 +68,14 @@ endif # SID_END_DEVICE_CLI
6868

6969
config SID_END_DEVICE_AUTO_START
7070
default y
71-
bool "Enable automatic Sidewalk initlization and start"
71+
bool "Automatic Sidewalk initialization and start"
7272

7373
config SID_END_DEVICE_AUTO_CONN_REQ
7474
default y
75-
bool "Enable automatic connection request before message send"
75+
bool "Automatic connection request before message send"
7676

7777
config SID_END_DEVICE_PERSISTENT_LINK_MASK
78-
bool "Enable persitent link mask"
78+
bool "Persistent link mask"
7979
help
8080
The Sidewalk link mask persists after a device reset
8181
but defaults after a factory reset.
@@ -87,7 +87,7 @@ config SID_END_DEVICE_EVENT_HEAP_SIZE
8787

8888
config SIDEWALK_FILE_TRANSFER
8989
select EXPERIMENTAL
90-
bool "Enable Sidewalk file transfer"
90+
bool "Sidewalk file transfer"
9191
help
9292
Add support for Sidewalk Bulk Data Transfer (SBDT)
9393
in application.
@@ -134,7 +134,7 @@ config SBDT_MAX_PARALEL_TRANSFERS
134134
endif # SIDEWALK_FILE_TRANSFER
135135

136136
config SIDEWALK_LOCATION_SHELL
137-
bool "Enable Sidewalk Location CLI"
137+
bool "Sidewalk Location CLI"
138138
depends on SID_END_DEVICE_CLI
139139
help
140140
Enables Sidewalk location and dult command line interface.

tests/unit_tests/mfg_parsers/Kconfig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ config SIDEWALK_LOG_LEVEL
1212

1313

1414
config SIDEWALK_CRYPTO_PSA_KEY_STORAGE
15-
bool "Enable psa crypto storage for persistent Sidewalk keys [EXPERIMENTAL]"
15+
bool "PSA crypto storage for persistent Sidewalk keys [EXPERIMENTAL]"
1616

1717
source "${ZEPHYR_BASE}/../sidewalk/utils/Kconfig"
1818
source "Kconfig.zephyr"

utils/settings_utils/Kconfig

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
#
66

77
menuconfig SIDEWALK_SETTINGS_UTILS
8-
bool "Enables Sidewalk settings utils module"
8+
bool "Sidewalk settings utils module"
99
default SIDEWALK
1010
help
1111
Sidewalk settings utils allows samples to
@@ -20,7 +20,7 @@ config PERSISTENT_LINK_MASK_SETTINGS_KEY
2020
Key for settings to store last Sidewalk link mode in flash for next reboot
2121

2222
config DEPRECATED_DFU_FLAG_SETTINGS_KEY
23-
bool "Enable Key for settings to store DFU flag in flash for next reboot [DEPRICATED]"
23+
bool "Key for settings to store DFU flag in flash for next reboot [DEPRECATED]"
2424

2525
if DEPRECATED_DFU_FLAG_SETTINGS_KEY
2626
config DFU_FLAG_SETTINGS_KEY

utils/tlv/Kconfig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,20 +5,20 @@
55
#
66

77
menuconfig SIDEWALK_TLV
8-
bool "Enables Sidewalk TLV utils module"
8+
bool "Sidewalk TLV utils module"
99
default n
1010
help
1111
Sidewalk module to parse/write TLV data
1212

1313
if SIDEWALK_TLV
1414
config SIDEWALK_TLV_RAM
15-
bool "Enables RAM backend for TLV"
15+
bool "RAM backend for TLV"
1616
default n
1717
help
1818
RAM backend for Sidewalk TLV module
1919

2020
config SIDEWALK_TLV_FLASH
21-
bool "Enables FLASH backend for TLV"
21+
bool "FLASH backend for TLV"
2222
default n
2323
imply FLASH
2424
help

0 commit comments

Comments
 (0)