Skip to content

Commit

Permalink
Merge branch 'master' into add-water-heater-mode-test-scripts
Browse files Browse the repository at this point in the history
  • Loading branch information
PeterC1965 authored Jul 18, 2024
2 parents 883072d + b88ac27 commit 0e02488
Show file tree
Hide file tree
Showing 625 changed files with 13,747 additions and 3,022 deletions.
2 changes: 1 addition & 1 deletion .github/actions/bootstrap-cache/action.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ runs:
attempt_limit: 3
attempt_delay: 2000
with: |
key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**') }}
key: ${{ runner.os }}-env-${{ hashFiles('scripts/setup/*', 'third_party/pigweed/**', '/etc/lsb-release') }}
path: |
.environment
build_overrides/pigweed_environment.gni
2 changes: 1 addition & 1 deletion .github/workflows/bloat_check.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:
runs-on: ubuntu-latest

container:
image: ghcr.io/project-chip/chip-build:54
image: ghcr.io/project-chip/chip-build:65

steps:
- name: Checkout
Expand Down
4 changes: 2 additions & 2 deletions .github/workflows/build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:54
image: ghcr.io/project-chip/chip-build:65
volumes:
- "/:/runner-root-volume"
- "/tmp/log_output:/tmp/test_logs"
Expand Down Expand Up @@ -456,7 +456,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:54
image: ghcr.io/project-chip/chip-build:65
volumes:
- "/:/runner-root-volume"
- "/tmp/log_output:/tmp/test_logs"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/chef.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:54
image: ghcr.io/project-chip/chip-build:65
options: --user root

steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-linux-standalone.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:54
image: ghcr.io/project-chip/chip-build:65
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-linux-tv-casting-app.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:54
image: ghcr.io/project-chip/chip-build:65

steps:
- name: Checkout
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-mw320.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:54
image: ghcr.io/project-chip/chip-build:65
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
Expand Down
27 changes: 27 additions & 0 deletions .github/workflows/examples-nxp.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -96,3 +96,30 @@ jobs:
if: ${{ !env.ACT }}
with:
platform-name: K32W

zephyr:
name: ZEPHYR_RW61X

runs-on: ubuntu-latest
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build-nxp-zephyr:64

steps:
- name: Checkout
uses: actions/checkout@v4
- name: Checkout submodules & Bootstrap
uses: ./.github/actions/checkout-submodules-and-bootstrap
with:
platform: nxp

- name: Build RW61x Zephyr examples
run: |
scripts/run_in_build_env.sh "\
./scripts/build/build_examples.py \
--target nxp-rw61x-zephyr-all-clusters \
--target nxp-rw61x-zephyr-thermostat \
--target nxp-rw61x-zephyr-laundry-washer-factory \
build \
"
2 changes: 1 addition & 1 deletion .github/workflows/examples-qpg.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:54
image: ghcr.io/project-chip/chip-build:65
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/examples-stm32.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:54
image: ghcr.io/project-chip/chip-build:65
volumes:
- "/tmp/bloat_reports:/tmp/bloat_reports"
steps:
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/fuzzing-build.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:54
image: ghcr.io/project-chip/chip-build:65
volumes:
- "/tmp/log_output:/tmp/test_logs"

Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/lint.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ jobs:
if: github.actor != 'restyled-io[bot]'

container:
image: ghcr.io/project-chip/chip-build:54
image: ghcr.io/project-chip/chip-build:65

steps:
- name: Checkout
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ jobs:
runs-on: ubuntu-latest

container:
image: ghcr.io/project-chip/chip-build:54
image: ghcr.io/project-chip/chip-build:65
options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
net.ipv4.conf.all.forwarding=0 net.ipv6.conf.all.forwarding=0"

Expand Down Expand Up @@ -582,6 +582,7 @@ jobs:
scripts/run_in_python_env.sh out/venv './scripts/tests/TestTimeSyncTrustedTimeSourceRunner.py'
scripts/run_in_python_env.sh out/venv './src/python_testing/test_testing/test_TC_ICDM_2_1.py'
scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/TestIdChecks.py'
scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/TestConformanceSupport.py'
scripts/run_in_python_env.sh out/venv 'python3 ./src/python_testing/test_testing/test_IDM_10_4.py'
- name: Uploading core files
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/unit_integration_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ jobs:
runs-on: ubuntu-latest

container:
image: ghcr.io/project-chip/chip-build:54
image: ghcr.io/project-chip/chip-build:65
volumes:
- "/:/runner-root-volume"
- "/tmp/log_output:/tmp/test_logs"
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/zap_regeneration.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:

runs-on: ubuntu-20.04
container:
image: ghcr.io/project-chip/chip-build:54
image: ghcr.io/project-chip/chip-build:65
defaults:
run:
shell: sh
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/zap_templates.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@ jobs:

runs-on: ubuntu-20.04
container:
image: ghcr.io/project-chip/chip-build:54
image: ghcr.io/project-chip/chip-build:65
defaults:
run:
shell: sh
Expand Down
3 changes: 2 additions & 1 deletion .vscode/settings.json
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,8 @@
"random": "cpp",
"thread": "cpp",
"variant": "cpp",
"any": "cpp"
"any": "cpp",
"future": "cpp"
},
// Configure paths or glob patterns to exclude from file watching.
"files.watcherExclude": {
Expand Down
6 changes: 3 additions & 3 deletions data_model/1.3/clusters/ACL-Cluster.xml
Original file line number Diff line number Diff line change
Expand Up @@ -169,19 +169,19 @@ Davis, CA 95616, USA
</attribute>
<attribute id="0x0002" name="SubjectsPerAccessControlEntry" type="uint16" default="4">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false" sourceAttribution="false" quieterReporting="false"/>
<mandatoryConform/>
<constraint type="min" value="4"/>
</attribute>
<attribute id="0x0003" name="TargetsPerAccessControlEntry" type="uint16" default="3">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false" sourceAttribution="false" quieterReporting="false"/>
<mandatoryConform/>
<constraint type="min" value="3"/>
</attribute>
<attribute id="0x0004" name="AccessControlEntriesPerFabric" type="uint16" default="4">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false" sourceAttribution="false" quieterReporting="false"/>
<mandatoryConform/>
<constraint type="min" value="4"/>
</attribute>
Expand Down
4 changes: 2 additions & 2 deletions data_model/1.3/clusters/AdminCommissioningCluster.xml
Original file line number Diff line number Diff line change
Expand Up @@ -91,12 +91,12 @@ Davis, CA 95616, USA
</attribute>
<attribute id="0x0001" name="AdminFabricIndex" type="fabric-idx">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
<mandatoryConform/>
</attribute>
<attribute id="0x0002" name="AdminVendorId" type="vendor-id">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
<mandatoryConform/>
</attribute>
</attributes>
Expand Down
4 changes: 2 additions & 2 deletions data_model/1.3/clusters/AlarmBase.xml
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ Davis, CA 95616, USA
</attribute>
<attribute id="0x0001" name="Latch" type="AlarmBitmap" default="0">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false" sourceAttribution="false" quieterReporting="false"/>
<mandatoryConform>
<feature name="RESET"/>
</mandatoryConform>
Expand All @@ -91,7 +91,7 @@ Davis, CA 95616, USA
</attribute>
<attribute id="0x0003" name="Supported" type="AlarmBitmap" default="0">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false" sourceAttribution="false" quieterReporting="false"/>
<mandatoryConform/>
</attribute>
</attributes>
Expand Down
14 changes: 7 additions & 7 deletions data_model/1.3/clusters/ApplicationBasic.xml
Original file line number Diff line number Diff line change
Expand Up @@ -92,29 +92,29 @@ Davis, CA 95616, USA
<attributes>
<attribute id="0x0000" name="VendorName" type="string" default="empty">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false" sourceAttribution="false" quieterReporting="false"/>
<optionalConform/>
<constraint type="maxLength" value="32"/>
</attribute>
<attribute id="0x0001" name="VendorID" type="vendor-id">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false" sourceAttribution="false" quieterReporting="false"/>
<optionalConform/>
</attribute>
<attribute id="0x0002" name="ApplicationName" type="string">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false" sourceAttribution="false" quieterReporting="false"/>
<mandatoryConform/>
<constraint type="desc"/>
</attribute>
<attribute id="0x0003" name="ProductID" type="uint16">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false" sourceAttribution="false" quieterReporting="false"/>
<optionalConform/>
</attribute>
<attribute id="0x0004" name="Application" type="ApplicationStruct">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false" sourceAttribution="false" quieterReporting="false"/>
<mandatoryConform/>
<constraint type="desc"/>
</attribute>
Expand All @@ -125,14 +125,14 @@ Davis, CA 95616, USA
</attribute>
<attribute id="0x0006" name="ApplicationVersion" type="string">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false" sourceAttribution="false" quieterReporting="false"/>
<mandatoryConform/>
<constraint type="maxLength" value="32"/>
</attribute>
<attribute id="0x0007" name="AllowedVendorList" type="list">
<entry type="vendor-id"/>
<access read="true" readPrivilege="admin"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="fixed" reportable="false" sourceAttribution="false" quieterReporting="false"/>
<mandatoryConform/>
</attribute>
</attributes>
Expand Down
4 changes: 2 additions & 2 deletions data_model/1.3/clusters/ApplicationLauncher.xml
Original file line number Diff line number Diff line change
Expand Up @@ -103,14 +103,14 @@ Davis, CA 95616, USA
<attribute id="0x0000" name="CatalogList" type="list">
<entry type="uint16"/>
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false"/>
<quality changeOmitted="false" nullable="false" scene="false" persistence="nonVolatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
<mandatoryConform>
<feature name="AP"/>
</mandatoryConform>
</attribute>
<attribute id="0x0001" name="CurrentApp" type="ApplicationEPStruct" default="null">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
<optionalConform/>
<constraint type="desc"/>
</attribute>
Expand Down
14 changes: 8 additions & 6 deletions data_model/1.3/clusters/BallastConfiguration.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,9 @@ Davis, CA 95616, USA
<revision revision="4" summary="New data model format and notation"/>
</revisionHistory>
<clusterIds>
<clusterId id="0x0301" name="Ballast Configuration"/>
<clusterId id="0x0301" name="Ballast Configuration">
<provisionalConform/>
</clusterId>
</clusterIds>
<classification hierarchy="base" role="application" picsCode="BC" scope="Endpoint"/>
<dataTypes>
Expand Down Expand Up @@ -116,12 +118,12 @@ Davis, CA 95616, USA
</attribute>
<attribute id="0x0014" name="IntrinsicBallastFactor" type="uint8">
<access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
<optionalConform/>
</attribute>
<attribute id="0x0015" name="BallastFactorAdjustment" type="uint8" default="null">
<access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
<optionalConform/>
<constraint type="between" from="100" to="MS"/>
</attribute>
Expand All @@ -141,12 +143,12 @@ Davis, CA 95616, USA
</attribute>
<attribute id="0x0032" name="LampRatedHours" type="uint24" default="null">
<access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
<optionalConform/>
</attribute>
<attribute id="0x0033" name="LampBurnHours" type="uint24" default="0">
<access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
<optionalConform/>
</attribute>
<attribute id="0x0034" name="LampAlarmMode" type="LampAlarmModeBitmap" default="0">
Expand All @@ -155,7 +157,7 @@ Davis, CA 95616, USA
</attribute>
<attribute id="0x0035" name="LampBurnHoursTripPoint" type="uint24" default="null">
<access read="true" write="true" readPrivilege="view" writePrivilege="manage"/>
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false"/>
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
<optionalConform/>
</attribute>
</attributes>
Expand Down
Loading

0 comments on commit 0e02488

Please sign in to comment.