Fix CD, move certs and build

cecille · Oct 24, 2024 · 0354319 · 0354319
1 parent e4f7ea7
commit 0354319
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 22 deletions.
diff --git a/examples/valve/silabs/BUILD.gn b/examples/valve/silabs/BUILD.gn
@@ -136,10 +136,13 @@ silabs_executable("drink-machine") {
 
   sources = [
     "${examples_common_plat_dir}/main.cpp",
+    "include/DrinkMachineCommon.h",
     "include/DrinksMachineDeviceDriver.h",
     "src/AppTask.cpp",
     "src/DrinksMachineDeviceDriver.cpp",
     "src/ZclCallbacks.cpp",
+    "src/dm_dac.cpp",
+    "src/dm_pai.cpp",
   ]
 
   deps = [

diff --git a/examples/valve/silabs/include/AppTask.h b/examples/valve/silabs/include/AppTask.h
@@ -33,8 +33,8 @@
 #include <lib/core/CHIPError.h>
 #include <platform/CHIPDeviceLayer.h>
 
-#include "DrinksMachineDeviceDriver.h"
 #include "DrinkMachineCommon.h"
+#include "DrinksMachineDeviceDriver.h"
 
 /**********************************************************
  * Defines

diff --git a/examples/valve/silabs/include/DrinkMachineCommon.h b/examples/valve/silabs/include/DrinkMachineCommon.h
@@ -156,26 +156,18 @@ class DrinkMachineCredentialsProvider : public chip::Credentials::DeviceAttestat
         // credentials/test/certification-declaration/Chip-Test-CD-Signing-Key.pem --out cd.bin -f 1 -V 6006 -p B002 -d 000E -c
         // "ZIG0000000000000000" -l 0 -i 0 -n 0001 -t 0
         const uint8_t kCdContents[] = {
-            0x30, 0x3c, 0x38, 0x31, 0x3e, 0xe7, 0x5e, 0x46, 0x20, 0x20, 0x2a, 0x3c, 0x38, 0x36, 0x3e, 0x48, 0x3c, 0x38, 0x36, 0x3e,
-            0xf7, 0x5e, 0x4d, 0x5e, 0x41, 0x5e, 0x47, 0x5e, 0x42, 0xa0, 0x3c, 0x38, 0x31, 0x3e, 0xd9, 0x30, 0x3c, 0x38, 0x31, 0x3e,
-            0xd6, 0x5e, 0x42, 0x5e, 0x41, 0x5e, 0x43, 0x31, 0x5e, 0x4d, 0x30, 0x5e, 0x4b, 0x5e, 0x46, 0x20, 0x60, 0x3c, 0x38, 0x36,
-            0x3e, 0x48, 0x5e, 0x41, 0x65, 0x5e, 0x43, 0x5e, 0x44, 0x5e, 0x42, 0x5e, 0x41, 0x30, 0x43, 0x5e, 0x46, 0x20, 0x2a, 0x3c,
-            0x38, 0x36, 0x3e, 0x48, 0x3c, 0x38, 0x36, 0x3e, 0xf7, 0x5e, 0x4d, 0x5e, 0x41, 0x5e, 0x47, 0x5e, 0x41, 0xa0, 0x36, 0x5e,
-            0x44, 0x34, 0x5e, 0x55, 0x24, 0x5e, 0x40, 0x5e, 0x41, 0x25, 0x5e, 0x41, 0x5e, 0x46, 0x60, 0x36, 0x5e, 0x42, 0x5e, 0x45,
-            0x5e, 0x42, 0xb0, 0x5e, 0x58, 0x24, 0x5e, 0x43, 0x5e, 0x4e, 0x2c, 0x5e, 0x44, 0x5e, 0x53, 0x5a, 0x49, 0x47, 0x30, 0x30,
-            0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x24, 0x5e, 0x45, 0x5e, 0x40, 0x24,
-            0x5e, 0x46, 0x5e, 0x40, 0x24, 0x5e, 0x47, 0x5e, 0x41, 0x24, 0x5e, 0x48, 0x5e, 0x40, 0x5e, 0x58, 0x31, 0x7d, 0x30, 0x7b,
-            0x5e, 0x42, 0x5e, 0x41, 0x5e, 0x43, 0x3c, 0x38, 0x30, 0x3e, 0x5e, 0x54, 0x62, 0xfa, 0x3c, 0x38, 0x32, 0x3e, 0x33, 0x59,
-            0xac, 0xfa, 0xa9, 0x3c, 0x39, 0x36, 0x3e, 0x3e, 0x5e, 0x5c, 0xfa, 0x5e, 0x54, 0x0a, 0xdd, 0xf5, 0x5e, 0x44, 0xf3, 0x71,
-            0x60, 0x30, 0x5e, 0x4b, 0x5e, 0x46, 0x20, 0x20, 0x60, 0x3c, 0x38, 0x36, 0x3e, 0x48, 0x5e, 0x41, 0x65, 0x5e, 0x43, 0x5e,
-            0x44, 0x5e, 0x42, 0x5e, 0x41, 0x30, 0x0a, 0x5e, 0x46, 0x5e, 0x48, 0x2a, 0x3c, 0x38, 0x36, 0x3e, 0x48, 0xce, 0x3d, 0x5e,
-            0x44, 0x5e, 0x43, 0x5e, 0x42, 0x5e, 0x44, 0x47, 0x30, 0x45, 0x5e, 0x42, 0x21, 0x5e, 0x40, 0xa9, 0x5e, 0x51, 0x5e, 0x41,
-            0x5e, 0x45, 0x3c, 0x39, 0x38, 0x3e, 0x47, 0x3c, 0x38, 0x38, 0x3e, 0xcf, 0xd3, 0x29, 0xbf, 0xdf, 0x2e, 0x61, 0xb1, 0x3c,
-            0x38, 0x30, 0x3e, 0xca, 0xdd, 0x3c, 0x38, 0x33, 0x3e, 0x5c, 0xb6, 0xbb, 0x43, 0x3c, 0x39, 0x34, 0x3e, 0x3c, 0x39, 0x37,
-            0x3e, 0x45, 0x36, 0xe3, 0x30, 0x5c, 0x67, 0xf6, 0x5e, 0x42, 0x20, 0x36, 0x3c, 0x38, 0x61, 0x3e, 0x3c, 0x39, 0x33, 0x3e,
-            0x51, 0x65, 0x5e, 0x59, 0x5e, 0x45, 0x3c, 0x38, 0x62, 0x3e, 0x5e, 0x5e, 0x7e, 0x5f, 0x5e, 0x44, 0x5e, 0x4d, 0x7e, 0x6a,
-            0x77, 0xc7, 0xd2, 0x5e, 0x43, 0xdf, 0xd7, 0x2e, 0x2b, 0x3c, 0x39, 0x66, 0x3e, 0xec, 0xed, 0x33, 0xc9, 0x31, 0x51, 0x5e,
-            0x4c, 0xa7
+            0x30, 0x81, 0xe8, 0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x02, 0xa0, 0x81, 0xda, 0x30, 0x81, 0xd7,
+            0x02, 0x01, 0x03, 0x31, 0x0d, 0x30, 0x0b, 0x06, 0x09, 0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x30, 0x43,
+            0x06, 0x09, 0x2a, 0x86, 0x48, 0x86, 0xf7, 0x0d, 0x01, 0x07, 0x01, 0xa0, 0x36, 0x04, 0x34, 0x15, 0x24, 0x00, 0x01, 0x25,
+            0x01, 0x06, 0x60, 0x36, 0x02, 0x05, 0x02, 0xb0, 0x18, 0x24, 0x03, 0x42, 0x2c, 0x04, 0x13, 0x5a, 0x49, 0x47, 0x30, 0x30,
+            0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x30, 0x24, 0x05, 0x00, 0x24, 0x06, 0x00,
+            0x24, 0x07, 0x01, 0x24, 0x08, 0x00, 0x18, 0x31, 0x7e, 0x30, 0x7c, 0x02, 0x01, 0x03, 0x80, 0x14, 0x62, 0xfa, 0x82, 0x33,
+            0x59, 0xac, 0xfa, 0xa9, 0x96, 0x3e, 0x1c, 0xfa, 0x14, 0x0a, 0xdd, 0xf5, 0x04, 0xf3, 0x71, 0x60, 0x30, 0x0b, 0x06, 0x09,
+            0x60, 0x86, 0x48, 0x01, 0x65, 0x03, 0x04, 0x02, 0x01, 0x30, 0x0a, 0x06, 0x08, 0x2a, 0x86, 0x48, 0xce, 0x3d, 0x04, 0x03,
+            0x02, 0x04, 0x48, 0x30, 0x46, 0x02, 0x21, 0x00, 0x95, 0x30, 0x0b, 0xbb, 0x98, 0x6f, 0xf7, 0x8f, 0xa5, 0x72, 0xd3, 0x82,
+            0x5c, 0x56, 0x51, 0x2a, 0xf6, 0x5b, 0xee, 0x2f, 0x0b, 0x12, 0x1e, 0x3d, 0x35, 0x6d, 0x01, 0xa2, 0xeb, 0x02, 0xce, 0x1b,
+            0x02, 0x21, 0x00, 0xd9, 0x8e, 0x6e, 0xc7, 0x2b, 0xb9, 0xf7, 0x84, 0x17, 0x3d, 0xe9, 0xf7, 0x47, 0x69, 0xe6, 0x70, 0x59,
+            0xbd, 0xf5, 0x5e, 0xbe, 0xe3, 0x9f, 0xf9, 0x4f, 0x69, 0x4e, 0x7a, 0x61, 0x61, 0xdb, 0x5b
         };
         return chip::CopySpanToMutableSpan(chip::ByteSpan{ kCdContents }, out_cd_buffer);
     }

diff --git a/examples/valve/silabs/src/AppTask.cpp b/examples/valve/silabs/src/AppTask.cpp
@@ -185,6 +185,7 @@ CHIP_ERROR AppTask::Init()
         SILABS_LOG("BaseApplication::Init() failed");
         appError(err);
     }
+    google::matter::DrinkMachineMatterProviders::GetInstance().Init();
 
     return err;
 }
@@ -199,7 +200,7 @@ void AppTask::AppTaskMain(void * pvParameter)
     AppEvent event;
 
     osMessageQueueId_t sAppEventQueue = *(static_cast<osMessageQueueId_t *>(pvParameter));
-    chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(ButtonEventHandler);
+    chip::DeviceLayer::Silabs::GetPlatform().SetButtonsCb(AppTask::ButtonEventHandler);
 
     CHIP_ERROR err = sAppTask.Init();
     if (err != CHIP_NO_ERROR)

diff --git a/examples/valve/silabs/include/dm_dac.cpp → examples/valve/silabs/src/dm_dac.cpp b/examples/valve/silabs/include/dm_dac.cpp → examples/valve/silabs/src/dm_dac.cpp
diff --git a/examples/valve/silabs/include/dm_pai.cpp → examples/valve/silabs/src/dm_pai.cpp b/examples/valve/silabs/include/dm_pai.cpp → examples/valve/silabs/src/dm_pai.cpp