Merge remote-tracking branch 'origin/chip_tool_fixes' into chip_tool_…

…fixes
project-chip · Jan 13, 2023 · 333b8bb · 333b8bb
2 parents 894c6b8 + f6ec05f
commit 333b8bb
Show file tree

Hide file tree

Showing 151 changed files with 8,714 additions and 556 deletions.
diff --git a/.github/workflows/build.yaml b/.github/workflows/build.yaml
@@ -350,6 +350,13 @@ jobs:
                   scripts/run_in_build_env.sh 'pip3 install ./out/controller/python/chip_repl-0.0-py3-none-any.whl'
                   scripts/run_in_build_env.sh '(cd src/controller/python/test/unit_tests/ && python3 -m unittest -v)'
 
+            - name: Run Python Setup Payload Generator Test
+              timeout-minutes: 10
+              run: |
+                scripts/run_in_build_env.sh 'scripts/examples/gn_build_example.sh examples/chip-tool out/'
+                scripts/run_in_build_env.sh 'pip3 install -r src/setup_payload/python/requirements.txt'
+                scripts/run_in_build_env.sh 'python3 src/setup_payload/tests/run_python_setup_payload_gen_test.py out/chip-tool'
+
     build_darwin:
         name: Build on Darwin (clang, python_lib, simulated)
         timeout-minutes: 200

diff --git a/.github/workflows/tests.yaml b/.github/workflows/tests.yaml
@@ -452,7 +452,7 @@ jobs:
                   path: |
                       .environment/gn_out/.ninja_log
                       .environment/pigweed-venv/*.log
-            - name: Build Java Mattter Controller and all clusters app
+            - name: Build Java Matter Controller and all clusters app
               timeout-minutes: 50
               run: |
                   scripts/run_in_build_env.sh './scripts/build_python.sh --install_wheel build-env'
@@ -463,7 +463,9 @@ jobs:
                       build \
                    "
             - name: Run Discover Tests
-              timeout-minutes: 65
+              # temporarily disable the failing test, would re-enable it later
+              if: false
+              timeout-minutes: 10
               run: |
                   scripts/run_in_build_env.sh \
                   './scripts/tests/run_java_test.py \
@@ -475,7 +477,7 @@ jobs:
                      --factoryreset \
                   '
             - name: Run Pairing Tests
-              timeout-minutes: 65
+              timeout-minutes: 10
               run: |
                   scripts/run_in_build_env.sh \
                   './scripts/tests/run_java_test.py \

diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter b/examples/all-clusters-app/all-clusters-common/all-clusters-app.matter
@@ -3078,7 +3078,7 @@ server cluster TemperatureMeasurement = 1026 {
 
 server cluster PressureMeasurement = 1027 {
   bitmap PressureFeature : BITMAP32 {
-    kExt = 0x1;
+    kExtended = 0x1;
   }
 
   readonly attribute nullable int16s measuredValue = 0;

diff --git a/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap b/examples/all-clusters-app/all-clusters-common/all-clusters-app.zap
@@ -7857,7 +7857,7 @@
           "enabled": 1,
           "attributes": [
             {
-              "name": "measured value",
+              "name": "MeasuredValue",
               "code": 0,
               "mfgCode": null,
               "side": "server",
@@ -7873,7 +7873,7 @@
               "reportableChange": 0
             },
             {
-              "name": "min measured value",
+              "name": "MinMeasuredValue",
               "code": 1,
               "mfgCode": null,
               "side": "server",
@@ -7889,7 +7889,7 @@
               "reportableChange": 0
             },
             {
-              "name": "max measured value",
+              "name": "MaxMeasuredValue",
               "code": 2,
               "mfgCode": null,
               "side": "server",
@@ -7905,7 +7905,7 @@
               "reportableChange": 0
             },
             {
-              "name": "tolerance",
+              "name": "Tolerance",
               "code": 3,
               "mfgCode": null,
               "side": "server",
@@ -15553,7 +15553,7 @@
           "enabled": 1,
           "attributes": [
             {
-              "name": "temperature display mode",
+              "name": "TemperatureDisplayMode",
               "code": 0,
               "mfgCode": null,
               "side": "server",
@@ -15569,7 +15569,7 @@
               "reportableChange": 0
             },
             {
-              "name": "keypad lockout",
+              "name": "KeypadLockout",
               "code": 1,
               "mfgCode": null,
               "side": "server",
@@ -15585,7 +15585,7 @@
               "reportableChange": 0
             },
             {
-              "name": "schedule programming visibility",
+              "name": "ScheduleProgrammingVisibility",
               "code": 2,
               "mfgCode": null,
               "side": "server",
@@ -17299,7 +17299,7 @@
           "enabled": 1,
           "attributes": [
             {
-              "name": "measured value",
+              "name": "MeasuredValue",
               "code": 0,
               "mfgCode": null,
               "side": "server",
@@ -17315,7 +17315,7 @@
               "reportableChange": 0
             },
             {
-              "name": "min measured value",
+              "name": "MinMeasuredValue",
               "code": 1,
               "mfgCode": null,
               "side": "server",
@@ -17331,7 +17331,7 @@
               "reportableChange": 0
             },
             {
-              "name": "max measured value",
+              "name": "MaxMeasuredValue",
               "code": 2,
               "mfgCode": null,
               "side": "server",
@@ -17347,7 +17347,7 @@
               "reportableChange": 0
             },
             {
-              "name": "tolerance",
+              "name": "Tolerance",
               "code": 3,
               "mfgCode": null,
               "side": "server",

diff --git a/examples/all-clusters-app/ameba/chip_main.cmake b/examples/all-clusters-app/ameba/chip_main.cmake
@@ -160,7 +160,6 @@ list(
     ${chip_dir}/examples/all-clusters-app/ameba/main/CHIPDeviceManager.cpp
     ${chip_dir}/examples/all-clusters-app/ameba/main/Globals.cpp
     ${chip_dir}/examples/all-clusters-app/ameba/main/LEDWidget.cpp
-    ${chip_dir}/examples/all-clusters-app/ameba/main/DsoHack.cpp
 
     ${chip_dir}/examples/platform/ameba/route_hook/ameba_route_hook.c
     ${chip_dir}/examples/platform/ameba/route_hook/ameba_route_table.c

diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.matter
@@ -2476,7 +2476,7 @@ server cluster TemperatureMeasurement = 1026 {
 
 server cluster PressureMeasurement = 1027 {
   bitmap PressureFeature : BITMAP32 {
-    kExt = 0x1;
+    kExtended = 0x1;
   }
 
   readonly attribute nullable int16s measuredValue = 0;

diff --git a/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap b/examples/all-clusters-minimal-app/all-clusters-common/all-clusters-minimal-app.zap
@@ -7857,7 +7857,7 @@
           "enabled": 1,
           "attributes": [
             {
-              "name": "measured value",
+              "name": "MeasuredValue",
               "code": 0,
               "mfgCode": null,
               "side": "server",
@@ -7873,7 +7873,7 @@
               "reportableChange": 0
             },
             {
-              "name": "min measured value",
+              "name": "MinMeasuredValue",
               "code": 1,
               "mfgCode": null,
               "side": "server",
@@ -7889,7 +7889,7 @@
               "reportableChange": 0
             },
             {
-              "name": "max measured value",
+              "name": "MaxMeasuredValue",
               "code": 2,
               "mfgCode": null,
               "side": "server",
@@ -7905,7 +7905,7 @@
               "reportableChange": 0
             },
             {
-              "name": "tolerance",
+              "name": "Tolerance",
               "code": 3,
               "mfgCode": null,
               "side": "server",
@@ -15045,7 +15045,7 @@
           "enabled": 1,
           "attributes": [
             {
-              "name": "temperature display mode",
+              "name": "TemperatureDisplayMode",
               "code": 0,
               "mfgCode": null,
               "side": "server",
@@ -15061,7 +15061,7 @@
               "reportableChange": 0
             },
             {
-              "name": "keypad lockout",
+              "name": "KeypadLockout",
               "code": 1,
               "mfgCode": null,
               "side": "server",
@@ -15077,7 +15077,7 @@
               "reportableChange": 0
             },
             {
-              "name": "schedule programming visibility",
+              "name": "ScheduleProgrammingVisibility",
               "code": 2,
               "mfgCode": null,
               "side": "server",
@@ -16791,7 +16791,7 @@
           "enabled": 1,
           "attributes": [
             {
-              "name": "measured value",
+              "name": "MeasuredValue",
               "code": 0,
               "mfgCode": null,
               "side": "server",
@@ -16807,7 +16807,7 @@
               "reportableChange": 0
             },
             {
-              "name": "min measured value",
+              "name": "MinMeasuredValue",
               "code": 1,
               "mfgCode": null,
               "side": "server",
@@ -16823,7 +16823,7 @@
               "reportableChange": 0
             },
             {
-              "name": "max measured value",
+              "name": "MaxMeasuredValue",
               "code": 2,
               "mfgCode": null,
               "side": "server",
@@ -16839,7 +16839,7 @@
               "reportableChange": 0
             },
             {
-              "name": "tolerance",
+              "name": "Tolerance",
               "code": 3,
               "mfgCode": null,
               "side": "server",

diff --git a/examples/chef/ameba/chip_main.cmake b/examples/chef/ameba/chip_main.cmake
@@ -42,7 +42,6 @@ list(
     ${matter_example_path}//main/CHIPDeviceManager.cpp
     ${matter_example_path}//main/Globals.cpp
     ${matter_example_path}//main/LEDWidget.cpp
-    ${matter_example_path}//main/DsoHack.cpp
 
     ${chip_dir}/examples/providers/DeviceInfoProviderImpl.cpp
 )

diff --git a/examples/chef/create_docker.py b/examples/chef/create_docker.py
@@ -66,4 +66,6 @@
     image[0].tag(docker_image_name, tag=f'revision-id_{args.revision_id}')
 
     print(f'Pushing image: {docker_image_name}')
-    client.images.push(docker_image_name)
+    response = client.images.push(docker_image_name, stream=True, decode=True)
+    for line in response:
+        print(line)
diff --git a/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap b/examples/chef/devices/rootnode_humiditysensor_Xyj4gda6Hb.zap
@@ -6001,7 +6001,7 @@
           "enabled": 1,
           "attributes": [
             {
-              "name": "measured value",
+              "name": "MeasuredValue",
               "code": 0,
               "mfgCode": null,
               "side": "server",
@@ -6017,7 +6017,7 @@
               "reportableChange": 0
             },
             {
-              "name": "min measured value",
+              "name": "MinMeasuredValue",
               "code": 1,
               "mfgCode": null,
               "side": "server",
@@ -6033,7 +6033,7 @@
               "reportableChange": 0
             },
             {
-              "name": "max measured value",
+              "name": "MaxMeasuredValue",
               "code": 2,
               "mfgCode": null,
               "side": "server",
@@ -6049,7 +6049,7 @@
               "reportableChange": 0
             },
             {
-              "name": "tolerance",
+              "name": "Tolerance",
               "code": 3,
               "mfgCode": null,
               "side": "server",

diff --git a/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter b/examples/chef/devices/rootnode_pressuresensor_s0qC9wLH4k.matter
@@ -1043,7 +1043,7 @@ server cluster UserLabel = 65 {
 
 server cluster PressureMeasurement = 1027 {
   bitmap PressureFeature : BITMAP32 {
-    kExt = 0x1;
+    kExtended = 0x1;
   }
 
   readonly attribute nullable int16s measuredValue = 0;

diff --git a/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap b/examples/chef/devices/rootnode_thermostat_bm3fb8dhYi.zap
@@ -7347,7 +7347,7 @@
           "enabled": 1,
           "attributes": [
             {
-              "name": "temperature display mode",
+              "name": "TemperatureDisplayMode",
               "code": 0,
               "mfgCode": null,
               "side": "server",
@@ -7363,7 +7363,7 @@
               "reportableChange": 0
             },
             {
-              "name": "keypad lockout",
+              "name": "KeypadLockout",
               "code": 1,
               "mfgCode": null,
               "side": "server",
@@ -7379,7 +7379,7 @@
               "reportableChange": 0
             },
             {
-              "name": "schedule programming visibility",
+              "name": "ScheduleProgrammingVisibility",
               "code": 2,
               "mfgCode": null,
               "side": "server",

diff --git a/examples/java-matter-controller/BUILD.gn b/examples/java-matter-controller/BUILD.gn
@@ -33,8 +33,10 @@ java_binary("java-matter-controller") {
     "java/src/com/matter/controller/commands/common/Command.java",
     "java/src/com/matter/controller/commands/common/CommandManager.java",
     "java/src/com/matter/controller/commands/common/CredentialsIssuer.java",
+    "java/src/com/matter/controller/commands/common/FutureResult.java",
     "java/src/com/matter/controller/commands/common/IPAddress.java",
     "java/src/com/matter/controller/commands/common/MatterCommand.java",
+    "java/src/com/matter/controller/commands/common/RealResult.java",
     "java/src/com/matter/controller/commands/discover/DiscoverCommand.java",
     "java/src/com/matter/controller/commands/discover/DiscoverCommissionablesCommand.java",
     "java/src/com/matter/controller/commands/discover/DiscoverCommissionersCommand.java",

diff --git a/examples/java-matter-controller/java/src/com/matter/controller/Main.java b/examples/java-matter-controller/java/src/com/matter/controller/Main.java
@@ -114,8 +114,10 @@ public static void main(String[] args) {
       commandManager.run(args);
     } catch (IllegalArgumentException e) {
       logger.log(Level.INFO, "Arguments init failed with exception: " + e.getMessage());
+      System.exit(1);
     } catch (Exception e) {
       logger.log(Level.INFO, "Run command failed with exception: " + e.getMessage());
+      System.exit(1);
     }
     controller.shutdownCommissioning();
   }