Merge branch 'master' into idm-4.2-troubleshoot

raul-marquez-csa · May 21, 2024 · 3cf9bee · 3cf9bee
2 parents a76221d + 3c6bd79
commit 3cf9bee
Show file tree

Hide file tree

Showing 11 changed files with 217 additions and 55 deletions.
diff --git a/.github/workflows/examples-linux-tv-casting-app.yaml b/.github/workflows/examples-linux-tv-casting-app.yaml
@@ -67,7 +67,7 @@ jobs:
               run: |
                   ./scripts/run_in_build_env.sh \
                     "python3 ./scripts/tests/run_tv_casting_test.py"
-              timeout-minutes: 1
+              timeout-minutes: 2 # Comment this out to debug if GitHub Action times out.
 
             - name: Uploading Size Reports
               uses: ./.github/actions/upload-size-reports

diff --git a/...p/src/main/java/com/google/chip/chiptool/setuppayloadscanner/CHIPDeviceDetailsFragment.kt b/...p/src/main/java/com/google/chip/chiptool/setuppayloadscanner/CHIPDeviceDetailsFragment.kt
@@ -61,7 +61,6 @@ class CHIPDeviceDetailsFragment : Fragment() {
     binding.discriminatorEd.setText(deviceInfo.discriminator.toString())
     binding.serialNumberEd.setText(deviceInfo.serialNumber)
     binding.discoveryCapabilitiesTv.text = "${deviceInfo.discoveryCapabilities}"
-
     if (deviceInfo.optionalQrCodeInfoMap.isEmpty()) {
       binding.vendorTagsLabelTv.visibility = View.GONE
       binding.vendorTagsContainer.visibility = View.GONE

diff --git a/...CHIPTool/app/src/main/java/com/google/chip/chiptool/setuppayloadscanner/CHIPDeviceInfo.kt b/...CHIPTool/app/src/main/java/com/google/chip/chiptool/setuppayloadscanner/CHIPDeviceInfo.kt
@@ -24,6 +24,7 @@ import kotlinx.parcelize.Parcelize
 import matter.onboardingpayload.DiscoveryCapability
 import matter.onboardingpayload.OnboardingPayload
 import matter.onboardingpayload.OnboardingPayloadException
+import matter.onboardingpayload.OptionalQRCodeInfoType
 
 /** Class to hold the CHIP device information. */
 @Parcelize
@@ -57,6 +58,13 @@ data class CHIPDeviceInfo(
     if (serialNumber.isNotEmpty()) {
       onboardingPayload.addSerialNumber(serialNumber)
     }
+    optionalQrCodeInfoMap.forEach { (_, info) ->
+      if (info.type == OptionalQRCodeInfoType.TYPE_STRING && info.data != null) {
+        onboardingPayload.addOptionalVendorData(info.tag, info.data)
+      } else {
+        onboardingPayload.addOptionalVendorData(info.tag, info.intDataValue)
+      }
+    }
     return onboardingPayload
   }
 
@@ -78,8 +86,8 @@ data class CHIPDeviceInfo(
         setupPayload.getLongDiscriminatorValue(),
         setupPayload.setupPinCode,
         setupPayload.commissioningFlow,
-        setupPayload.optionalQRCodeInfo.mapValues { (_, info) ->
-          QrCodeInfo(info.tag, info.type, info.data, info.int32)
+        setupPayload.getAllOptionalVendorData().associate { info ->
+          info.tag to QrCodeInfo(info.tag, info.type, info.data, info.int32)
         },
         setupPayload.discoveryCapabilities,
         setupPayload.hasShortDiscriminator,

diff --git a/examples/android/CHIPTool/app/src/main/res/layout/chip_device_info_fragment.xml b/examples/android/CHIPTool/app/src/main/res/layout/chip_device_info_fragment.xml
@@ -151,15 +151,15 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginBottom="8dp"
-            android:layout_below="@id/vendorTagsLabelTv"
+            android:layout_below="@id/vendorTagsContainer"
             android:layout_alignParentStart="true"
             android:textSize="20sp"/>
         <EditText
             android:id="@+id/discoveryCapabilitiesEd"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginStart="16dp"
-            android:layout_below="@id/vendorTagsLabelTv"
+            android:layout_below="@id/vendorTagsContainer"
             android:layout_toEndOf="@id/discoveryCapabilitiesLabelTv"
             android:layout_alignParentEnd="true"
             android:textSize="11sp"
@@ -260,6 +260,6 @@
             android:layout_below="@id/showQRCodeUriBtn"
             android:layout_alignParentBottom="true"
             android:layout_alignParentStart="true"
-            android:textSize="20sp"/>
+            android:textSize="12sp"/>
     </RelativeLayout>
 </ScrollView>
diff --git a/examples/chef/chef.py b/examples/chef/chef.py
@@ -696,11 +696,20 @@ def main() -> int:
         if options.build_target == "esp32":
             shell.run_cmd(f"cd {_CHEF_SCRIPT_PATH}/esp32")
             if options.enable_ipv4:
-                shell.run_cmd(
-                    "sed -i 's/CONFIG_DISABLE_IPV4=y/#\\ CONFIG_DISABLE_IPV4\\ is\\ not\\ set/g' sdkconfig ")
+                if sys.platform == "darwin":
+                    shell.run_cmd(
+                        "sed -i '' 's/CONFIG_DISABLE_IPV4=y/#\\ CONFIG_DISABLE_IPV4\\ is\\ not\\ set/g' sdkconfig ")
+                else:
+                    shell.run_cmd(
+                        "sed -i 's/CONFIG_DISABLE_IPV4=y/#\\ CONFIG_DISABLE_IPV4\\ is\\ not\\ set/g' sdkconfig ")
             else:
-                shell.run_cmd(
-                    "sed -i 's/#\\ CONFIG_DISABLE_IPV4\\ is\\ not\\ set/CONFIG_DISABLE_IPV4=y/g' sdkconfig ")
+                if sys.platform == "darwin":
+                    shell.run_cmd(
+                        "sed -i '' 's/#\\ CONFIG_DISABLE_IPV4\\ is\\ not\\ set/CONFIG_DISABLE_IPV4=y/g' sdkconfig ")
+                else:
+                    shell.run_cmd(
+                        "sed -i 's/#\\ CONFIG_DISABLE_IPV4\\ is\\ not\\ set/CONFIG_DISABLE_IPV4=y/g' sdkconfig ")
+
             shell.run_cmd("idf.py build")
             shell.run_cmd("idf.py build flashing_script")
             shell.run_cmd(

diff --git a/examples/chef/esp32/sdkconfig.defaults b/examples/chef/esp32/sdkconfig.defaults
@@ -62,6 +62,7 @@ CONFIG_MBEDTLS_HKDF_C=y
 
 # IRAM optimizations
 CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y
+CONFIG_RINGBUF_PLACE_FUNCTIONS_INTO_FLASH=y
 
 # Increase LwIP IPv6 address number
 CONFIG_LWIP_IPV6_NUM_ADDRESSES=6
diff --git a/examples/chef/esp32/sdkconfig_rpc.defaults b/examples/chef/esp32/sdkconfig_rpc.defaults
@@ -61,5 +61,6 @@ CONFIG_MBEDTLS_HKDF_C=y
 
 # IRAM optimizations
 CONFIG_FREERTOS_PLACE_FUNCTIONS_INTO_FLASH=y
+CONFIG_RINGBUF_PLACE_FUNCTIONS_INTO_FLASH=y
 
 CONFIG_DIAG_USE_EXTERNAL_LOG_WRAP=y
diff --git a/examples/common/pigweed/rpc_services/BooleanState.h b/examples/common/pigweed/rpc_services/BooleanState.h
@@ -28,7 +28,7 @@
 namespace chip {
 namespace rpc {
 
-class BooleanState final : public pw_rpc::nanopb::BooleanState::Service<BooleanState>
+class BooleanState : public pw_rpc::nanopb::BooleanState::Service<BooleanState>
 {
 public:
     virtual ~BooleanState() = default;

diff --git a/examples/common/pigweed/rpc_services/Locking.h b/examples/common/pigweed/rpc_services/Locking.h
@@ -27,7 +27,7 @@
 namespace chip {
 namespace rpc {
 
-class Locking final : public pw_rpc::nanopb::Locking::Service<Locking>
+class Locking : public pw_rpc::nanopb::Locking::Service<Locking>
 {
 public:
     virtual ~Locking() = default;