Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add temperature measurement app to the build_examples.py script #9118

Merged
merged 7 commits into from
Aug 21, 2021
Merged

Add temperature measurement app to the build_examples.py script #9118

Show file tree
Hide file tree
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
2258a2b
Add temperature measurement app to the build_examples.py script
andy31415 Aug 18, 2021
c3ab76d
Added temperature measurement app to vscode tasks
andy31415 Aug 18, 2021
af38765
Add missing comma in tasks.json list
andy31415 Aug 18, 2021
f71ad22
Fix unit tests
andy31415 Aug 18, 2021
cb211bf
Update path to output dir for test purposes
andy31415 Aug 18, 2021
4f6e66c
Add terminating newlines to txt file for unit test
andy31415 Aug 18, 2021
84e4b68
Merge branch 'master' into build_temperature_measurement
woody-apple Aug 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions .vscode/tasks.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -290,6 +290,7 @@
"light",
"lock",
"shell",
"temperature-measurement",
"window-covering"
],
"default": "build"
Expand Down
2 changes: 2 additions & 0 deletions scripts/build/build/factory.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,6 +109,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)
Expand Down
1 change: 1 addition & 0 deletions scripts/build/build/targets.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,6 +86,7 @@ class Application(IntEnum):
SHELL = auto()
CHIP_TOOL = auto()
BRIDGE = auto()
TEMPERATURE_MEASUREMENT = auto()

@property
def ArgName(self):
Expand Down
5 changes: 5 additions & 0 deletions scripts/build/builders/esp32.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ class Esp32App(Enum):
LOCK = auto()
SHELL = auto()
BRIDGE = auto()
TEMPERATURE_MEASUREMENT = auto()

@property
def ExampleName(self):
Expand All @@ -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)

Expand All @@ -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)

Expand Down
8 changes: 8 additions & 0 deletions scripts/build/expected_all_platform_commands.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,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'
Expand Down Expand Up @@ -118,6 +123,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'"'"''

Expand Down