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.

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 Linux door-lock app #12907

Merged
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
35 commits
Select commit Hold shift + click to select a range
6e62af5
Add linux lock app stub.
dustin-crossman Dec 1, 2021
f67ccf3
Add LockManager to linux lock app
dustin-crossman Dec 2, 2021
7ba1e7e
Add linux door-lock app to github workflows.
dustin-crossman Dec 6, 2021
d4f3933
Add door lock cluster to door lock app zap.
dustin-crossman Dec 8, 2021
b0fc725
Regen auto-generated stuff.
dustin-crossman Dec 8, 2021
de91f48
Working on door-lock implementation.
dustin-crossman Dec 9, 2021
d029f2b
Update a couple auto-generated files.
dustin-crossman Dec 9, 2021
0820de3
More door-lock fixes/improvements.
dustin-crossman Dec 9, 2021
9d56bdd
Cleaning up lock app a bit.
dustin-crossman Dec 10, 2021
1157441
Add linux lock app to build_examples.py script and use it in github w…
dustin-crossman Dec 13, 2021
cc7ea3e
Addressing review feedback.
dustin-crossman Dec 13, 2021
454a8b7
Fixup some auto-generated files.
dustin-crossman Dec 14, 2021
5cade9e
Ran through clang-format.
dustin-crossman Dec 14, 2021
012cc93
Regen files.
dustin-crossman Dec 15, 2021
6027d59
More review feedback.
dustin-crossman Dec 15, 2021
055dcd7
Restyle gn files.
dustin-crossman Dec 15, 2021
919a196
Added weak definitions for Lock/Unlock commands.
dustin-crossman Dec 15, 2021
f7813e5
Addressing review feedback.
dustin-crossman Dec 16, 2021
fad6e5d
Restyle
dustin-crossman Dec 16, 2021
62d0beb
Quick fix.
dustin-crossman Dec 17, 2021
cdd925a
Merge remote-tracking branch 'dustin/master' into feature/door-lock-l…
Morozov-5F Dec 28, 2021
bcc98fb
Fix format strings in Door Lock cluster
Morozov-5F Dec 28, 2021
de1eed5
Add Door Lock Cluster to an mbedOS build
Morozov-5F Dec 28, 2021
b1c1ed5
Fix format strings and parameter usage
Morozov-5F Dec 28, 2021
512e7a8
Add placeholder README.md
Morozov-5F Dec 28, 2021
ae5a61b
Make lock-app to build on Darwin
Morozov-5F Dec 28, 2021
958cd30
Fix Linux Build tests by adding appropriate targets
Morozov-5F Dec 28, 2021
0173d55
Fix formatting in README for linux lock app
Morozov-5F Dec 29, 2021
30f066c
Merge remote-tracking branch 'upstream/master' into feature/door-lock…
Morozov-5F Dec 29, 2021
bfe3a96
Use proper path for Linux lock app in CI
Morozov-5F Dec 29, 2021
3e901ef
Fix build errors on ESP32
Morozov-5F Dec 29, 2021
673e18f
Update auto-generated files
Morozov-5F Dec 29, 2021
ef7b9cd
Fix ESP32 build lock-app build
Morozov-5F Dec 29, 2021
4e60ac3
Move door lock app to the separate example
Morozov-5F Dec 29, 2021
9488a34
Fix styling issues
Morozov-5F Dec 29, 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 .github/workflows/examples-linux-arm.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -65,6 +65,7 @@ jobs:
"./scripts/build/build_examples.py \
--target linux-arm64-all-clusters \
--target linux-arm64-chip-tool-ipv6only \
--target linux-arm64-door-lock \
--target linux-arm64-minmdns \
--target linux-arm64-thermostat-no-ble \
build \
Expand Down
11 changes: 11 additions & 0 deletions .github/workflows/examples-linux-standalone.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -128,6 +128,17 @@ jobs:
out/ota_requestor_debug/chip-ota-requestor-app \
/tmp/bloat_reports/

- name: Build example Standalone Door Lock App
timeout-minutes: 5
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py \
--target linux-x64-door-lock \
build"
.environment/pigweed-venv/bin/python3 scripts/tools/memory/gh_sizes.py \
linux debug door-lock-app \
out/linux-x64-door-lock/chip-door-lock-app \
/tmp/bloat_reports/
- name: Uploading Size Reports
uses: actions/upload-artifact@v2
if: ${{ !env.ACT }}
Expand Down
15 changes: 15 additions & 0 deletions BUILD.gn
Original file line number Diff line number Diff line change
Expand Up @@ -236,6 +236,10 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
enable_linux_thermostat_app_build =
enable_default_builds && (host_os == "linux" || host_os == "mac")

# Build the Linux door lock app example.
enable_linux_door_lock_app_build =
enable_default_builds && (host_os == "linux" || host_os == "mac")

# Build the cc13x2x7_26x2x7 lock app example.
enable_cc13x2x7_26x2x7_lock_app_build = enable_ti_simplelink_builds

Expand Down Expand Up @@ -387,6 +391,14 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
}
}

if (enable_linux_door_lock_app_build) {
group("linux_door_lock_app") {
deps = [
"${chip_root}/examples/door-lock-app/linux(${standalone_toolchain})",
]
}
}

if (enable_efr32_lock_app_build) {
group("efr32_lock_app") {
deps = [ "${chip_root}/examples/lock-app/efr32(${chip_root}/config/efr32/toolchain:efr32_lock_app)" ]
Expand Down Expand Up @@ -484,6 +496,9 @@ if (current_toolchain != "${dir_pw_toolchain}/default:default") {
if (enable_linux_lighting_app_build) {
deps += [ ":linux_lighting_app" ]
}
if (enable_linux_door_lock_app_build) {
deps += [ ":linux_door_lock_app" ]
}
if (enable_efr32_lock_app_build) {
deps += [ ":efr32_lock_app" ]
}
Expand Down
25 changes: 25 additions & 0 deletions examples/door-lock-app/door-lock-common/BUILD.gn
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
# Copyright (c) 2020 Project CHIP Authors
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
# You may obtain a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.

import("//build_overrides/chip.gni")
import("${chip_root}/examples/common/pigweed/pigweed_rpcs.gni")
import("${chip_root}/src/app/chip_data_model.gni")

chip_data_model("door-lock-common") {
zap_file = "door-lock-app.zap"

zap_pregenerated_dir =
"${chip_root}/zzz_generated/door-lock-app/zap-generated"
is_server = true
}
Loading