Skip to content

Commit

Permalink
Merge branch 'master' into ember_tlv_reader_encoding
Browse files Browse the repository at this point in the history
  • Loading branch information
andreilitvin committed Oct 22, 2024
2 parents 717348c + 5c0c92e commit d6073eb
Show file tree
Hide file tree
Showing 247 changed files with 10,599 additions and 35,992 deletions.
14 changes: 12 additions & 2 deletions .github/issue-labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,18 @@ darwin:
# (?![a-z]) means "there is no next char in the range a-z".
- "/(\\b[Ii][Oo][Ss](?![a-zA-Z])|[Hh][Oo][Mm][Ee][Pp][Oo][Dd]|[Dd][Aa][Rr][Ww][Ii][Nn]|\\bm[Aa][Cc]\\b|\\bMa[Cc]\\b|\\bM[Aa]c\\b|[Mm][Aa][Cc][Oo][Ss])/"

linux:
- "/(linux)/i"

# NOTE:
# Linux intentionally disabled: most people compile either on linux or darwin and
# as a result a lot of issues get tagged as such even though they are not platform specific
# (e.g. we get test case failures reported as linux even though they are just normal
# test runs)
#
# Linux label should be reserved to platform-specific problems (usually bootstrap/packages
# or integration with wifi/ethernet/bluetootn/etc.)
#
# linux:
# - "/(linux)/i"

# Special Keywords for Cert Blockers
air purifiers:
Expand Down
28 changes: 25 additions & 3 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -275,38 +275,54 @@ darwin:
silabs:
- changed-files:
- any-glob-to-any-file:
- examples/platform/silabs/*
- examples/platform/silabs/**/*
- src/platform/silabs/*
- src/platform/silabs/**/*
- src/test_driver/efr32/*
- src/test_driver/efr32/**/*

esp32:
- changed-files:
- any-glob-to-any-file:
- examples/platform/esp32/*
- examples/platform/esp32/**/*
- src/platform/ESP32/*
- src/platform/ESP32/**/*
- src/test_driver/esp32/*
- src/test_driver/esp32/**/*

freeRTOS:
- changed-files:
- any-glob-to-any-file:
- src/platform/FreeRTOS/*
- src/platform/FreeRTOS/**/*

k32w:
nxp:
- changed-files:
- any-glob-to-any-file:
- src/platform/K32W/*
- src/platform/K32W/**/*
- examples/platform/nxp/*
- examples/platform/nxp/**/*
- src/platform/nxp/*
- src/platform/nxp/**/*

linux:
- changed-files:
- any-glob-to-any-file:
- examples/platform/linux/*
- examples/platform/linux/**/*
- src/platform/Linux/*
- src/platform/Linux/**/*

nrf connect:
- changed-files:
- any-glob-to-any-file:
- examples/platform/nrfconnect/*
- examples/platform/nrfconnect/**/*
- src/platform/nrfconnect/*
- src/platform/nrfconnect/**/*
- src/test_driver/nrfconnect/*
- src/test_driver/nrfconnect/**/*

openthread:
- changed-files:
Expand All @@ -323,11 +339,17 @@ zephyr:
telink:
- changed-files:
- any-glob-to-any-file:
- examples/platform/telink/*
- examples/platform/telink/**/*
- src/platform/telink/*
- src/platform/telink/**/*

tizen:
- changed-files:
- any-glob-to-any-file:
- examples/platform/tizen/*
- examples/platform/tizen/**/*
- src/platform/Tizen/*
- src/platform/Tizen/**/*
- src/test_driver/tizen/*
- src/test_driver/tizen/**/*
30 changes: 30 additions & 0 deletions .github/workflows/examples-telink.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ jobs:
# run: scripts/run_in_build_env.sh "python3 scripts/tools/telink/update_zephyr.py 3ed7686a9378de6be1368c912f9a42f998bbfb18"

- name: Build example Telink (B92 retention) Air Quality Sensor App
# Run test for master and s07641069 PRs
if: github.event.pull_request.number == null || github.event.pull_request.head.repo.full_name == 's07641069/connectedhomeip'
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py --target 'telink-tlsr9528a_retention-air-quality-sensor' build"
Expand All @@ -73,6 +75,8 @@ jobs:
run: rm -rf ./out

- name: Build example Telink (W91) All Clusters App
# Run test for master and s07641069 PRs
if: github.event.pull_request.number == null || github.event.pull_request.head.repo.full_name == 's07641069/connectedhomeip'
continue-on-error: true
run: |
./scripts/run_in_build_env.sh \
Expand All @@ -86,6 +90,8 @@ jobs:
run: rm -rf ./out

- name: Build example Telink (B92) All Clusters Minimal App
# Run test for master and s07641069 PRs
if: github.event.pull_request.number == null || github.event.pull_request.head.repo.full_name == 's07641069/connectedhomeip'
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py --target 'telink-tlsr9528a-all-clusters-minimal' build"
Expand All @@ -98,6 +104,7 @@ jobs:
run: rm -rf ./out

- name: Build example Telink (B95) Bridge App
# Run test for master and all PRs
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py --target 'telink-tlsr9258a-bridge' build"
Expand All @@ -110,6 +117,7 @@ jobs:
run: rm -rf ./out

- name: Build example Telink (B92 retention) Contact Sensor App
# Run test for master and all PRs
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py --target 'telink-tlsr9528a_retention-contact-sensor' build"
Expand All @@ -122,6 +130,7 @@ jobs:
run: rm -rf ./out

- name: Build tools required for Factory Data
# Run test for master and all PRs
run: |
./scripts/checkout_submodules.py --allow-changing-global-git-config --shallow --platform linux
./scripts/build/gn_gen.sh
Expand All @@ -132,6 +141,7 @@ jobs:
run: rm -rf ./out/telink*

- name: Build example Telink (W91) Lighting App with OTA, Factory Data
# Run test for master and all PRs
continue-on-error: true
run: |
./scripts/run_in_build_env.sh \
Expand All @@ -145,6 +155,7 @@ jobs:
run: rm -rf ./out/telink*

- name: Build example Telink (B91) Lighting App with OTA, RPC, Factory Data and 4Mb flash
# Run test for master and all PRs
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py --target 'telink-tlsr9518adk80d-light-ota-rpc-factory-data-4mb' build"
Expand All @@ -157,6 +168,7 @@ jobs:
run: rm -rf ./out/telink*

- name: Build example Telink (B92) Light Switch App with OTA, Shell, Factory Data
# Run test for master and all PRs
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py --target 'telink-tlsr9528a-light-switch-ota-shell-factory-data' build"
Expand All @@ -169,6 +181,8 @@ jobs:
run: rm -rf ./out

- name: Build example Telink (B92) Lock App with DFU
# Run test for master and s07641069 PRs
if: github.event.pull_request.number == null || github.event.pull_request.head.repo.full_name == 's07641069/connectedhomeip'
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py --target 'telink-tlsr9528a-lock-dfu' build"
Expand All @@ -181,6 +195,8 @@ jobs:
run: rm -rf ./out

- name: Build example Telink (B95) OTA Requestor App
# Run test for master and s07641069 PRs
if: github.event.pull_request.number == null || github.event.pull_request.head.repo.full_name == 's07641069/connectedhomeip'
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py --target 'telink-tlsr9258a-ota-requestor' build"
Expand All @@ -193,6 +209,8 @@ jobs:
run: rm -rf ./out

- name: Build example Telink (B91 USB) Pump App
# Run test for master and s07641069 PRs
if: github.event.pull_request.number == null || github.event.pull_request.head.repo.full_name == 's07641069/connectedhomeip'
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py --target 'telink-tlsr9518adk80d-pump-usb' build"
Expand All @@ -205,6 +223,8 @@ jobs:
run: rm -rf ./out

- name: Build example Telink (B91) Pump Controller App
# Run test for master and s07641069 PRs
if: github.event.pull_request.number == null || github.event.pull_request.head.repo.full_name == 's07641069/connectedhomeip'
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py --target 'telink-tlsr9518adk80d-pump-controller' build"
Expand All @@ -217,6 +237,8 @@ jobs:
run: rm -rf ./out

- name: Build example Telink (B91) Shell App
# Run test for master and s07641069 PRs
if: github.event.pull_request.number == null || github.event.pull_request.head.repo.full_name == 's07641069/connectedhomeip'
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py --target 'telink-tlsr9518adk80d-shell' build"
Expand All @@ -229,6 +251,8 @@ jobs:
run: rm -rf ./out

- name: Build example Telink (B92 retention) Smoke CO Alarm App
# Run test for master and s07641069 PRs
if: github.event.pull_request.number == null || github.event.pull_request.head.repo.full_name == 's07641069/connectedhomeip'
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py --target 'telink-tlsr9528a_retention-smoke-co-alarm' build"
Expand All @@ -241,6 +265,8 @@ jobs:
run: rm -rf ./out

- name: Build example Telink (B91 Mars) Temperature Measurement App with OTA
# Run test for master and s07641069 PRs
if: github.event.pull_request.number == null || github.event.pull_request.head.repo.full_name == 's07641069/connectedhomeip'
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py --target 'telink-tlsr9518adk80d-temperature-measurement-mars-ota' build"
Expand All @@ -253,6 +279,8 @@ jobs:
run: rm -rf ./out

- name: Build example Telink (B91) Thermostat App
# Run test for master and s07641069 PRs
if: github.event.pull_request.number == null || github.event.pull_request.head.repo.full_name == 's07641069/connectedhomeip'
run: |
./scripts/run_in_build_env.sh \
"./scripts/build/build_examples.py --target 'telink-tlsr9518adk80d-thermostat' build"
Expand All @@ -265,6 +293,8 @@ jobs:
run: rm -rf ./out

- name: Build example Telink (W91) Window Covering App
# Run test for master and s07641069 PRs
if: github.event.pull_request.number == null || github.event.pull_request.head.repo.full_name == 's07641069/connectedhomeip'
continue-on-error: true
run: |
./scripts/run_in_build_env.sh \
Expand Down
2 changes: 1 addition & 1 deletion config/telink/chip-module/Kconfig.defaults
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,7 @@ config BT_BUF_ACL_TX_SIZE
default 251

config BT_RX_STACK_SIZE
default 810 if BT_B9X
default 1352 if BT_B9X
default 2048 if BT_W91

config BT_HCI_TX_STACK_SIZE
Expand Down
8 changes: 1 addition & 7 deletions data_model/1.4/clusters/DeviceEnergyManagement.xml
Original file line number Diff line number Diff line change
Expand Up @@ -65,9 +65,7 @@ Davis, CA 95616, USA
<revision revision="4" summary="Updates to feature conformance. Corrected ForecastID type"/>
</revisionHistory>
<clusterIds>
<clusterId id="0x0098" name="Device Energy Management">
<provisionalConform/>
</clusterId>
<clusterId id="0x0098" name="Device Energy Management"/>
</clusterIds>
<classification hierarchy="base" role="application" picsCode="DEM" scope="Endpoint"/>
<features>
Expand Down Expand Up @@ -566,7 +564,6 @@ Davis, CA 95616, USA
</field>
<field id="1" name="Cause" type="AdjustmentCauseEnum">
<mandatoryConform/>
<constraint type="desc"/>
</field>
</command>
<command id="0x03" name="PauseRequest" direction="commandToServer" response="Y">
Expand All @@ -580,7 +577,6 @@ Davis, CA 95616, USA
</field>
<field id="1" name="Cause" type="AdjustmentCauseEnum">
<mandatoryConform/>
<constraint type="desc"/>
</field>
</command>
<command id="0x04" name="ResumeRequest" direction="commandToServer" response="Y">
Expand All @@ -604,7 +600,6 @@ Davis, CA 95616, USA
</field>
<field id="2" name="Cause" type="AdjustmentCauseEnum">
<mandatoryConform/>
<constraint type="desc"/>
</field>
</command>
<command id="0x06" name="RequestConstraintBasedForecast" direction="commandToServer" response="Y">
Expand All @@ -619,7 +614,6 @@ Davis, CA 95616, USA
</field>
<field id="1" name="Cause" type="AdjustmentCauseEnum">
<mandatoryConform/>
<constraint type="desc"/>
</field>
</command>
<command id="0x07" name="CancelRequest" direction="commandToServer" response="Y">
Expand Down
1 change: 0 additions & 1 deletion data_model/1.4/clusters/DiagnosticsGeneral.xml
Original file line number Diff line number Diff line change
Expand Up @@ -263,7 +263,6 @@ Davis, CA 95616, USA
<mandatoryConform/>
</attribute>
<attribute id="0x0009" name="DoNotUse">
<access read="true" readPrivilege="view"/>
<disallowConform/>
</attribute>
</attributes>
Expand Down
10 changes: 8 additions & 2 deletions data_model/1.4/clusters/DiagnosticsThread.xml
Original file line number Diff line number Diff line change
Expand Up @@ -669,12 +669,18 @@ Davis, CA 95616, USA
<attribute id="0x003F" name="ExtAddress" type="uint64">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
<mandatoryConform/>
<otherwiseConform>
<provisionalConform/>
<mandatoryConform/>
</otherwiseConform>
</attribute>
<attribute id="0x0040" name="Rloc16" type="uint16">
<access read="true" readPrivilege="view"/>
<quality changeOmitted="false" nullable="true" scene="false" persistence="volatile" reportable="false" sourceAttribution="false" quieterReporting="false"/>
<mandatoryConform/>
<otherwiseConform>
<provisionalConform/>
<mandatoryConform/>
</otherwiseConform>
</attribute>
</attributes>
<commands>
Expand Down
5 changes: 1 addition & 4 deletions data_model/1.4/clusters/DoorLock.xml
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ Davis, CA 95616, USA
<revision revision="5" summary="CCB 3472 3474 3338"/>
<revision revision="6" summary="New data model format and notation. Added User features. General cleanup of functionality"/>
<revision revision="7" summary="Added support for European door locks (unbolt feature)"/>
<revision revision="8" summary="Removed LOG feature, fixed constraints on NumberOf*Schedules attributes.
<revision revision="8" summary="Removed LOG and NOT feature, fixed constraints on NumberOf*Schedules attributes.
and added support for Aliro credential provisioning"/>
</revisionHistory>
<clusterIds>
Expand Down Expand Up @@ -600,9 +600,6 @@ Davis, CA 95616, USA
<bitfield name="LockFactoryReset" bit="1" summary="Lock Reset to Factory Defaults">
<optionalConform/>
</bitfield>
<bitfield name="N/A" bit="2" summary="Reserved">
<optionalConform/>
</bitfield>
<bitfield name="LockRadioPowerCycled" bit="3" summary="RF Module Power Cycled">
<optionalConform/>
</bitfield>
Expand Down
6 changes: 1 addition & 5 deletions data_model/1.4/clusters/EnergyEVSE.xml
Original file line number Diff line number Diff line change
Expand Up @@ -69,10 +69,7 @@ Davis, CA 95616, USA
<classification hierarchy="base" role="application" picsCode="EEVSE" scope="Endpoint"/>
<features>
<feature bit="0" code="PREF" name="ChargingPreferences" summary="EVSE supports storing user charging preferences">
<otherwiseConform>
<provisionalConform/>
<mandatoryConform/>
</otherwiseConform>
<mandatoryConform/>
</feature>
<feature bit="1" code="SOC" name="SoCReporting" summary="EVSE supports reporting of vehicle State of Charge (SoC)">
<otherwiseConform>
Expand Down Expand Up @@ -240,7 +237,6 @@ Davis, CA 95616, USA
<struct name="ChargingTargetScheduleStruct">
<field id="0" name="DayOfWeekForSequence" type="TargetDayOfWeekBitmap">
<mandatoryConform/>
<constraint type="desc"/>
</field>
<field id="1" name="ChargingTargets" type="list">
<entry type="ChargingTargetStruct"/>
Expand Down
Loading

0 comments on commit d6073eb

Please sign in to comment.