add the new config params to different platforms

project-chip · Jul 8, 2024 · a37f7ac · a37f7ac
1 parent 7c72d86
commit a37f7ac
Show file tree

Hide file tree

Showing 19 changed files with 112 additions and 4 deletions.
diff --git a/src/platform/ASR/ASRConfig.cpp b/src/platform/ASR/ASRConfig.cpp
@@ -80,6 +80,11 @@ const ASRConfig::Key ASRConfig::kConfigKey_WiFiSecurity = { kConfigNamespa
 const ASRConfig::Key ASRConfig::kConfigKey_WiFiMode = { kConfigNamespace_ChipConfig, "wifimode" };
 const ASRConfig::Key ASRConfig::kConfigKey_UniqueId = { kConfigNamespace_ChipConfig, "unique-id" };
 
+const ASRConfig::Key ASRConfig::kConfigKey_VendorName = { kConfigNamespace_ChipConfig, "vendor-name" };
+const ASRConfig::Key ASRConfig::kConfigKey_ProductName = { kConfigNamespace_ChipConfig, "product-name" };
+const ASRConfig::Key ASRConfig::kConfigKey_HardwareVersionString = { kConfigNamespace_ChipConfig, "hardware-version-string" };
+const ASRConfig::Key ASRConfig::kConfigKey_SoftwareVersionString = { kConfigNamespace_ChipConfig, "software-version-string" };
+
 // Keys stored in the Chip-counters namespace
 const ASRConfig::Key ASRConfig::kCounterKey_RebootCount = { kConfigNamespace_ChipCounters, "reboot-count" };
 const ASRConfig::Key ASRConfig::kCounterKey_UpTime = { kConfigNamespace_ChipCounters, "up-time" };

diff --git a/src/platform/Ameba/AmebaConfig.cpp b/src/platform/Ameba/AmebaConfig.cpp
@@ -79,6 +79,11 @@ const AmebaConfig::Key AmebaConfig::kConfigKey_RegulatoryLocation = { k
 const AmebaConfig::Key AmebaConfig::kConfigKey_LocationCapability = { kConfigNamespace_ChipConfig, "location-capability" };
 const AmebaConfig::Key AmebaConfig::kConfigKey_CountryCode = { kConfigNamespace_ChipConfig, "country-code" };
 
+const AmebaConfig::Key AmebaConfig::kConfigKey_VendorName = { kConfigNamespace_ChipConfig, "vendor-name" };
+const AmebaConfig::Key AmebaConfig::kConfigKey_ProductName = { kConfigNamespace_ChipConfig, "product-name" };
+const AmebaConfig::Key AmebaConfig::kConfigKey_HardwareVersionString = { kConfigNamespace_ChipConfig, "hardware-version-string" };
+const AmebaConfig::Key AmebaConfig::kConfigKey_SoftwareVersionString = { kConfigNamespace_ChipConfig, "software-version-string" };
+
 // Keys stored in the Chip-counters namespace
 const AmebaConfig::Key AmebaConfig::kCounterKey_RebootCount = { kConfigNamespace_ChipCounters, "reboot-count" };
 const AmebaConfig::Key AmebaConfig::kCounterKey_UpTime = { kConfigNamespace_ChipCounters, "up-time" };

diff --git a/src/platform/Beken/BekenConfig.cpp b/src/platform/Beken/BekenConfig.cpp
@@ -79,6 +79,11 @@ const BekenConfig::Key BekenConfig::kConfigKey_RegulatoryLocation = { k
 const BekenConfig::Key BekenConfig::kConfigKey_CountryCode = { kConfigNamespace_ChipConfig, "country-code" };
 const BekenConfig::Key BekenConfig::kConfigKey_Breadcrumb = { kConfigNamespace_ChipConfig, "breadcrumb" };
 
+const BekenConfig::Key BekenConfig::kConfigKey_VendorName = { kConfigNamespace_ChipConfig, "vendor-name" };
+const BekenConfig::Key BekenConfig::kConfigKey_ProductName = { kConfigNamespace_ChipConfig, "product-name" };
+const BekenConfig::Key BekenConfig::kConfigKey_HardwareVersionString = { kConfigNamespace_ChipConfig, "hardware-version-string" };
+const BekenConfig::Key BekenConfig::kConfigKey_SoftwareVersionString = { kConfigNamespace_ChipConfig, "software-version-string" };
+
 // Keys stored in the Chip-counters namespace
 const BekenConfig::Key BekenConfig::kCounterKey_RebootCount = { kConfigNamespace_ChipCounters, "reboot-count" };
 const BekenConfig::Key BekenConfig::kCounterKey_UpTime = { kConfigNamespace_ChipCounters, "up-time" };

diff --git a/src/platform/ESP32/ESP32Config.cpp b/src/platform/ESP32/ESP32Config.cpp
@@ -97,6 +97,8 @@ const ESP32Config::Key ESP32Config::kConfigKey_WeekDaySchedules = { kConfigNam
 const ESP32Config::Key ESP32Config::kConfigKey_YearDaySchedules = { kConfigNamespace_ChipConfig, "year-day-sched" };
 const ESP32Config::Key ESP32Config::kConfigKey_HolidaySchedules = { kConfigNamespace_ChipConfig, "holiday-sched" };
 
+const ESP32Config::Key ESP32Config::kConfigKey_SoftwareVersionString = { kConfigNamespace_ChipConfig, "sw-ver-str" };
+
 // Keys stored in the Chip-counters namespace
 const ESP32Config::Key ESP32Config::kCounterKey_RebootCount = { kConfigNamespace_ChipCounters, "reboot-count" };
 const ESP32Config::Key ESP32Config::kCounterKey_UpTime = { kConfigNamespace_ChipCounters, "up-time" };

diff --git a/src/platform/ESP32/ESP32Config.h b/src/platform/ESP32/ESP32Config.h
@@ -99,6 +99,8 @@ class ESP32Config
  static const Key kConfigKey_YearDaySchedules;
  static const Key kConfigKey_HolidaySchedules;
 
+ static const Key kConfigKey_SoftwareVersionString;
+
  // CHIP Counter keys
  static const Key kCounterKey_RebootCount;
  static const Key kCounterKey_UpTime;

diff --git a/src/platform/Infineon/PSOC6/P6Config.cpp b/src/platform/Infineon/PSOC6/P6Config.cpp
@@ -88,6 +88,15 @@ const P6Config::Key P6Config::kConfigKey_YearDaySchedules = { kConfigNamespace_C
 const P6Config::Key P6Config::kConfigKey_HolidaySchedules = { kConfigNamespace_ChipConfig, "holiday-schedules" };
 ;
 
+const P6Config::Key P6Config::kConfigKey_VendorName = { kConfigNamespace_ChipConfig, "vendor-name" };
+;
+const P6Config::Key P6Config::kConfigKey_ProductName = { kConfigNamespace_ChipConfig, "product-name" };
+;
+const P6Config::Key P6Config::kConfigKey_HardwareVersionString = { kConfigNamespace_ChipConfig, "hardware-version-string" };
+;
+const P6Config::Key P6Config::kConfigKey_SoftwareVersionString = { kConfigNamespace_ChipConfig, "software-version-string" };
+;
+
 // Keys stored in the Chip-counters namespace
 const P6Config::Key P6Config::kCounterKey_RebootCount = { kConfigNamespace_ChipCounters, "reboot-count" };
 const P6Config::Key P6Config::kCounterKey_UpTime = { kConfigNamespace_ChipCounters, "up-time" };

diff --git a/src/platform/NuttX/PosixConfig.cpp b/src/platform/NuttX/PosixConfig.cpp
@@ -74,6 +74,11 @@ const PosixConfig::Key PosixConfig::kConfigKey_CountryCode = { kConfigNam
 const PosixConfig::Key PosixConfig::kConfigKey_LocationCapability = { kConfigNamespace_ChipConfig, "location-capability" };
 const PosixConfig::Key PosixConfig::kConfigKey_UniqueId = { kConfigNamespace_ChipFactory, "unique-id" };
 
+const PosixConfig::Key PosixConfig::kConfigKey_VendorName = { kConfigNamespace_ChipFactory, "vendor-name" };
+const PosixConfig::Key PosixConfig::kConfigKey_ProductName = { kConfigNamespace_ChipFactory, "product-name" };
+const PosixConfig::Key PosixConfig::kConfigKey_HardwareVersionString = { kConfigNamespace_ChipFactory, "hardware-version-string" };
+const PosixConfig::Key PosixConfig::kConfigKey_SoftwareVersionString = { kConfigNamespace_ChipFactory, "software-version-string" };
+
 // Keys stored in the Chip-counters namespace
 const PosixConfig::Key PosixConfig::kCounterKey_RebootCount = { kConfigNamespace_ChipCounters, "reboot-count" };
 const PosixConfig::Key PosixConfig::kCounterKey_UpTime = { kConfigNamespace_ChipCounters, "up-time" };

diff --git a/src/platform/NuttX/PosixConfig.h b/src/platform/NuttX/PosixConfig.h
@@ -78,6 +78,11 @@ class PosixConfig
  static const Key kConfigKey_VendorId;
  static const Key kConfigKey_ProductId;
 
+ static const Key kConfigKey_VendorName;
+ static const Key kConfigKey_ProductName;
+ static const Key kConfigKey_HardwareVersionString;
+ static const Key kConfigKey_SoftwareVersionString;
+
  static const Key kCounterKey_RebootCount;
  static const Key kCounterKey_UpTime;
  static const Key kCounterKey_TotalOperationalHours;

diff --git a/src/platform/Tizen/PosixConfig.cpp b/src/platform/Tizen/PosixConfig.cpp
@@ -66,6 +66,15 @@ const PosixConfig::Key PosixConfig::kConfigKey_RegulatoryLocation = { kConfigNam
 const PosixConfig::Key PosixConfig::kConfigKey_CountryCode = { kConfigNamespace_ChipConfig, "country-code" };
 const PosixConfig::Key PosixConfig::kConfigKey_UniqueId = { kConfigNamespace_ChipConfig, "unique-id" };
 
+const PosixConfig::Key PosixConfig::kConfigKey_VendorName = { kConfigNamespace_ChipConfig, "vendor-name" };
+const PosixConfig::Key PosixConfig::kConfigKey_ProductName = { kConfigNamespace_ChipConfig, "product-name" };
+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/Tizen/PosixConfig.h b/src/platform/Tizen/PosixConfig.h
@@ -75,6 +75,11 @@ class PosixConfig
  static const Key kConfigKey_VendorId;
  static const Key kConfigKey_ProductId;
 
+ static const Key kConfigKey_VendorName;
+ static const Key kConfigKey_ProductName;
+ static const Key kConfigKey_HardwareVersionString;
+ static const Key kConfigKey_SoftwareVersionString;
+
  static const Key kCounterKey_TotalOperationalHours;
  static const Key kCounterKey_BootReason;
 

diff --git a/src/platform/bouffalolab/common/BLConfig.h b/src/platform/bouffalolab/common/BLConfig.h
@@ -77,10 +77,10 @@ class BLConfig
 
  static constexpr char kBLKey_factoryResetFlag[] = ("__factory_reset_pending");
 
- static const Key kConfigKey_VendorName;
- static const Key kConfigKey_ProductName;
- static const Key kConfigKey_HardwareVersionString;
- static const Key kConfigKey_SoftwareVersionString;
+ static constexpr char kConfigKey_VendorName[] = ("vendor-name");
+ static constexpr char kConfigKey_ProductName[] = ("product-name");
+ static constexpr char kConfigKey_HardwareVersionString[] = ("hardware-version-string");
+ static constexpr char kConfigKey_SoftwareVersionString[] = ("software-version-string");
 
  static void Init(void);
 

diff --git a/src/platform/cc13xx_26xx/CC13XX_26XXConfig.cpp b/src/platform/cc13xx_26xx/CC13XX_26XXConfig.cpp
@@ -123,6 +123,18 @@ const CC13XX_26XXConfig::Key CC13XX_26XXConfig::kConfigKey_UniqueId = {
  { .systemID = kCC13XX_26XXMatter_SysID, .itemID = kCC13XX_26XXMatter_ItemID_ChipConfig, .subID = 0x0001d }
 };
 
+const CC13XX_26XXConfig::Key CC13XX_26XXConfig::kConfigKey_VendorName = {
+ { .systemID = kCC13XX_26XXMatter_SysID, .itemID = kCC13XX_26XXMatter_ItemID_ChipConfig, .subID = 0x0001e }
+};
+const CC13XX_26XXConfig::Key CC13XX_26XXConfig::kConfigKey_ProductName = {
+ { .systemID = kCC13XX_26XXMatter_SysID, .itemID = kCC13XX_26XXMatter_ItemID_ChipConfig, .subID = 0x0001f }
+};
+const CC13XX_26XXConfig::Key CC13XX_26XXConfig::kConfigKey_HardwareVersionString = {
+ { .systemID = kCC13XX_26XXMatter_SysID, .itemID = kCC13XX_26XXMatter_ItemID_ChipConfig, .subID = 0x00020 }
+};
+const CC13XX_26XXConfig::Key CC13XX_26XXConfig::kConfigKey_SoftwareVersionString = {
+ { .systemID = kCC13XX_26XXMatter_SysID, .itemID = kCC13XX_26XXMatter_ItemID_ChipConfig, .subID = 0x00021 }
+};
 /* Internal for the KVS interface. */
 const CC13XX_26XXConfig::Key CC13XX_26XXConfig::kConfigKey_KVS_key = { { .systemID = kCC13XX_26XXMatter_SysID,
  .itemID = kCC13XX_26XXMatter_ItemID_ChipKVS_key } };

diff --git a/src/platform/cc32xx/CC32XXConfig.cpp b/src/platform/cc32xx/CC32XXConfig.cpp
@@ -318,6 +318,11 @@ const CC32XXConfig::Key CC32XXConfig::kConfigKey_Spake2pIterationCount = { "TI_k
 const CC32XXConfig::Key CC32XXConfig::kConfigKey_Spake2pSalt = { "TI_kConfigKey_Spake2pSalt" };
 const CC32XXConfig::Key CC32XXConfig::kConfigKey_Spake2pVerifier = { "TI_kConfigKey_Spake2pVerifier" };
 
+const CC32XXConfig::Key CC32XXConfig::kConfigKey_VendorName = { "TI_kConfigKey_VendorName" };
+const CC32XXConfig::Key CC32XXConfig::kConfigKey_ProductName = { "TI_kConfigKey_ProductName" };
+const CC32XXConfig::Key CC32XXConfig::kConfigKey_HardwareVersionString = { "TI_kConfigKey_HardwareVersionString" };
+const CC32XXConfig::Key CC32XXConfig::kConfigKey_SoftwareVersionString = { "TI_kConfigKey_SoftwareVersionString" };
+
 CC32XXKVSList * pList;
 
 CHIP_ERROR CC32XXConfig::Init()

diff --git a/src/platform/mbed/MbedConfig.cpp b/src/platform/mbed/MbedConfig.cpp
@@ -85,6 +85,16 @@ const MbedConfig::Key MbedConfig::kConfigKey_RegulatoryLocation = { CONFIG_KEY("
 const MbedConfig::Key MbedConfig::kConfigKey_CountryCode = { CONFIG_KEY("country-code") };
 const MbedConfig::Key MbedConfig::kConfigKey_UniqueId = { CONFIG_KEY("unique-id") };
 
+const MbedConfig::Key MbedConfig::kConfigKey_VendorName = { CONFIG_KEY("vendor-name") };
+const MbedConfig::Key MbedConfig::kConfigKey_ProductName = { CONFIG_KEY("product-name") };
+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/mt793x/MT793XConfig.cpp b/src/platform/mt793x/MT793XConfig.cpp
@@ -100,6 +100,14 @@ const MT793XConfig::Key MT793XConfig::kConfigKey_YearDaySchedules = { .Namespace
  .Name = "yearday-sched" };
 const MT793XConfig::Key MT793XConfig::kConfigKey_HolidaySchedules = { .Namespace = kConfigNamespace_ChipConfig,
  .Name = "holiday-sched" };
+
+const MT793XConfig::Key MT793XConfig::kConfigKey_VendorName = { .Namespace = kConfigNamespace_ChipConfig, .Name = "vendor-name" };
+const MT793XConfig::Key MT793XConfig::kConfigKey_ProductName = { .Namespace = kConfigNamespace_ChipConfig, .Name = "product-name" };
+const MT793XConfig::Key MT793XConfig::kConfigKey_HardwareVersionString = { .Namespace = kConfigNamespace_ChipConfig,
+ .Name = "hardware-version-string" };
+const MT793XConfig::Key MT793XConfig::kConfigKey_SoftwareVersionString = { .Namespace = kConfigNamespace_ChipConfig,
+ .Name = "software-version-string" };
+
 // CHIP Counter Keys
 const MT793XConfig::Key MT793XConfig::kConfigKey_BootCount = { .Namespace = kConfigNamespace_ChipCounters, .Name = "boot-count" };
 const MT793XConfig::Key MT793XConfig::kConfigKey_TotalOperationalHours = { .Namespace = kConfigNamespace_ChipCounters,

diff --git a/src/platform/mt793x/MT793XConfig.h b/src/platform/mt793x/MT793XConfig.h
@@ -101,6 +101,11 @@ class MT793XConfig
  static const Key kConfigKey_WeekDaySchedules;
  static const Key kConfigKey_YearDaySchedules;
  static const Key kConfigKey_HolidaySchedules;
+
+ static const Key kConfigKey_VendorName;
+ static const Key kConfigKey_ProductName;
+ static const Key kConfigKey_HardwareVersionString;
+ static const Key kConfigKey_SoftwareVersionString;
  // CHIP Counter Keys
  static const Key kConfigKey_BootCount;
  static const Key kConfigKey_TotalOperationalHours;

diff --git a/src/platform/stm32/STM32Config.h b/src/platform/stm32/STM32Config.h
@@ -67,6 +67,12 @@ class STM32Config
  static constexpr Key kConfigKey_Breadcrumb = 22;
  static constexpr Key kConfigKey_UniqueId = 23;
  static constexpr Key kConfigKey_ProductRevision = 24;
+
+ static constexpr Key kConfigKey_VendorName = 25;
+ static constexpr Key kConfigKey_ProductName = 26;
+ static constexpr Key kConfigKey_HardwareVersionString = 27;
+ static constexpr Key kConfigKey_SoftwareVersionString = 28;
+
  // Set key id limits for each group.
  static constexpr Key kConfigKey_Base = kConfigKey_SerialNum;
  static constexpr Key kConfigKey_Max = kConfigKey_UniqueId;

diff --git a/src/platform/webos/PosixConfig.cpp b/src/platform/webos/PosixConfig.cpp
@@ -78,6 +78,11 @@ const PosixConfig::Key PosixConfig::kConfigKey_Breadcrumb = { kConfigNam
 const PosixConfig::Key PosixConfig::kConfigKey_LocationCapability = { kConfigNamespace_ChipConfig, "location-capability" };
 const PosixConfig::Key PosixConfig::kConfigKey_UniqueId = { kConfigNamespace_ChipFactory, "unique-id" };
 
+const PosixConfig::Key PosixConfig::kConfigKey_VendorName = { kConfigNamespace_ChipFactory, "vendor-name" };
+const PosixConfig::Key PosixConfig::kConfigKey_ProductName = { kConfigNamespace_ChipFactory, "product-name" };
+const PosixConfig::Key PosixConfig::kConfigKey_HardwareVersionString = { kConfigNamespace_ChipFactory, "hardware-version-string" };
+const PosixConfig::Key PosixConfig::kConfigKey_SoftwareVersionString = { kConfigNamespace_ChipFactory, "software-version-string" };
+
 // Keys stored in the Chip-counters namespace
 const PosixConfig::Key PosixConfig::kCounterKey_RebootCount = { kConfigNamespace_ChipCounters, "reboot-count" };
 const PosixConfig::Key PosixConfig::kCounterKey_UpTime = { kConfigNamespace_ChipCounters, "up-time" };

diff --git a/src/platform/webos/PosixConfig.h b/src/platform/webos/PosixConfig.h
@@ -82,6 +82,11 @@ class PosixConfig
  static const Key kConfigKey_VendorId;
  static const Key kConfigKey_ProductId;
 
+ static const Key kConfigKey_VendorName;
+ static const Key kConfigKey_ProductName;
+ static const Key kConfigKey_HardwareVersionString;
+ static const Key kConfigKey_SoftwareVersionString;
+
  static const Key kCounterKey_RebootCount;
  static const Key kCounterKey_UpTime;
  static const Key kCounterKey_TotalOperationalHours;