From d45cbb79d0f0536cb4ab79c20a092312db28a509 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20BOU=C3=89?= Date: Tue, 29 Nov 2022 16:02:53 +0100 Subject: [PATCH] Add nrfconnect switch app in build targets script (#23793) * Adding nrfconnect switch app in build targets script Fix for #23450 * Add nrfconnect light-switch app in NRF builder Fix for #23450 Co-authored-by: Andrei Litvin --- scripts/build/build/targets.py | 1 + scripts/build/builders/nrf.py | 7 +++++++ scripts/build/testdata/all_targets_linux_x64.txt | 2 +- 3 files changed, 9 insertions(+), 1 deletion(-) diff --git a/scripts/build/build/targets.py b/scripts/build/build/targets.py index 41fe5783888670..7f408c538e011f 100755 --- a/scripts/build/build/targets.py +++ b/scripts/build/build/targets.py @@ -251,6 +251,7 @@ def BuildNrfTarget(): TargetPart('all-clusters-minimal', app=NrfApp.ALL_CLUSTERS_MINIMAL), TargetPart('lock', app=NrfApp.LOCK), TargetPart('light', app=NrfApp.LIGHT), + TargetPart('light-switch', app=NrfApp.SWITCH), TargetPart('shell', app=NrfApp.SHELL), TargetPart('pump', app=NrfApp.PUMP), TargetPart('pump-controller', app=NrfApp.PUMP_CONTROLLER), diff --git a/scripts/build/builders/nrf.py b/scripts/build/builders/nrf.py index 39c93946b9b27d..03298cc1f0ac94 100644 --- a/scripts/build/builders/nrf.py +++ b/scripts/build/builders/nrf.py @@ -28,6 +28,7 @@ class NrfApp(Enum): SHELL = auto() PUMP = auto() PUMP_CONTROLLER = auto() + SWITCH = auto() WINDOW_COVERING = auto() UNIT_TESTS = auto() @@ -38,6 +39,8 @@ def AppPath(self): return 'examples/all-clusters-minimal-app' elif self == NrfApp.LIGHT: return 'examples/lighting-app' + elif self == NrfApp.SWITCH: + return 'light-switch-app' elif self == NrfApp.LOCK: return 'examples/lock-app' elif self == NrfApp.SHELL: @@ -60,6 +63,8 @@ def AppNamePrefix(self): return 'chip-nrf-all-clusters-minimal-example' elif self == NrfApp.LIGHT: return 'chip-nrf-lighting-example' + elif self == NrfApp.SWITCH: + return 'chip-nrf-light-switch-example' elif self == NrfApp.LOCK: return 'chip-nrf-lock-example' elif self == NrfApp.SHELL: @@ -82,6 +87,8 @@ def _FlashBundlePrefix(self): return 'chip-nrfconnect-all-clusters-minimal-app-example' elif self == NrfApp.LIGHT: return 'chip-nrfconnect-lighting-example' + elif self == NrfApp.SWITCH: + return 'chip-nrfconnect-switch-example' elif self == NrfApp.LOCK: return 'chip-nrfconnect-lock-example' elif self == NrfApp.SHELL: diff --git a/scripts/build/testdata/all_targets_linux_x64.txt b/scripts/build/testdata/all_targets_linux_x64.txt index 19e19d89afeb32..8b29b271fe80b8 100644 --- a/scripts/build/testdata/all_targets_linux_x64.txt +++ b/scripts/build/testdata/all_targets_linux_x64.txt @@ -14,7 +14,7 @@ infineon-psoc6-{lock,light,all-clusters,all-clusters-minimal}[-ota][-updateimage k32w-{light,shell,lock,contact}[-se05x][-no-ble][-no-ota][-low-power][-nologs] mbed-cy8cproto_062_4343w-{lock,light,all-clusters,all-clusters-minimal,pigweed,shell}[-release][-develop][-debug] mw320-all-clusters-app -nrf-{nrf5340dk,nrf52840dk,nrf52840dongle}-{all-clusters,all-clusters-minimal,lock,light,shell,pump,pump-controller}[-rpc] +nrf-{nrf5340dk,nrf52840dk,nrf52840dongle}-{all-clusters,all-clusters-minimal,lock,light,light-switch,shell,pump,pump-controller}[-rpc] nrf-native-posix-64-tests qpg-qpg6105-{lock,light,shell,persistent-storage} tizen-arm-{all-clusters,all-clusters-minimal,chip-tool,light}[-no-ble][-no-wifi][-asan]