Skip to content

Commit

Permalink
Merge branch 'master' into python/auto-invoke-resp
Browse files Browse the repository at this point in the history
  • Loading branch information
@mrjerryjohns
mrjerryjohns committed Oct 26, 2021
2 parents 2eb199b + aea917b commit 65719dc
Show file tree
Hide file tree
Showing 169 changed files with 6,120 additions and 2,018 deletions.
88 changes: 24 additions & 64 deletions .github/workflows/zap_regeneration.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,9 @@
name: ZAP - Regenerate

on:
# push:
# pull_request:
workflow_dispatch:
issue_comment:
types: [created]

concurrency:
group: ${{ github.ref }}-${{ github.workflow }}-${{ (github.event_name == 'pull_request' && github.event.number) || (github.event_name == 'workflow_dispatch' && github.run_number) || github.sha }}
Expand All @@ -29,67 +29,27 @@ jobs:
timeout-minutes: 60

runs-on: ubuntu-18.04
if: github.actor != 'restyled-io[bot]'
if: (github.event.issue.pull_request != '' && contains(github.event.comment.body, '/regenerate')) || (github.event_name == 'workflow_dispatch')

# container:
# image: connectedhomeip/chip-build:latest
steps:
- name: Checkout
uses: actions/checkout@v2
with:
# token: ${{ secrets.APPLE_PERSONAL_ACCESS_TOKEN }}
# ref: ${{ github.head_ref }}
submodules: true
- name: Use Node.js 14.x
uses: actions/setup-node@v2
with:
node-version: '14'
- name: Use Java
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: '11'
java-package: jre
- run: sudo apt-get update
- run: sudo apt-get install -fy --fix-missing libpixman-1-dev libcairo-dev libsdl-pango-dev libjpeg-dev libgif-dev python-autopep8
- name: Setup ZAP
timeout-minutes: 5
run: |
cd third_party/zap/repo/
npm ci
npm run version-stamp
npm rebuild canvas --update-binary
npm run build-spa
- name: Generate all
timeout-minutes: 5
run: scripts/tools/zap_regen_all.py
- name: Check for uncommited changes
run: git status
# git diff
# git add .
# git diff-index HEAD --
# git diff-index --quiet HEAD --
- name: Add generated paths
run: |
git add zzz_generated/*
git add src/darwin/Framework/*
git add src/controller/python/chip/clusters/*
git add src/controller/java/zap-generated/*
- uses: GuillaumeFalourd/git-commit-push@v1
with:
# email: ${{ github.actor }}@users.noreply.github.com
# name: ${{ github.actor }}
commit_message: Adding ZAP Generated Files
# target_branch: target_branch_name
# files: file1 file2 directory1 directory2/file3
# remote_repository: https://github.com/owner/another_repository
access_token: ${{ secrets.APPLE_PERSONAL_ACCESS_TOKEN }}
# force: true
# empty: true
# tags: true
# - name: Commit newly generated changes
# uses: stefanzweifel/git-auto-commit-action@v4
# with:
# commit_message: Auto-regenerated ZAP Changes
# file_pattern: "zzz_generated/* src/darwin/Framework/* src/controller/python/chip/clusters/* src/controller/java/zap-generated/*"
# # branch: ${{ github.head_ref }}
- name: Checkout the latest code
uses: actions/checkout@v2
with:
token: ${{ secrets.APPLE_PERSONAL_ACCESS_TOKEN }}
fetch-depth: 0 # otherwise, you will fail to push refs to dest repo
- name: Use Node.js 14.x
uses: actions/setup-node@v2
with:
node-version: '14'
- name: Use Java
uses: actions/setup-java@v2
with:
distribution: 'zulu'
java-version: '11'
java-package: jre
- run: sudo apt-get update
- run: sudo apt-get install -fy --fix-missing libpixman-1-dev libcairo-dev libsdl-pango-dev libjpeg-dev libgif-dev python-autopep8
- name: Rebase and regenerate
run: scripts/helpers/rebase_and_regenerate_zap.sh
env:
GITHUB_TOKEN: ${{ secrets.APPLE_PERSONAL_ACCESS_TOKEN }}
3 changes: 2 additions & 1 deletion config/esp32/components/chip/component.mk
View file
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,8 @@ endif
COMPONENT_ADD_INCLUDEDIRS += $(REL_OUTPUT_DIR)/src/include \
$(REL_CHIP_ROOT)/third_party/nlassert/repo/include \
$(REL_OUTPUT_DIR)/gen/third_party/connectedhomeip/src/app/include \
$(REL_OUTPUT_DIR)/gen/include
$(REL_OUTPUT_DIR)/gen/include \
$(REL_CHIP_ROOT)/zzz_generated/app-common

# Tell the ESP-IDF build system that the CHIP component defines its own build
# and clean targets.
Expand Down
1 change: 1 addition & 0 deletions config/nrfconnect/chip-module/CMakeLists.txt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -257,6 +257,7 @@ target_include_directories(chip INTERFACE
${CHIP_ROOT}/src/include
${CHIP_ROOT}/src/lib
${CHIP_ROOT}/third_party/nlassert/repo/include
${CHIP_ROOT}/zzz_generated/app-common
${CMAKE_CURRENT_BINARY_DIR}/gen/include
)
target_link_directories(chip INTERFACE ${CMAKE_CURRENT_BINARY_DIR}/lib)
Expand Down
8 changes: 4 additions & 4 deletions docs/QUICK_START.md
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,10 +7,10 @@ platforms.

## Wi-Fi Nodes

| <div style="width:200px">Controller / Admin</div> | <div style="width:200px">Node</div> | Description |
| ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | --------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| [**chip-tool**](https://github.com/project-chip/connectedhomeip/blob/master/examples/chip-tool/README.md) (Linux / Mac)<br> Includes docs for all the cluster commands supported <br> | **all-clusters-app** <li> [M5Stack](https://github.com/project-chip/connectedhomeip/blob/master/examples/all-clusters-app/esp32/README.md) (ESP)<li>[Linux](https://github.com/project-chip/connectedhomeip/tree/master/examples/all-clusters-app/linux) simulation | Use the command line tool on a laptop to pair with and control an embedded Wi-Fi platform. This demo supports the “all-clusters-app”, so it provides the basic onoff light test and more. Two incremental modes of operation are supported for testing (configurable via Kconfig tool when building M5): <ol><li> Unsecured (Wi-Fi only) <br> Bluetooth LE Rendezvous Mode Bypass = 1 <li> PASE secured <br> (BLE pairing, Wi-Fi operational) </ol> |
| [**chip-device-ctrl.py**](https://github.com/project-chip/connectedhomeip/blob/master/src/controller/python/README.md) | **all-clusters-app**<li> [M5Stack](https://github.com/project-chip/connectedhomeip/blob/master/examples/all-clusters-app/esp32/README.md) (ESP)<li> [Linux](https://github.com/project-chip/connectedhomeip/tree/master/examples/all-clusters-app/linux) simulation | Same as above, but uses the pychip tool as Controller Node, and focuses on Bluetooth LE flow rather than Bypass. |
| <div style="width:200px">Controller / Admin</div> | <div style="width:200px">Node</div> | Description |
| ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- |
| [**chip-tool**](https://github.com/project-chip/connectedhomeip/blob/master/examples/chip-tool/README.md) (Linux / Mac)<br> Includes docs for all the cluster commands supported <br> | **all-clusters-app** <li> [M5Stack](https://github.com/project-chip/connectedhomeip/blob/master/examples/all-clusters-app/esp32/README.md) (ESP)<li>[Linux](https://github.com/project-chip/connectedhomeip/tree/master/examples/all-clusters-app/linux) simulation | Use the command line tool on a laptop to pair with and control an embedded Wi-Fi platform. This demo supports the “all-clusters-app”, so it provides the basic onoff light test and more. |
| [**chip-device-ctrl.py**](https://github.com/project-chip/connectedhomeip/blob/master/src/controller/python/README.md) | **all-clusters-app**<li> [M5Stack](https://github.com/project-chip/connectedhomeip/blob/master/examples/all-clusters-app/esp32/README.md) (ESP)<li> [Linux](https://github.com/project-chip/connectedhomeip/tree/master/examples/all-clusters-app/linux) simulation | Same as above, but uses the pychip tool as Controller Node. |

## Thread Nodes

Expand Down
Loading

0 comments on commit 65719dc

Please sign in to comment.