From 1608204423a8bb021fe99a3cffd115d51202f74d Mon Sep 17 00:00:00 2001 From: Andrei Litvin Date: Sat, 21 Aug 2021 10:49:52 -0400 Subject: [PATCH] Add temperature measurement app to the build_examples.py script (#9118) * Add temperature measurement app to the build_examples.py script * Added temperature measurement app to vscode tasks * Add missing comma in tasks.json list * Fix unit tests * Update path to output dir for test purposes * Add terminating newlines to txt file for unit test Co-authored-by: Justin Wood --- .vscode/tasks.json | 1 + scripts/build/build/factory.py | 2 ++ scripts/build/build/targets.py | 1 + scripts/build/builders/esp32.py | 5 +++++ scripts/build/expected_all_platform_commands.txt | 8 ++++++++ 5 files changed, 17 insertions(+) diff --git a/.vscode/tasks.json b/.vscode/tasks.json index acbba10feb14cc..f470b3e7948acf 100644 --- a/.vscode/tasks.json +++ b/.vscode/tasks.json @@ -291,6 +291,7 @@ "light", "lock", "shell", + "temperature-measurement", "thermostat", "window-covering" ], diff --git a/scripts/build/build/factory.py b/scripts/build/build/factory.py index 72da9b1169ba29..531fef387f172a 100644 --- a/scripts/build/build/factory.py +++ b/scripts/build/build/factory.py @@ -111,6 +111,8 @@ def Create(self, runner, __board_key: Board, __app_key: Application, Application.LOCK, Board.DEVKITC, app=Esp32App.LOCK) _MATCHERS[Platform.ESP32].AcceptApplicationForBoard( Application.BRIDGE, Board.DEVKITC, app=Esp32App.BRIDGE) +_MATCHERS[Platform.ESP32].AcceptApplicationForBoard( + Application.TEMPERATURE_MEASUREMENT, Board.DEVKITC, app=Esp32App.TEMPERATURE_MEASUREMENT) _MATCHERS[Platform.QPG].AcceptApplication(Application.LOCK) _MATCHERS[Platform.QPG].AcceptBoard(Board.QPG6100) diff --git a/scripts/build/build/targets.py b/scripts/build/build/targets.py index 93381320050e7d..23f2f82bf5e804 100644 --- a/scripts/build/build/targets.py +++ b/scripts/build/build/targets.py @@ -90,6 +90,7 @@ class Application(IntEnum): SHELL = auto() CHIP_TOOL = auto() BRIDGE = auto() + TEMPERATURE_MEASUREMENT = auto() THERMOSTAT = auto() @property diff --git a/scripts/build/builders/esp32.py b/scripts/build/builders/esp32.py index 3da7650a930bed..c58ab6021dd6d9 100644 --- a/scripts/build/builders/esp32.py +++ b/scripts/build/builders/esp32.py @@ -32,6 +32,7 @@ class Esp32App(Enum): LOCK = auto() SHELL = auto() BRIDGE = auto() + TEMPERATURE_MEASUREMENT = auto() @property def ExampleName(self): @@ -43,6 +44,8 @@ def ExampleName(self): return 'shell' elif self == Esp32App.BRIDGE: return 'bridge-app' + elif self == Esp32App.TEMPERATURE_MEASUREMENT: + return 'temperature-measurement-app' else: raise Exception('Unknown app type: %r' % self) @@ -56,6 +59,8 @@ def AppNamePrefix(self): return 'chip-shell' elif self == Esp32App.BRIDGE: return 'chip-bridge-app' + elif self == Esp32App.TEMPERATURE_MEASUREMENT: + return 'chip-temperature-measurement-app' else: raise Exception('Unknown app type: %r' % self) diff --git a/scripts/build/expected_all_platform_commands.txt b/scripts/build/expected_all_platform_commands.txt index c5cee922a169e9..712a7ac9450699 100644 --- a/scripts/build/expected_all_platform_commands.txt +++ b/scripts/build/expected_all_platform_commands.txt @@ -35,6 +35,11 @@ cd "{root}" bash -c 'source $IDF_PATH/export.sh; idf.py -C examples/bridge-app/esp32 -B {out}/esp32-devkitc-bridge reconfigure' cd - +# Generating esp32-devkitc-temperature_measurement +cd "{root}" +bash -c 'source $IDF_PATH/export.sh; idf.py -C examples/temperature-measurement-app/esp32 -B {out}/esp32-devkitc-temperature_measurement reconfigure' +cd - + # Generating esp32-c3devkit-all_clusters cd "{root}" bash -c 'source $IDF_PATH/export.sh; idf.py -D SDKCONFIG_DEFAULTS='"'"'sdkconfig_c3devkit.defaults'"'"' -C examples/all-clusters-app/esp32 -B {out}/esp32-c3devkit-all_clusters reconfigure' @@ -133,6 +138,9 @@ bash -c 'source $IDF_PATH/export.sh; ninja -C '"'"'{out}/esp32-devkitc-shell'"'" # Building esp32-devkitc-bridge bash -c 'source $IDF_PATH/export.sh; ninja -C '"'"'{out}/esp32-devkitc-bridge'"'"'' +# Building esp32-devkitc-temperature_measurement +bash -c 'source $IDF_PATH/export.sh; ninja -C '"'"'{out}/esp32-devkitc-temperature_measurement'"'"'' + # Building esp32-c3devkit-all_clusters bash -c 'source $IDF_PATH/export.sh; ninja -C '"'"'{out}/esp32-c3devkit-all_clusters'"'"''