Skip to content

Commit fc67ef9

Browse files
yunhanw-googleyunhanw-google
authored
Merge branch 'master' into feature/quick_fix_java_test
2 parents 6f61fd9 + a25af90 commit fc67ef9

File tree

91 files changed

+873
-547
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

91 files changed

+873
-547
lines changed

‎.github/workflows/build.yaml

+7
Original file line numberDiff line numberDiff line change
@@ -350,6 +350,13 @@ jobs:
350350
scripts/run_in_build_env.sh 'pip3 install ./out/controller/python/chip_repl-0.0-py3-none-any.whl'
351351
scripts/run_in_build_env.sh '(cd src/controller/python/test/unit_tests/ && python3 -m unittest -v)'
352352
353+
- name: Run Python Setup Payload Generator Test
354+
timeout-minutes: 10
355+
run: |
356+
scripts/run_in_build_env.sh 'scripts/examples/gn_build_example.sh examples/chip-tool out/'
357+
scripts/run_in_build_env.sh 'pip3 install -r src/setup_payload/python/requirements.txt'
358+
scripts/run_in_build_env.sh 'python3 src/setup_payload/tests/run_python_setup_payload_gen_test.py out/chip-tool'
359+
353360
build_darwin:
354361
name: Build on Darwin (clang, python_lib, simulated)
355362
timeout-minutes: 200

‎examples/all-clusters-app/all-clusters-common/all-clusters-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -3078,7 +3078,7 @@ server cluster TemperatureMeasurement = 1026 {
30783078

30793079
server cluster PressureMeasurement = 1027 {
30803080
bitmap PressureFeature : BITMAP32 {
3081-
kExt = 0x1;
3081+
kExtended = 0x1;
30823082
}
30833083

30843084
readonly attribute nullable int16s measuredValue = 0;

‎examples/all-clusters-app/all-clusters-common/all-clusters-app.zap

+11-11
Original file line numberDiff line numberDiff line change
@@ -7857,7 +7857,7 @@
78577857
"enabled": 1,
78587858
"attributes": [
78597859
{
7860-
"name": "measured value",
7860+
"name": "MeasuredValue",
78617861
"code": 0,
78627862
"mfgCode": null,
78637863
"side": "server",
@@ -7873,7 +7873,7 @@
78737873
"reportableChange": 0
78747874
},
78757875
{
7876-
"name": "min measured value",
7876+
"name": "MinMeasuredValue",
78777877
"code": 1,
78787878
"mfgCode": null,
78797879
"side": "server",
@@ -7889,7 +7889,7 @@
78897889
"reportableChange": 0
78907890
},
78917891
{
7892-
"name": "max measured value",
7892+
"name": "MaxMeasuredValue",
78937893
"code": 2,
78947894
"mfgCode": null,
78957895
"side": "server",
@@ -7905,7 +7905,7 @@
79057905
"reportableChange": 0
79067906
},
79077907
{
7908-
"name": "tolerance",
7908+
"name": "Tolerance",
79097909
"code": 3,
79107910
"mfgCode": null,
79117911
"side": "server",
@@ -15553,7 +15553,7 @@
1555315553
"enabled": 1,
1555415554
"attributes": [
1555515555
{
15556-
"name": "temperature display mode",
15556+
"name": "TemperatureDisplayMode",
1555715557
"code": 0,
1555815558
"mfgCode": null,
1555915559
"side": "server",
@@ -15569,7 +15569,7 @@
1556915569
"reportableChange": 0
1557015570
},
1557115571
{
15572-
"name": "keypad lockout",
15572+
"name": "KeypadLockout",
1557315573
"code": 1,
1557415574
"mfgCode": null,
1557515575
"side": "server",
@@ -15585,7 +15585,7 @@
1558515585
"reportableChange": 0
1558615586
},
1558715587
{
15588-
"name": "schedule programming visibility",
15588+
"name": "ScheduleProgrammingVisibility",
1558915589
"code": 2,
1559015590
"mfgCode": null,
1559115591
"side": "server",
@@ -17299,7 +17299,7 @@
1729917299
"enabled": 1,
1730017300
"attributes": [
1730117301
{
17302-
"name": "measured value",
17302+
"name": "MeasuredValue",
1730317303
"code": 0,
1730417304
"mfgCode": null,
1730517305
"side": "server",
@@ -17315,7 +17315,7 @@
1731517315
"reportableChange": 0
1731617316
},
1731717317
{
17318-
"name": "min measured value",
17318+
"name": "MinMeasuredValue",
1731917319
"code": 1,
1732017320
"mfgCode": null,
1732117321
"side": "server",
@@ -17331,7 +17331,7 @@
1733117331
"reportableChange": 0
1733217332
},
1733317333
{
17334-
"name": "max measured value",
17334+
"name": "MaxMeasuredValue",
1733517335
"code": 2,
1733617336
"mfgCode": null,
1733717337
"side": "server",
@@ -17347,7 +17347,7 @@
1734717347
"reportableChange": 0
1734817348
},
1734917349
{
17350-
"name": "tolerance",
17350+
"name": "Tolerance",
1735117351
"code": 3,
1735217352
"mfgCode": null,
1735317353
"side": "server",

‎examples/all-clusters-app/ameba/chip_main.cmake

-1
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,6 @@ list(
160160
${chip_dir}/examples/all-clusters-app/ameba/main/CHIPDeviceManager.cpp
161161
${chip_dir}/examples/all-clusters-app/ameba/main/Globals.cpp
162162
${chip_dir}/examples/all-clusters-app/ameba/main/LEDWidget.cpp
163-
${chip_dir}/examples/all-clusters-app/ameba/main/DsoHack.cpp
164163

165164
${chip_dir}/examples/platform/ameba/route_hook/ameba_route_hook.c
166165
${chip_dir}/examples/platform/ameba/route_hook/ameba_route_table.c

‎examples/all-clusters-app/ameba/main/DsoHack.cpp

-20
This file was deleted.

‎examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -2476,7 +2476,7 @@ server cluster TemperatureMeasurement = 1026 {
24762476

24772477
server cluster PressureMeasurement = 1027 {
24782478
bitmap PressureFeature : BITMAP32 {
2479-
kExt = 0x1;
2479+
kExtended = 0x1;
24802480
}
24812481

24822482
readonly attribute nullable int16s measuredValue = 0;

‎examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap

+11-11
Original file line numberDiff line numberDiff line change
@@ -7857,7 +7857,7 @@
78577857
"enabled": 1,
78587858
"attributes": [
78597859
{
7860-
"name": "measured value",
7860+
"name": "MeasuredValue",
78617861
"code": 0,
78627862
"mfgCode": null,
78637863
"side": "server",
@@ -7873,7 +7873,7 @@
78737873
"reportableChange": 0
78747874
},
78757875
{
7876-
"name": "min measured value",
7876+
"name": "MinMeasuredValue",
78777877
"code": 1,
78787878
"mfgCode": null,
78797879
"side": "server",
@@ -7889,7 +7889,7 @@
78897889
"reportableChange": 0
78907890
},
78917891
{
7892-
"name": "max measured value",
7892+
"name": "MaxMeasuredValue",
78937893
"code": 2,
78947894
"mfgCode": null,
78957895
"side": "server",
@@ -7905,7 +7905,7 @@
79057905
"reportableChange": 0
79067906
},
79077907
{
7908-
"name": "tolerance",
7908+
"name": "Tolerance",
79097909
"code": 3,
79107910
"mfgCode": null,
79117911
"side": "server",
@@ -15045,7 +15045,7 @@
1504515045
"enabled": 1,
1504615046
"attributes": [
1504715047
{
15048-
"name": "temperature display mode",
15048+
"name": "TemperatureDisplayMode",
1504915049
"code": 0,
1505015050
"mfgCode": null,
1505115051
"side": "server",
@@ -15061,7 +15061,7 @@
1506115061
"reportableChange": 0
1506215062
},
1506315063
{
15064-
"name": "keypad lockout",
15064+
"name": "KeypadLockout",
1506515065
"code": 1,
1506615066
"mfgCode": null,
1506715067
"side": "server",
@@ -15077,7 +15077,7 @@
1507715077
"reportableChange": 0
1507815078
},
1507915079
{
15080-
"name": "schedule programming visibility",
15080+
"name": "ScheduleProgrammingVisibility",
1508115081
"code": 2,
1508215082
"mfgCode": null,
1508315083
"side": "server",
@@ -16791,7 +16791,7 @@
1679116791
"enabled": 1,
1679216792
"attributes": [
1679316793
{
16794-
"name": "measured value",
16794+
"name": "MeasuredValue",
1679516795
"code": 0,
1679616796
"mfgCode": null,
1679716797
"side": "server",
@@ -16807,7 +16807,7 @@
1680716807
"reportableChange": 0
1680816808
},
1680916809
{
16810-
"name": "min measured value",
16810+
"name": "MinMeasuredValue",
1681116811
"code": 1,
1681216812
"mfgCode": null,
1681316813
"side": "server",
@@ -16823,7 +16823,7 @@
1682316823
"reportableChange": 0
1682416824
},
1682516825
{
16826-
"name": "max measured value",
16826+
"name": "MaxMeasuredValue",
1682716827
"code": 2,
1682816828
"mfgCode": null,
1682916829
"side": "server",
@@ -16839,7 +16839,7 @@
1683916839
"reportableChange": 0
1684016840
},
1684116841
{
16842-
"name": "tolerance",
16842+
"name": "Tolerance",
1684316843
"code": 3,
1684416844
"mfgCode": null,
1684516845
"side": "server",

‎examples/chef/ameba/chip_main.cmake

-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ list(
4242
${matter_example_path}//main/CHIPDeviceManager.cpp
4343
${matter_example_path}//main/Globals.cpp
4444
${matter_example_path}//main/LEDWidget.cpp
45-
${matter_example_path}//main/DsoHack.cpp
4645

4746
${chip_dir}/examples/providers/DeviceInfoProviderImpl.cpp
4847
)

‎examples/chef/ameba/main/DsoHack.cpp

-20
This file was deleted.

‎examples/chef/create_docker.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -66,4 +66,6 @@
6666
image[0].tag(docker_image_name, tag=f'revision-id_{args.revision_id}')
6767

6868
print(f'Pushing image: {docker_image_name}')
69-
client.images.push(docker_image_name)
69+
response = client.images.push(docker_image_name, stream=True, decode=True)
70+
for line in response:
71+
print(line)

‎examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap

+4-4
Original file line numberDiff line numberDiff line change
@@ -6001,7 +6001,7 @@
60016001
"enabled": 1,
60026002
"attributes": [
60036003
{
6004-
"name": "measured value",
6004+
"name": "MeasuredValue",
60056005
"code": 0,
60066006
"mfgCode": null,
60076007
"side": "server",
@@ -6017,7 +6017,7 @@
60176017
"reportableChange": 0
60186018
},
60196019
{
6020-
"name": "min measured value",
6020+
"name": "MinMeasuredValue",
60216021
"code": 1,
60226022
"mfgCode": null,
60236023
"side": "server",
@@ -6033,7 +6033,7 @@
60336033
"reportableChange": 0
60346034
},
60356035
{
6036-
"name": "max measured value",
6036+
"name": "MaxMeasuredValue",
60376037
"code": 2,
60386038
"mfgCode": null,
60396039
"side": "server",
@@ -6049,7 +6049,7 @@
60496049
"reportableChange": 0
60506050
},
60516051
{
6052-
"name": "tolerance",
6052+
"name": "Tolerance",
60536053
"code": 3,
60546054
"mfgCode": null,
60556055
"side": "server",

‎examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter

+1-1
Original file line numberDiff line numberDiff line change
@@ -1043,7 +1043,7 @@ server cluster UserLabel = 65 {
10431043

10441044
server cluster PressureMeasurement = 1027 {
10451045
bitmap PressureFeature : BITMAP32 {
1046-
kExt = 0x1;
1046+
kExtended = 0x1;
10471047
}
10481048

10491049
readonly attribute nullable int16s measuredValue = 0;

‎examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap

+3-3
Original file line numberDiff line numberDiff line change
@@ -7347,7 +7347,7 @@
73477347
"enabled": 1,
73487348
"attributes": [
73497349
{
7350-
"name": "temperature display mode",
7350+
"name": "TemperatureDisplayMode",
73517351
"code": 0,
73527352
"mfgCode": null,
73537353
"side": "server",
@@ -7363,7 +7363,7 @@
73637363
"reportableChange": 0
73647364
},
73657365
{
7366-
"name": "keypad lockout",
7366+
"name": "KeypadLockout",
73677367
"code": 1,
73687368
"mfgCode": null,
73697369
"side": "server",
@@ -7379,7 +7379,7 @@
73797379
"reportableChange": 0
73807380
},
73817381
{
7382-
"name": "schedule programming visibility",
7382+
"name": "ScheduleProgrammingVisibility",
73837383
"code": 2,
73847384
"mfgCode": null,
73857385
"side": "server",

‎examples/light-switch-app/ameba/chip_main.cmake

-1
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,6 @@ list(
157157
${chip_dir}/examples/light-switch-app/ameba/main/CHIPDeviceManager.cpp
158158
${chip_dir}/examples/light-switch-app/ameba/main/Globals.cpp
159159
${chip_dir}/examples/light-switch-app/ameba/main/LEDWidget.cpp
160-
${chip_dir}/examples/light-switch-app/ameba/main/DsoHack.cpp
161160

162161
${chip_dir}/examples/providers/DeviceInfoProviderImpl.cpp
163162
)

‎examples/light-switch-app/ameba/main/DsoHack.cpp

-20
This file was deleted.

0 commit comments

Comments
 (0)