Merge branch 'master' into add-dem-example-code-for-1-4

project-chip · Jul 22, 2024 · 932c0c3 · 932c0c3
2 parents fa59eb6 + 3bc5667
commit 932c0c3
Show file tree

Hide file tree

Showing 426 changed files with 20,614 additions and 12,022 deletions.
diff --git a/.github/workflows/chef.yaml b/.github/workflows/chef.yaml
@@ -98,7 +98,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-telink:57
+            image: ghcr.io/project-chip/chip-build-telink:65
             options: --user root
 
         steps:

diff --git a/.github/workflows/cirque.yaml b/.github/workflows/cirque.yaml
@@ -42,7 +42,7 @@ jobs:
         # need to run with privilege, which isn't supported by job.XXX.contaner
         #  https://github.com/actions/container-action/issues/2
         #         container:
-        #             image: ghcr.io/project-chip/chip-build-cirque:54
+        #             image: ghcr.io/project-chip/chip-build-cirque:<VERSION_HERE>
         #             volumes:
         #                 - "/tmp:/tmp"
         #                 - "/dev/pts:/dev/pts"

diff --git a/.github/workflows/doxygen.yaml b/.github/workflows/doxygen.yaml
@@ -81,7 +81,7 @@ jobs:
 
         runs-on: ubuntu-latest
         container:
-            image: ghcr.io/project-chip/chip-build-doxygen:54
+            image: ghcr.io/project-chip/chip-build-doxygen:65
 
         if: github.actor != 'restyled-io[bot]'
 

diff --git a/.github/workflows/examples-linux-arm.yaml b/.github/workflows/examples-linux-arm.yaml
@@ -36,7 +36,7 @@ jobs:
         if: github.actor != 'restyled-io[bot]'
 
         container:
-            image: ghcr.io/project-chip/chip-build-crosscompile:54
+            image: ghcr.io/project-chip/chip-build-crosscompile:65
             volumes:
                 - "/tmp/bloat_reports:/tmp/bloat_reports"
 

diff --git a/.github/workflows/java-tests.yaml b/.github/workflows/java-tests.yaml
@@ -42,7 +42,7 @@ jobs:
         runs-on: ubuntu-latest
 
         container:
-            image: ghcr.io/project-chip/chip-build-java:54
+            image: ghcr.io/project-chip/chip-build-java:65
             options: --privileged --sysctl "net.ipv6.conf.all.disable_ipv6=0
                 net.ipv4.conf.all.forwarding=0 net.ipv6.conf.all.forwarding=0"
 

diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml
@@ -296,6 +296,7 @@ jobs:
                       ':(exclude)src/app/util/attribute-table.cpp'                                           \
                       ':(exclude)src/app/util/attribute-table.h'                                             \
                       ':(exclude)src/app/util/ember-compatibility-functions.cpp'                             \
+                      ':(exclude)src/app/util/mock/CodegenEmberMocks.cpp'                                    \
                       ':(exclude)src/app/zap-templates/templates/app/attributes/Accessors-src.zapt'          \
                       ':(exclude)zzz_generated/app-common/app-common/zap-generated/attributes/Accessors.cpp' \
                       && exit 1 || exit 0

diff --git a/.gitmodules b/.gitmodules
@@ -97,11 +97,6 @@
 	path = third_party/infineon/psoc6/psoc6_sdk/libs/abstraction-rtos
 	url = https://github.com/Infineon/abstraction-rtos
 	platforms = infineon
-[submodule "p6/bluetooth-freertos"]
-	path = third_party/infineon/psoc6/psoc6_sdk/libs/bluetooth-freertos
-	url = https://github.com/Infineon/bluetooth-freertos
-	branch  = v2.X
-	platforms = infineon
 [submodule "p6/btstack"]
 	path = third_party/infineon/psoc6/psoc6_sdk/libs/btstack
 	url = https://github.com/Infineon/btstack
@@ -134,10 +129,6 @@
 	path = third_party/infineon/psoc6/psoc6_sdk/libs/mtb-pdl-cat1
 	url = https://github.com/Infineon/mtb-pdl-cat1
 	platforms = infineon
-[submodule "p6/psoc6cm0p"]
-	path = third_party/infineon/psoc6/psoc6_sdk/libs/psoc6cm0p
-	url = https://github.com/Infineon/psoc6cm0p
-	platforms = infineon
 [submodule "p6/whd-bsp-integration"]
 	path = third_party/infineon/psoc6/psoc6_sdk/libs/whd-bsp-integration
 	url = https://github.com/Infineon/whd-bsp-integration
@@ -185,10 +176,6 @@
 [submodule "third_party/jsoncpp/repo"]
 	path = third_party/jsoncpp/repo
 	url = https://github.com/open-source-parsers/jsoncpp.git
-[submodule "third_party/p6/p6_sdk/libs/anycloud-ota"]
-	path = third_party/infineon/psoc6/psoc6_sdk/libs/anycloud-ota
-	url = https://github.com/Infineon/anycloud-ota
-	platforms = infineon
 [submodule "third_party/mbed-mcu-boot/repo"]
 	path = third_party/mbed-mcu-boot/repo
 	url = https://github.com/ATmobica/mcuboot.git
@@ -312,10 +299,6 @@
 	url = https://github.com/STMicroelectronics/STM32CubeWB.git
 	branch = v1.18.0
 	platforms = stm32
-[submodule "p6/lwip-network-interface-integration"]
-	path = third_party/infineon/psoc6/psoc6_sdk/libs/lwip-network-interface-integration
-	url = https://github.com/Infineon/lwip-network-interface-integration.git
-	platforms = infineon
 [submodule "third_party/infineon/trustm/optiga-trust-m"]
 	path = third_party/infineon/trustm/optiga-trust-m
 	url = https://github.com/Infineon/optiga-trust-m.git
@@ -326,3 +309,27 @@
 	url = https://github.com/NXP/nxp_matter_support.git
 	branch = master
 	platforms = nxp
+[submodule "third_party/infineon/psoc6/psoc6_sdk/libs/btstack-integration"]
+	path = third_party/infineon/psoc6/psoc6_sdk/libs/btstack-integration
+	url = https://github.com/Infineon/btstack-integration.git
+	platforms = infineon
+[submodule "third_party/infineon/psoc6/psoc6_sdk/libs/cat1cm0p"]
+	path = third_party/infineon/psoc6/psoc6_sdk/libs/cat1cm0p
+	url = https://github.com/Infineon/cat1cm0p.git
+	platforms = infineon
+[submodule "third_party/infineon/psoc6/psoc6_sdk/libs/cmsis"]
+	path = third_party/infineon/psoc6/psoc6_sdk/libs/cmsis
+	url = https://github.com/Infineon/cmsis.git
+	platforms = infineon
+[submodule "third_party/infineon/psoc6/psoc6_sdk/libs/ota-bootloader-abstraction"]
+	path = third_party/infineon/psoc6/psoc6_sdk/libs/ota-bootloader-abstraction
+	url = https://github.com/Infineon/ota-bootloader-abstraction.git
+	platforms = infineon
+[submodule "third_party/infineon/psoc6/psoc6_sdk/libs/ota-update"]
+	path = third_party/infineon/psoc6/psoc6_sdk/libs/ota-update
+	url = https://github.com/Infineon/ota-update.git
+	platforms = infineon
+[submodule "third_party/infineon/psoc6/psoc6_sdk/libs/lwip-network-interface-integration"]
+	path = third_party/infineon/psoc6/psoc6_sdk/libs/lwip-network-interface-integration
+	url = https://github.com/Infineon/lwip-network-interface-integration.git
+	platforms = infineon
diff --git a/config/telink/app/bootloader_usb.conf b/config/telink/app/bootloader_usb.conf
@@ -16,5 +16,5 @@
 
 # USB DFU configuration
 CONFIG_USB_DFU_WILL_DETACH=n
-CONFIG_BOOT_USB_DFU_GPIO=y
-CONFIG_MCUBOOT_INDICATION_LED=y
+CONFIG_BOOT_USB_DFU_GPIO=n
+CONFIG_MCUBOOT_INDICATION_LED=n
diff --git a/docs/guides/infineon_psoc6_software_update.md b/docs/guides/infineon_psoc6_software_update.md
@@ -25,23 +25,30 @@ Infineon PSoC6 example applications by passing the
 
            ```
            $ scripts/build/build_examples.py --enable-flashbundle --target infineon-psoc6-lock-ota build
-           $ third_party/infineon/psoc6/psoc6_sdk/ota/ota_base_build.sh out/infineon-psoc6-lock-ota chip-psoc6-lock-example
+           $ third_party/infineon/psoc6/psoc6_sdk/ota/ota_base_build.sh psoc6-lock chip-psoc6-lock-example
            ```
 
 -   Build the PSoC6 OTA Update application from the chip root dir and create OTA
     file
 
            ```
            $ scripts/build/build_examples.py --enable-flashbundle --no-log-timestamps --target infineon-psoc6-lock-ota-updateimage build
-           $ third_party/infineon/psoc6/psoc6_sdk/ota/ota_update_build.sh out/infineon-psoc6-lock-ota-updateimage chip-psoc6-lock-example
+           $ third_party/infineon/psoc6/psoc6_sdk/ota/ota_update_build.sh psoc6-lock chip-psoc6-lock-example
            ```
 
-*   Additionally a pre-compiled bootloader must be flashed to the board using
+*   Additionally a pre-compiled bootloader must be flashed to the board before
+    flashing the application using
     [Cypress Programmer](https://softwaretools.infineon.com/tools/com.ifx.tb.tool.cypressprogrammer).
     This image can be found at:
 
           $ ./third_party/infineon/psoc6/psoc6_sdk/ota/matter-psoc6-mcuboot-bootloader.hex
 
+*   Flash the application after putting the CY8CKIT-062S2-43012 board on
+    KitProg3 CMSIS-DAP Mode by pressing the `MODE SELECT` button.
+
+          $ cd ~/connectedhomeip
+          $ python3 out/infineon-psoc6-lock-ota/chip-psoc6-lock-example.flash.py
+
 *   In a terminal start the Provider app passing to it the path to the Matter
     OTA file created in the previous step:(output of ota_update_build step)
 

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
@@ -288,7 +288,7 @@ deprecated cluster OnOffSwitchConfiguration = 7 {
 
 /** Attributes and commands for controlling devices that can be set to a level between fully 'On' and fully 'Off.' */
 cluster LevelControl = 8 {
-  revision 5;
+  revision 6;
 
   enum MoveModeEnum : enum8 {
     kUp = 0;
@@ -5441,7 +5441,7 @@ cluster ThermostatUserInterfaceConfiguration = 516 {
 
 /** Attributes and commands for controlling the color properties of a color-capable light. */
 cluster ColorControl = 768 {
-  revision 6;
+  revision 7;
 
   enum ColorLoopAction : enum8 {
     kDeactivate = 0;
@@ -7847,7 +7847,7 @@ endpoint 1 {
     ram      attribute defaultMoveRate default = 50;
     persist  attribute startUpCurrentLevel default = 255;
     ram      attribute featureMap default = 3;
-    ram      attribute clusterRevision default = 5;
+    ram      attribute clusterRevision default = 6;
 
     handle command MoveToLevel;
     handle command Move;
@@ -8476,6 +8476,8 @@ endpoint 1 {
   server cluster EnergyEvseMode {
     callback attribute supportedModes;
     callback attribute currentMode;
+    ram      attribute startUpMode;
+    ram      attribute onMode;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute eventList;
@@ -8490,6 +8492,8 @@ endpoint 1 {
   server cluster DeviceEnergyManagementMode {
     callback attribute supportedModes;
     callback attribute currentMode;
+    ram      attribute startUpMode;
+    ram      attribute onMode;
     callback attribute generatedCommandList;
     callback attribute acceptedCommandList;
     callback attribute eventList;
@@ -8698,7 +8702,7 @@ endpoint 1 {
     ram      attribute coupleColorTempToLevelMinMireds;
     persist  attribute startUpColorTemperatureMireds;
     ram      attribute featureMap default = 0x1F;
-    ram      attribute clusterRevision default = 6;
+    ram      attribute clusterRevision default = 7;
 
     handle command MoveToHue;
     handle command MoveHue;

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
@@ -17,20 +17,20 @@
     }
   ],
   "package": [
-    {
-      "pathRelativity": "relativeToZap",
-      "path": "../../../src/app/zap-templates/app-templates.json",
-      "type": "gen-templates-json",
-      "category": "matter",
-      "version": "chip-v1"
-    },
     {
       "pathRelativity": "relativeToZap",
       "path": "../../../src/app/zap-templates/zcl/zcl-with-test-extensions.json",
       "type": "zcl-properties",
       "category": "matter",
       "version": 1,
       "description": "Matter SDK ZCL data with some extensions"
+    },
+    {
+      "pathRelativity": "relativeToZap",
+      "path": "../../../src/app/zap-templates/app-templates.json",
+      "type": "gen-templates-json",
+      "category": "matter",
+      "version": "chip-v1"
     }
   ],
   "endpointTypes": [
@@ -7303,7 +7303,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "5",
+              "defaultValue": "6",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,
@@ -14615,6 +14615,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "StartUpMode",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "OnMode",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -14772,6 +14804,38 @@
               "maxInterval": 65534,
               "reportableChange": 0
             },
+            {
+              "name": "StartUpMode",
+              "code": 2,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
+            {
+              "name": "OnMode",
+              "code": 3,
+              "mfgCode": null,
+              "side": "server",
+              "type": "int8u",
+              "included": 1,
+              "storageOption": "RAM",
+              "singleton": 0,
+              "bounded": 0,
+              "defaultValue": "",
+              "reportable": 1,
+              "minInterval": 1,
+              "maxInterval": 65534,
+              "reportableChange": 0
+            },
             {
               "name": "GeneratedCommandList",
               "code": 65528,
@@ -17807,7 +17871,7 @@
               "storageOption": "RAM",
               "singleton": 0,
               "bounded": 0,
-              "defaultValue": "6",
+              "defaultValue": "7",
               "reportable": 1,
               "minInterval": 0,
               "maxInterval": 65344,