Skip to content

Commit

Permalink
Merge branch 'master' into TimerClusterXML
Browse files Browse the repository at this point in the history
  • Loading branch information
abeck-riis committed Nov 2, 2023
2 parents daf0b7c + 71a72ae commit b390c3a
Show file tree
Hide file tree
Showing 636 changed files with 36,591 additions and 32,815 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/darwin-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -147,8 +147,8 @@ jobs:
uses: actions/upload-artifact@v3
if: ${{ failure() && !env.ACT }}
with:
name: framework-build-log-darwin-${{BUILD_VARIANT_FRAMEWORK_TOOL}}
path: out/darwin-x64-darwin-framework-tool-${{BUILD_VARIANT_FRAMEWORK_TOOL}}/darwin_framework_build.log
name: framework-build-log-darwin-${BUILD_VARIANT_FRAMEWORK_TOOL}
path: out/darwin-x64-darwin-framework-tool-${BUILD_VARIANT_FRAMEWORK_TOOL}/darwin_framework_build.log
- name: Uploading objdir for debugging
uses: actions/upload-artifact@v3
if: ${{ failure() && !env.ACT }}
Expand Down
4 changes: 3 additions & 1 deletion .github/workflows/tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,8 @@ jobs:
src/app/zap-templates/zcl/data-model/chip/diagnostic-logs-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/dishwasher-alarm-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/dishwasher-mode-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/microwave-oven-mode-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/microwave-oven-control-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/door-lock-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/ethernet-network-diagnostics-cluster.xml \
src/app/zap-templates/zcl/data-model/chip/fan-control-cluster.xml \
Expand Down Expand Up @@ -438,7 +440,7 @@ jobs:
mkdir -p out/trace_data
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app --factoryreset --app-args "--trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script-args "--log-level INFO -t 3600 --disable-test ClusterObjectTests.TestTimedRequestTimeout --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_RR_1_1.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_DeviceBasicComposition.py" --script-args "--storage-path admin_storage.json --manual-code 10054912339 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_DeviceBasicComposition.py" --script-args "--storage-path admin_storage.json --manual-code 10054912339 --PICS src/app/tests/suites/certification/ci-pics-values --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_SC_3_6.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json" --script "src/python_testing/TC_DA_1_7.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --bool-arg allow_sdk_dac:true --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
scripts/run_in_python_env.sh out/venv './scripts/tests/run_python_test.py --app out/linux-x64-all-clusters-ipv6only-no-ble-no-wifi-tsan-clang-test/chip-all-clusters-app --factoryreset --app-args "--discriminator 1234 --KVS kvs1 --trace-to json:out/trace_data/app-{SCRIPT_BASE_NAME}.json --enable-key 000102030405060708090a0b0c0d0e0f" --script "src/python_testing/TC_TestEventTrigger.py" --script-args "--storage-path admin_storage.json --commissioning-method on-network --discriminator 1234 --passcode 20202021 --bool-arg allow_sdk_dac:true --trace-to json:out/trace_data/test-{SCRIPT_BASE_NAME}.json --trace-to perfetto:out/trace_data/test-{SCRIPT_BASE_NAME}.perfetto"'
Expand Down
3 changes: 2 additions & 1 deletion .github/workflows/unit_integration_test.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ jobs:

strategy:
matrix:
type: [main, clang, mbedtls, rotating_device_id]
type: [main, clang, mbedtls, rotating_device_id, icd]
env:
BUILD_TYPE: ${{ matrix.type }}

Expand Down Expand Up @@ -65,6 +65,7 @@ jobs:
"clang") GN_ARGS='is_clang=true';;
"mbedtls") GN_ARGS='chip_crypto="mbedtls"';;
"rotating_device_id") GN_ARGS='chip_crypto="boringssl" chip_enable_rotating_device_id=true';;
"icd") GN_ARGS='chip_enable_icd_server=true';;
*) ;;
esac
Expand Down
16 changes: 16 additions & 0 deletions config/esp32/components/chip/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -96,6 +96,22 @@ menu "CHIP Core"
help
Link the application against CHIP interactive shell.

config CHIP_SHELL_CMD_LINE_BUF_MAX_LENGTH
int "Maximum command line buffer length of the chip shell"
depends on ENABLE_CHIP_SHELL
default 256
help
Maximum command line buffer length of the chip shell. The command strings might be received
incompletely in the command handlers if they are longer than this buffer length.

config CHIP_SHELL_CMD_LINE_ARG_MAX_COUNT
int "Maximum command line arguments count of the chip shell"
depends on ENABLE_CHIP_SHELL
default 32
help
Maximum command line arguments count of the chip shell. The command arguments might be ignored
if they are more than this count.

config ENABLE_CHIP_CONTROLLER_BUILD
bool "Enable chip-controller build"
default n
Expand Down
4 changes: 2 additions & 2 deletions data_model/clusters/DemandResponseLoadControl.xml
Original file line number Diff line number Diff line change
Expand Up @@ -317,15 +317,15 @@ Davis, CA 95616, USA
<mandatoryConform>
<feature name="TEMPS"/>
</mandatoryConform>
<constraint type="between" from="0x954d" to="0x7fff"/>
<constraint type="between" from="0x954D" to="0x7FFF"/>
</field>
<field id="3" name="HeatingTempSetpoint" type="temperature" default="null">
<access read="true" write="true"/>
<quality nullable="true"/>
<mandatoryConform>
<feature name="TEMPS"/>
</mandatoryConform>
<constraint type="between" from="0x954d" to="0x7fff"/>
<constraint type="between" from="0x954D" to="0x7FFF"/>
</field>
</struct>
</dataTypes>
Expand Down
2 changes: 1 addition & 1 deletion data_model/clusters/DiagnosticsWiFi.xml
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ Connectivity Standards Alliance
508 Second Street, Suite 206
Davis, CA 95616, USA
-->
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0036" name="WiFi Network Diagnostics" revision="1">
<cluster xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="types types.xsd cluster cluster.xsd" id="0x0036" name="Wi-Fi Network Diagnostics" revision="1">
<revisionHistory>
<revision revision="1" summary="Initial Release"/>
</revisionHistory>
Expand Down
2 changes: 1 addition & 1 deletion data_model/clusters/EVSE-Attributes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ EVSEs at home or a business is managed by backend system and outside scope of
this cluster.
Note that in many deployments the EVSE may be outside the home and may suffer
from intermittent network connections (e.g. a weak WiFi signal). It also allows
from intermittent network connections (e.g. a weak Wi-Fi signal). It also allows
for a charging profile to be pre-configured, in case there is a temporary
communications loss during a charging session.
-->
Expand Down
2 changes: 1 addition & 1 deletion data_model/clusters/EVSE-Classification.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ EVSEs at home or a business is managed by backend system and outside scope of
this cluster.
Note that in many deployments the EVSE may be outside the home and may suffer
from intermittent network connections (e.g. a weak WiFi signal). It also allows
from intermittent network connections (e.g. a weak Wi-Fi signal). It also allows
for a charging profile to be pre-configured, in case there is a temporary
communications loss during a charging session.
-->
Expand Down
2 changes: 1 addition & 1 deletion data_model/clusters/EVSE-ClusterID.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ EVSEs at home or a business is managed by backend system and outside scope of
this cluster.
Note that in many deployments the EVSE may be outside the home and may suffer
from intermittent network connections (e.g. a weak WiFi signal). It also allows
from intermittent network connections (e.g. a weak Wi-Fi signal). It also allows
for a charging profile to be pre-configured, in case there is a temporary
communications loss during a charging session.
-->
Expand Down
2 changes: 1 addition & 1 deletion data_model/clusters/EVSE-Commands.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ EVSEs at home or a business is managed by backend system and outside scope of
this cluster.
Note that in many deployments the EVSE may be outside the home and may suffer
from intermittent network connections (e.g. a weak WiFi signal). It also allows
from intermittent network connections (e.g. a weak Wi-Fi signal). It also allows
for a charging profile to be pre-configured, in case there is a temporary
communications loss during a charging session.
-->
Expand Down
2 changes: 1 addition & 1 deletion data_model/clusters/EVSE-DataTypes.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ EVSEs at home or a business is managed by backend system and outside scope of
this cluster.
Note that in many deployments the EVSE may be outside the home and may suffer
from intermittent network connections (e.g. a weak WiFi signal). It also allows
from intermittent network connections (e.g. a weak Wi-Fi signal). It also allows
for a charging profile to be pre-configured, in case there is a temporary
communications loss during a charging session.
-->
Expand Down
2 changes: 1 addition & 1 deletion data_model/clusters/EVSE-Definitions.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ EVSEs at home or a business is managed by backend system and outside scope of
this cluster.
Note that in many deployments the EVSE may be outside the home and may suffer
from intermittent network connections (e.g. a weak WiFi signal). It also allows
from intermittent network connections (e.g. a weak Wi-Fi signal). It also allows
for a charging profile to be pre-configured, in case there is a temporary
communications loss during a charging session.
-->
Expand Down
2 changes: 1 addition & 1 deletion data_model/clusters/EVSE-Dependencies.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ EVSEs at home or a business is managed by backend system and outside scope of
this cluster.
Note that in many deployments the EVSE may be outside the home and may suffer
from intermittent network connections (e.g. a weak WiFi signal). It also allows
from intermittent network connections (e.g. a weak Wi-Fi signal). It also allows
for a charging profile to be pre-configured, in case there is a temporary
communications loss during a charging session.
-->
Expand Down
2 changes: 1 addition & 1 deletion data_model/clusters/EVSE-Events.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ EVSEs at home or a business is managed by backend system and outside scope of
this cluster.
Note that in many deployments the EVSE may be outside the home and may suffer
from intermittent network connections (e.g. a weak WiFi signal). It also allows
from intermittent network connections (e.g. a weak Wi-Fi signal). It also allows
for a charging profile to be pre-configured, in case there is a temporary
communications loss during a charging session.
-->
Expand Down
2 changes: 1 addition & 1 deletion data_model/clusters/EVSE-Features.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ EVSEs at home or a business is managed by backend system and outside scope of
this cluster.
Note that in many deployments the EVSE may be outside the home and may suffer
from intermittent network connections (e.g. a weak WiFi signal). It also allows
from intermittent network connections (e.g. a weak Wi-Fi signal). It also allows
for a charging profile to be pre-configured, in case there is a temporary
communications loss during a charging session.
-->
Expand Down
2 changes: 1 addition & 1 deletion data_model/clusters/EVSE-RevisionHistory.xml
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ EVSEs at home or a business is managed by backend system and outside scope of
this cluster.
Note that in many deployments the EVSE may be outside the home and may suffer
from intermittent network connections (e.g. a weak WiFi signal). It also allows
from intermittent network connections (e.g. a weak Wi-Fi signal). It also allows
for a charging profile to be pre-configured, in case there is a temporary
communications loss during a charging session.
-->
Expand Down
2 changes: 1 addition & 1 deletion data_model/clusters/NetworkCommissioningCluster.xml
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ Davis, CA 95616, USA
<item value="2" name="5G" summary="5GHz - 5.150GHz to 5.895GHz (802.11a/n/ac/ax)">
<optionalConform choice="a" more="true"/>
</item>
<item value="3" name="6G" summary="6GHz - 5.925GHz to 7.125GHz (802.11ax / WiFi 6E)">
<item value="3" name="6G" summary="6GHz - 5.925GHz to 7.125GHz (802.11ax / Wi-Fi 6E)">
<optionalConform choice="a" more="true"/>
</item>
<item value="4" name="60G" summary="60GHz - 57.24GHz to 70.20GHz (802.11ad/ay)">
Expand Down
2 changes: 1 addition & 1 deletion data_model/clusters/OnOff.xml
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ Davis, CA 95616, USA
</notTerm>
</optionalConform>
</feature>
<feature bit="1" code="DF" name="DeadFrontBehaviour" summary="Device has DeadFrontBehaviour Feature">
<feature bit="1" code="DF" name="DeadFrontBehavior" summary="Device has DeadFrontBehavior Feature">
<optionalConform>
<notTerm>
<feature name="OFFONLY"/>
Expand Down
2 changes: 1 addition & 1 deletion data_model/clusters/Timer.xml
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ Davis, CA 95616, USA
<constraint type="desc"/>
</field>
</command>
<command id="0x02" name="ReduceTime" response="Y">
<command id="0x03" name="ReduceTime" response="Y">
<access invokePrivilege="operate"/>
<optionalConform/>
<field id="0" name="TimeReduction" type="elapsed-s">
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ Davis, CA 95616, USA
<optionalConform/>
</attribute>
<attribute id="0x0015" name="SpecificationVersion">
<optionalConform/>
<disallowConform/>
</attribute>
<attribute id="0x0016" name="MaxPathsPerInvoke">
<disallowConform/>
Expand Down
2 changes: 1 addition & 1 deletion data_model/spec_sha
Original file line number Diff line number Diff line change
@@ -1 +1 @@
6be044cb0a9bb333b70ccf9f70074afeb440b3cb
17cfdc4a04397eec62f1bce7984cace268b28ab3
29 changes: 29 additions & 0 deletions docs/ci-cd/index.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
# CI/CD Documentation

## Known Issues

- Python build running out of space

## Tools

### Daily Fail Summary

Workflow:
https://github.com/project-chip/connectedhomeip/blob/master/.github/workflows/recent_fail_summary.yaml

Script:
https://github.com/project-chip/connectedhomeip/blob/master/scripts/tools/summarize_fail.py

Runs once per day; takes inventory of the previous day's workflow runs and
parses them for fail statistics. Creates temporarily cached artifacts for easy
data parsing. Also saves a daily pass percentage list of all workflows at
https://github.com/project-chip/connectedhomeip/blob/daily_pass_percentage/docs/daily_pass_percentage.md

## To Do

- Cert image auto build

## Improvement Ideas

- Deliver daily fail summaries in short form through a Slack bot for easy
access
1 change: 1 addition & 0 deletions docs/index.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ QUICK_START
PROJECT_FLOW
VSCODE_DEVELOPMENT
api/index
ci-cd/index
discussion/index
guides/index
style/index
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -739,7 +739,13 @@ server cluster GeneralDiagnostics = 51 {
int64u eventTrigger = 1;
}

response struct TimeSnapshotResponse = 2 {
systime_us systemTimeUs = 0;
nullable epoch_us UTCTimeUs = 1;
}

command access(invoke: manage) TestEventTrigger(TestEventTriggerRequest): DefaultSuccess = 0;
command TimeSnapshot(): TimeSnapshotResponse = 1;
}

/** Commands to trigger a Node to allow a new Administrator to commission it. */
Expand Down Expand Up @@ -1180,9 +1186,9 @@ provisional server cluster FanControl = 514 {

/** Attributes and commands for configuring the measurement of temperature, and reporting temperature measurements. */
server cluster TemperatureMeasurement = 1026 {
readonly attribute nullable int16s measuredValue = 0;
readonly attribute nullable int16s minMeasuredValue = 1;
readonly attribute nullable int16s maxMeasuredValue = 2;
readonly attribute nullable temperature measuredValue = 0;
readonly attribute nullable temperature minMeasuredValue = 1;
readonly attribute nullable temperature maxMeasuredValue = 2;
readonly attribute int16u tolerance = 3;
readonly attribute command_id generatedCommandList[] = 65528;
readonly attribute command_id acceptedCommandList[] = 65529;
Expand Down Expand Up @@ -1883,9 +1889,11 @@ endpoint 0 {
callback attribute activeNetworkFaults;
callback attribute testEventTriggersEnabled default = false;
ram attribute featureMap default = 0;
ram attribute clusterRevision default = 0x0001;
ram attribute clusterRevision default = 0x0002;

handle command TestEventTrigger;
handle command TimeSnapshot;
handle command TimeSnapshotResponse;
}

server cluster AdministratorCommissioning {
Expand Down
Loading

0 comments on commit b390c3a

Please sign in to comment.