fix compilation errors

project-chip · Jul 8, 2024 · 4c42a96 · 4c42a96
1 parent a37f7ac
commit 4c42a96
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 11 deletions.
diff --git a/src/platform/Infineon/CYW30739/CYW30739Config.h b/src/platform/Infineon/CYW30739/CYW30739Config.h
@@ -71,6 +71,8 @@ class CYW30739Config
  static constexpr Key kConfigKey_DACKey = CYW30739ConfigKey(kChipFactory_KeyBase, 0x21);
  static constexpr Key kConfigKey_PAICert = CYW30739ConfigKey(kChipFactory_KeyBase, 0x22);
  static constexpr Key kConfigKey_CertDeclaration = CYW30739ConfigKey(kChipFactory_KeyBase, 0x23);
+ static constexpr Key kConfigKey_SoftwareVersionString = CYW30739ConfigKey(kChipFactory_KeyBase, 0x24);
+
  // CHIP Config Keys
  static constexpr Key kConfigKey_ServiceConfig = CYW30739ConfigKey(kChipConfig_KeyBase, 0x00);
  static constexpr Key kConfigKey_PairedAccountId = CYW30739ConfigKey(kChipConfig_KeyBase, 0x01);

diff --git a/src/platform/Tizen/PosixConfig.cpp b/src/platform/Tizen/PosixConfig.cpp
@@ -71,10 +71,6 @@ const PosixConfig::Key PosixConfig::kConfigKey_ProductName = { kConfig
 const PosixConfig::Key PosixConfig::kConfigKey_HardwareVersionString = { kConfigNamespace_ChipConfig, "hardware-version-string" };
 const PosixConfig::Key PosixConfig::kConfigKey_SoftwareVersionString = { kConfigNamespace_ChipConfig, "software-version-string" };
 
-static const Key kConfigKey_;
-static const Key kConfigKey_;
-static const Key kConfigKey_;
-static const Key kConfigKey_;
 // Keys stored in the Chip-counters namespace
 const PosixConfig::Key PosixConfig::kCounterKey_TotalOperationalHours = { kConfigNamespace_ChipCounters,
  "total-operational-hours" };

diff --git a/src/platform/android/AndroidConfig.cpp b/src/platform/android/AndroidConfig.cpp
@@ -82,6 +82,7 @@ const AndroidConfig::Key AndroidConfig::kConfigKey_Spake2pSalt = { kCo
 const AndroidConfig::Key AndroidConfig::kConfigKey_Spake2pVerifier = { kConfigNamespace_ChipFactory, "verifier" };
 const AndroidConfig::Key AndroidConfig::kConfigKey_DeviceTypeId = { kConfigNamespace_ChipFactory, "device-type-id" };
 const AndroidConfig::Key AndroidConfig::kConfigKey_DeviceName = { kConfigNamespace_ChipFactory, "device-name" };
+const AndroidConfig::Key AndroidConfig::kConfigKey_VendorName = { kConfigNamespace_ChipFactory, "vendor-name" };
 
 // Keys stored in the Chip-config namespace
 const AndroidConfig::Key AndroidConfig::kConfigKey_ServiceConfig = { kConfigNamespace_ChipConfig, "service-config" };

diff --git a/src/platform/android/AndroidConfig.h b/src/platform/android/AndroidConfig.h
@@ -84,6 +84,8 @@ class AndroidConfig
  static const Key kConfigKey_DeviceTypeId;
  static const Key kConfigKey_DeviceName;
 
+ static const Key kConfigKey_VendorName;
+
  static CHIP_ERROR Init();
 
  // Config value accessors.

diff --git a/src/platform/mbed/MbedConfig.cpp b/src/platform/mbed/MbedConfig.cpp
@@ -90,11 +90,6 @@ const MbedConfig::Key MbedConfig::kConfigKey_ProductName = { CONFIG_KE
 const MbedConfig::Key MbedConfig::kConfigKey_HardwareVersionString = { CONFIG_KEY("hardware-version-string") };
 const MbedConfig::Key MbedConfig::kConfigKey_SoftwareVersionString = { CONFIG_KEY("software-version-string") };
 
-static const Key kConfigKey_;
-static const Key kConfigKey_;
-static const Key kConfigKey_;
-static const Key kConfigKey_;
-
 // Keys stored in the Chip-counters namespace
 const MbedConfig::Key MbedConfig::kCounterKey_RebootCount = { COUNTER_KEY("reboot-count") };
 const MbedConfig::Key MbedConfig::kCounterKey_UpTime = { COUNTER_KEY("up-time") };

diff --git a/src/platform/openiotsdk/KVPsaPsStore.cpp b/src/platform/openiotsdk/KVPsaPsStore.cpp
@@ -67,6 +67,11 @@ const KVPsaPsStore::Key KVPsaPsStore::kConfigKey_CountryCode = GetPsaPaKe
 const KVPsaPsStore::Key KVPsaPsStore::kConfigKey_LocationCapability = GetPsaPaKey(kMatterConfig_KeyOffset, 0x08);
 const KVPsaPsStore::Key KVPsaPsStore::kConfigKey_UniqueId = GetPsaPaKey(kMatterConfig_KeyOffset, 0x09);
 
+const KVPsaPsStore::Key KVPsaPsStore::kConfigKey_VendorName = GetPsaPaKey(kMatterConfig_KeyOffset, 0x0A);
+const KVPsaPsStore::Key KVPsaPsStore::kConfigKey_ProductName = GetPsaPaKey(kMatterConfig_KeyOffset, 0x0B);
+const KVPsaPsStore::Key KVPsaPsStore::kConfigKey_HardwareVersionString = GetPsaPaKey(kMatterConfig_KeyOffset, 0x0C);
+const KVPsaPsStore::Key KVPsaPsStore::kConfigKey_SoftwareVersionString = GetPsaPaKey(kMatterConfig_KeyOffset, 0x0D);
+
 // Keys stored in the Matter counters group
 const KVPsaPsStore::Key KVPsaPsStore::kCounterKey_RebootCount = GetPsaPaKey(kMatterCounter_KeyOffset, 0x00);
 const KVPsaPsStore::Key KVPsaPsStore::kCounterKey_UpTime = GetPsaPaKey(kMatterCounter_KeyOffset, 0x01);

diff --git a/src/platform/tests/TestConfigurationMgr.cpp b/src/platform/tests/TestConfigurationMgr.cpp
@@ -99,8 +99,8 @@ TEST_F(TestConfigurationMgr, SerialNumber)
  err = GetDeviceInstanceInfoProvider()->GetSerialNumber(buf, 64);
  EXPECT_EQ(err, CHIP_NO_ERROR);
 
- EXPECT_EQ(strlen(buf), 5u);
- EXPECT_STREQ(buf, "89051");
+ EXPECT_EQ(strlen(buf), 7u);
+ EXPECT_STREQ(buf, "AAZZ236");
 }
 
 TEST_F(TestConfigurationMgr, UniqueId)