Skip to content

Commit a37f7ac

Browse files
author
chaitanya jandhyala
committed
add the new config params to different platforms
1 parent 7c72d86 commit a37f7ac

19 files changed

+112
-4
lines changed

‎src/platform/ASR/ASRConfig.cpp

+5
Original file line numberDiff line numberDiff line change
@@ -80,6 +80,11 @@ const ASRConfig::Key ASRConfig::kConfigKey_WiFiSecurity = { kConfigNamespa
8080
const ASRConfig::Key ASRConfig::kConfigKey_WiFiMode = { kConfigNamespace_ChipConfig, "wifimode" };
8181
const ASRConfig::Key ASRConfig::kConfigKey_UniqueId = { kConfigNamespace_ChipConfig, "unique-id" };
8282

83+
const ASRConfig::Key ASRConfig::kConfigKey_VendorName = { kConfigNamespace_ChipConfig, "vendor-name" };
84+
const ASRConfig::Key ASRConfig::kConfigKey_ProductName = { kConfigNamespace_ChipConfig, "product-name" };
85+
const ASRConfig::Key ASRConfig::kConfigKey_HardwareVersionString = { kConfigNamespace_ChipConfig, "hardware-version-string" };
86+
const ASRConfig::Key ASRConfig::kConfigKey_SoftwareVersionString = { kConfigNamespace_ChipConfig, "software-version-string" };
87+
8388
// Keys stored in the Chip-counters namespace
8489
const ASRConfig::Key ASRConfig::kCounterKey_RebootCount = { kConfigNamespace_ChipCounters, "reboot-count" };
8590
const ASRConfig::Key ASRConfig::kCounterKey_UpTime = { kConfigNamespace_ChipCounters, "up-time" };

‎src/platform/Ameba/AmebaConfig.cpp

+5
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,11 @@ const AmebaConfig::Key AmebaConfig::kConfigKey_RegulatoryLocation = { k
7979
const AmebaConfig::Key AmebaConfig::kConfigKey_LocationCapability = { kConfigNamespace_ChipConfig, "location-capability" };
8080
const AmebaConfig::Key AmebaConfig::kConfigKey_CountryCode = { kConfigNamespace_ChipConfig, "country-code" };
8181

82+
const AmebaConfig::Key AmebaConfig::kConfigKey_VendorName = { kConfigNamespace_ChipConfig, "vendor-name" };
83+
const AmebaConfig::Key AmebaConfig::kConfigKey_ProductName = { kConfigNamespace_ChipConfig, "product-name" };
84+
const AmebaConfig::Key AmebaConfig::kConfigKey_HardwareVersionString = { kConfigNamespace_ChipConfig, "hardware-version-string" };
85+
const AmebaConfig::Key AmebaConfig::kConfigKey_SoftwareVersionString = { kConfigNamespace_ChipConfig, "software-version-string" };
86+
8287
// Keys stored in the Chip-counters namespace
8388
const AmebaConfig::Key AmebaConfig::kCounterKey_RebootCount = { kConfigNamespace_ChipCounters, "reboot-count" };
8489
const AmebaConfig::Key AmebaConfig::kCounterKey_UpTime = { kConfigNamespace_ChipCounters, "up-time" };

‎src/platform/Beken/BekenConfig.cpp

+5
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,11 @@ const BekenConfig::Key BekenConfig::kConfigKey_RegulatoryLocation = { k
7979
const BekenConfig::Key BekenConfig::kConfigKey_CountryCode = { kConfigNamespace_ChipConfig, "country-code" };
8080
const BekenConfig::Key BekenConfig::kConfigKey_Breadcrumb = { kConfigNamespace_ChipConfig, "breadcrumb" };
8181

82+
const BekenConfig::Key BekenConfig::kConfigKey_VendorName = { kConfigNamespace_ChipConfig, "vendor-name" };
83+
const BekenConfig::Key BekenConfig::kConfigKey_ProductName = { kConfigNamespace_ChipConfig, "product-name" };
84+
const BekenConfig::Key BekenConfig::kConfigKey_HardwareVersionString = { kConfigNamespace_ChipConfig, "hardware-version-string" };
85+
const BekenConfig::Key BekenConfig::kConfigKey_SoftwareVersionString = { kConfigNamespace_ChipConfig, "software-version-string" };
86+
8287
// Keys stored in the Chip-counters namespace
8388
const BekenConfig::Key BekenConfig::kCounterKey_RebootCount = { kConfigNamespace_ChipCounters, "reboot-count" };
8489
const BekenConfig::Key BekenConfig::kCounterKey_UpTime = { kConfigNamespace_ChipCounters, "up-time" };

‎src/platform/ESP32/ESP32Config.cpp

+2
Original file line numberDiff line numberDiff line change
@@ -97,6 +97,8 @@ const ESP32Config::Key ESP32Config::kConfigKey_WeekDaySchedules = { kConfigNam
9797
const ESP32Config::Key ESP32Config::kConfigKey_YearDaySchedules = { kConfigNamespace_ChipConfig, "year-day-sched" };
9898
const ESP32Config::Key ESP32Config::kConfigKey_HolidaySchedules = { kConfigNamespace_ChipConfig, "holiday-sched" };
9999

100+
const ESP32Config::Key ESP32Config::kConfigKey_SoftwareVersionString = { kConfigNamespace_ChipConfig, "sw-ver-str" };
101+
100102
// Keys stored in the Chip-counters namespace
101103
const ESP32Config::Key ESP32Config::kCounterKey_RebootCount = { kConfigNamespace_ChipCounters, "reboot-count" };
102104
const ESP32Config::Key ESP32Config::kCounterKey_UpTime = { kConfigNamespace_ChipCounters, "up-time" };

‎src/platform/ESP32/ESP32Config.h

+2
Original file line numberDiff line numberDiff line change
@@ -99,6 +99,8 @@ class ESP32Config
9999
static const Key kConfigKey_YearDaySchedules;
100100
static const Key kConfigKey_HolidaySchedules;
101101

102+
static const Key kConfigKey_SoftwareVersionString;
103+
102104
// CHIP Counter keys
103105
static const Key kCounterKey_RebootCount;
104106
static const Key kCounterKey_UpTime;

‎src/platform/Infineon/PSOC6/P6Config.cpp

+9
Original file line numberDiff line numberDiff line change
@@ -88,6 +88,15 @@ const P6Config::Key P6Config::kConfigKey_YearDaySchedules = { kConfigNamespace_C
8888
const P6Config::Key P6Config::kConfigKey_HolidaySchedules = { kConfigNamespace_ChipConfig, "holiday-schedules" };
8989
;
9090

91+
const P6Config::Key P6Config::kConfigKey_VendorName = { kConfigNamespace_ChipConfig, "vendor-name" };
92+
;
93+
const P6Config::Key P6Config::kConfigKey_ProductName = { kConfigNamespace_ChipConfig, "product-name" };
94+
;
95+
const P6Config::Key P6Config::kConfigKey_HardwareVersionString = { kConfigNamespace_ChipConfig, "hardware-version-string" };
96+
;
97+
const P6Config::Key P6Config::kConfigKey_SoftwareVersionString = { kConfigNamespace_ChipConfig, "software-version-string" };
98+
;
99+
91100
// Keys stored in the Chip-counters namespace
92101
const P6Config::Key P6Config::kCounterKey_RebootCount = { kConfigNamespace_ChipCounters, "reboot-count" };
93102
const P6Config::Key P6Config::kCounterKey_UpTime = { kConfigNamespace_ChipCounters, "up-time" };

‎src/platform/NuttX/PosixConfig.cpp

+5
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,11 @@ const PosixConfig::Key PosixConfig::kConfigKey_CountryCode = { kConfigNam
7474
const PosixConfig::Key PosixConfig::kConfigKey_LocationCapability = { kConfigNamespace_ChipConfig, "location-capability" };
7575
const PosixConfig::Key PosixConfig::kConfigKey_UniqueId = { kConfigNamespace_ChipFactory, "unique-id" };
7676

77+
const PosixConfig::Key PosixConfig::kConfigKey_VendorName = { kConfigNamespace_ChipFactory, "vendor-name" };
78+
const PosixConfig::Key PosixConfig::kConfigKey_ProductName = { kConfigNamespace_ChipFactory, "product-name" };
79+
const PosixConfig::Key PosixConfig::kConfigKey_HardwareVersionString = { kConfigNamespace_ChipFactory, "hardware-version-string" };
80+
const PosixConfig::Key PosixConfig::kConfigKey_SoftwareVersionString = { kConfigNamespace_ChipFactory, "software-version-string" };
81+
7782
// Keys stored in the Chip-counters namespace
7883
const PosixConfig::Key PosixConfig::kCounterKey_RebootCount = { kConfigNamespace_ChipCounters, "reboot-count" };
7984
const PosixConfig::Key PosixConfig::kCounterKey_UpTime = { kConfigNamespace_ChipCounters, "up-time" };

‎src/platform/NuttX/PosixConfig.h

+5
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,11 @@ class PosixConfig
7878
static const Key kConfigKey_VendorId;
7979
static const Key kConfigKey_ProductId;
8080

81+
static const Key kConfigKey_VendorName;
82+
static const Key kConfigKey_ProductName;
83+
static const Key kConfigKey_HardwareVersionString;
84+
static const Key kConfigKey_SoftwareVersionString;
85+
8186
static const Key kCounterKey_RebootCount;
8287
static const Key kCounterKey_UpTime;
8388
static const Key kCounterKey_TotalOperationalHours;

‎src/platform/Tizen/PosixConfig.cpp

+9
Original file line numberDiff line numberDiff line change
@@ -66,6 +66,15 @@ const PosixConfig::Key PosixConfig::kConfigKey_RegulatoryLocation = { kConfigNam
6666
const PosixConfig::Key PosixConfig::kConfigKey_CountryCode = { kConfigNamespace_ChipConfig, "country-code" };
6767
const PosixConfig::Key PosixConfig::kConfigKey_UniqueId = { kConfigNamespace_ChipConfig, "unique-id" };
6868

69+
const PosixConfig::Key PosixConfig::kConfigKey_VendorName = { kConfigNamespace_ChipConfig, "vendor-name" };
70+
const PosixConfig::Key PosixConfig::kConfigKey_ProductName = { kConfigNamespace_ChipConfig, "product-name" };
71+
const PosixConfig::Key PosixConfig::kConfigKey_HardwareVersionString = { kConfigNamespace_ChipConfig, "hardware-version-string" };
72+
const PosixConfig::Key PosixConfig::kConfigKey_SoftwareVersionString = { kConfigNamespace_ChipConfig, "software-version-string" };
73+
74+
static const Key kConfigKey_;
75+
static const Key kConfigKey_;
76+
static const Key kConfigKey_;
77+
static const Key kConfigKey_;
6978
// Keys stored in the Chip-counters namespace
7079
const PosixConfig::Key PosixConfig::kCounterKey_TotalOperationalHours = { kConfigNamespace_ChipCounters,
7180
"total-operational-hours" };

‎src/platform/Tizen/PosixConfig.h

+5
Original file line numberDiff line numberDiff line change
@@ -75,6 +75,11 @@ class PosixConfig
7575
static const Key kConfigKey_VendorId;
7676
static const Key kConfigKey_ProductId;
7777

78+
static const Key kConfigKey_VendorName;
79+
static const Key kConfigKey_ProductName;
80+
static const Key kConfigKey_HardwareVersionString;
81+
static const Key kConfigKey_SoftwareVersionString;
82+
7883
static const Key kCounterKey_TotalOperationalHours;
7984
static const Key kCounterKey_BootReason;
8085

‎src/platform/bouffalolab/common/BLConfig.h

+4-4
Original file line numberDiff line numberDiff line change
@@ -77,10 +77,10 @@ class BLConfig
7777

7878
static constexpr char kBLKey_factoryResetFlag[] = ("__factory_reset_pending");
7979

80-
static const Key kConfigKey_VendorName;
81-
static const Key kConfigKey_ProductName;
82-
static const Key kConfigKey_HardwareVersionString;
83-
static const Key kConfigKey_SoftwareVersionString;
80+
static constexpr char kConfigKey_VendorName[] = ("vendor-name");
81+
static constexpr char kConfigKey_ProductName[] = ("product-name");
82+
static constexpr char kConfigKey_HardwareVersionString[] = ("hardware-version-string");
83+
static constexpr char kConfigKey_SoftwareVersionString[] = ("software-version-string");
8484

8585
static void Init(void);
8686

‎src/platform/cc13xx_26xx/CC13XX_26XXConfig.cpp

+12
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,18 @@ const CC13XX_26XXConfig::Key CC13XX_26XXConfig::kConfigKey_UniqueId = {
123123
{ .systemID = kCC13XX_26XXMatter_SysID, .itemID = kCC13XX_26XXMatter_ItemID_ChipConfig, .subID = 0x0001d }
124124
};
125125

126+
const CC13XX_26XXConfig::Key CC13XX_26XXConfig::kConfigKey_VendorName = {
127+
{ .systemID = kCC13XX_26XXMatter_SysID, .itemID = kCC13XX_26XXMatter_ItemID_ChipConfig, .subID = 0x0001e }
128+
};
129+
const CC13XX_26XXConfig::Key CC13XX_26XXConfig::kConfigKey_ProductName = {
130+
{ .systemID = kCC13XX_26XXMatter_SysID, .itemID = kCC13XX_26XXMatter_ItemID_ChipConfig, .subID = 0x0001f }
131+
};
132+
const CC13XX_26XXConfig::Key CC13XX_26XXConfig::kConfigKey_HardwareVersionString = {
133+
{ .systemID = kCC13XX_26XXMatter_SysID, .itemID = kCC13XX_26XXMatter_ItemID_ChipConfig, .subID = 0x00020 }
134+
};
135+
const CC13XX_26XXConfig::Key CC13XX_26XXConfig::kConfigKey_SoftwareVersionString = {
136+
{ .systemID = kCC13XX_26XXMatter_SysID, .itemID = kCC13XX_26XXMatter_ItemID_ChipConfig, .subID = 0x00021 }
137+
};
126138
/* Internal for the KVS interface. */
127139
const CC13XX_26XXConfig::Key CC13XX_26XXConfig::kConfigKey_KVS_key = { { .systemID = kCC13XX_26XXMatter_SysID,
128140
.itemID = kCC13XX_26XXMatter_ItemID_ChipKVS_key } };

‎src/platform/cc32xx/CC32XXConfig.cpp

+5
Original file line numberDiff line numberDiff line change
@@ -318,6 +318,11 @@ const CC32XXConfig::Key CC32XXConfig::kConfigKey_Spake2pIterationCount = { "TI_k
318318
const CC32XXConfig::Key CC32XXConfig::kConfigKey_Spake2pSalt = { "TI_kConfigKey_Spake2pSalt" };
319319
const CC32XXConfig::Key CC32XXConfig::kConfigKey_Spake2pVerifier = { "TI_kConfigKey_Spake2pVerifier" };
320320

321+
const CC32XXConfig::Key CC32XXConfig::kConfigKey_VendorName = { "TI_kConfigKey_VendorName" };
322+
const CC32XXConfig::Key CC32XXConfig::kConfigKey_ProductName = { "TI_kConfigKey_ProductName" };
323+
const CC32XXConfig::Key CC32XXConfig::kConfigKey_HardwareVersionString = { "TI_kConfigKey_HardwareVersionString" };
324+
const CC32XXConfig::Key CC32XXConfig::kConfigKey_SoftwareVersionString = { "TI_kConfigKey_SoftwareVersionString" };
325+
321326
CC32XXKVSList * pList;
322327

323328
CHIP_ERROR CC32XXConfig::Init()

‎src/platform/mbed/MbedConfig.cpp

+10
Original file line numberDiff line numberDiff line change
@@ -85,6 +85,16 @@ const MbedConfig::Key MbedConfig::kConfigKey_RegulatoryLocation = { CONFIG_KEY("
8585
const MbedConfig::Key MbedConfig::kConfigKey_CountryCode = { CONFIG_KEY("country-code") };
8686
const MbedConfig::Key MbedConfig::kConfigKey_UniqueId = { CONFIG_KEY("unique-id") };
8787

88+
const MbedConfig::Key MbedConfig::kConfigKey_VendorName = { CONFIG_KEY("vendor-name") };
89+
const MbedConfig::Key MbedConfig::kConfigKey_ProductName = { CONFIG_KEY("product-name") };
90+
const MbedConfig::Key MbedConfig::kConfigKey_HardwareVersionString = { CONFIG_KEY("hardware-version-string") };
91+
const MbedConfig::Key MbedConfig::kConfigKey_SoftwareVersionString = { CONFIG_KEY("software-version-string") };
92+
93+
static const Key kConfigKey_;
94+
static const Key kConfigKey_;
95+
static const Key kConfigKey_;
96+
static const Key kConfigKey_;
97+
8898
// Keys stored in the Chip-counters namespace
8999
const MbedConfig::Key MbedConfig::kCounterKey_RebootCount = { COUNTER_KEY("reboot-count") };
90100
const MbedConfig::Key MbedConfig::kCounterKey_UpTime = { COUNTER_KEY("up-time") };

‎src/platform/mt793x/MT793XConfig.cpp

+8
Original file line numberDiff line numberDiff line change
@@ -100,6 +100,14 @@ const MT793XConfig::Key MT793XConfig::kConfigKey_YearDaySchedules = { .Namespace
100100
.Name = "yearday-sched" };
101101
const MT793XConfig::Key MT793XConfig::kConfigKey_HolidaySchedules = { .Namespace = kConfigNamespace_ChipConfig,
102102
.Name = "holiday-sched" };
103+
104+
const MT793XConfig::Key MT793XConfig::kConfigKey_VendorName = { .Namespace = kConfigNamespace_ChipConfig, .Name = "vendor-name" };
105+
const MT793XConfig::Key MT793XConfig::kConfigKey_ProductName = { .Namespace = kConfigNamespace_ChipConfig, .Name = "product-name" };
106+
const MT793XConfig::Key MT793XConfig::kConfigKey_HardwareVersionString = { .Namespace = kConfigNamespace_ChipConfig,
107+
.Name = "hardware-version-string" };
108+
const MT793XConfig::Key MT793XConfig::kConfigKey_SoftwareVersionString = { .Namespace = kConfigNamespace_ChipConfig,
109+
.Name = "software-version-string" };
110+
103111
// CHIP Counter Keys
104112
const MT793XConfig::Key MT793XConfig::kConfigKey_BootCount = { .Namespace = kConfigNamespace_ChipCounters, .Name = "boot-count" };
105113
const MT793XConfig::Key MT793XConfig::kConfigKey_TotalOperationalHours = { .Namespace = kConfigNamespace_ChipCounters,

‎src/platform/mt793x/MT793XConfig.h

+5
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,11 @@ class MT793XConfig
101101
static const Key kConfigKey_WeekDaySchedules;
102102
static const Key kConfigKey_YearDaySchedules;
103103
static const Key kConfigKey_HolidaySchedules;
104+
105+
static const Key kConfigKey_VendorName;
106+
static const Key kConfigKey_ProductName;
107+
static const Key kConfigKey_HardwareVersionString;
108+
static const Key kConfigKey_SoftwareVersionString;
104109
// CHIP Counter Keys
105110
static const Key kConfigKey_BootCount;
106111
static const Key kConfigKey_TotalOperationalHours;

‎src/platform/stm32/STM32Config.h

+6
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,12 @@ class STM32Config
6767
static constexpr Key kConfigKey_Breadcrumb = 22;
6868
static constexpr Key kConfigKey_UniqueId = 23;
6969
static constexpr Key kConfigKey_ProductRevision = 24;
70+
71+
static constexpr Key kConfigKey_VendorName = 25;
72+
static constexpr Key kConfigKey_ProductName = 26;
73+
static constexpr Key kConfigKey_HardwareVersionString = 27;
74+
static constexpr Key kConfigKey_SoftwareVersionString = 28;
75+
7076
// Set key id limits for each group.
7177
static constexpr Key kConfigKey_Base = kConfigKey_SerialNum;
7278
static constexpr Key kConfigKey_Max = kConfigKey_UniqueId;

‎src/platform/webos/PosixConfig.cpp

+5
Original file line numberDiff line numberDiff line change
@@ -78,6 +78,11 @@ const PosixConfig::Key PosixConfig::kConfigKey_Breadcrumb = { kConfigNam
7878
const PosixConfig::Key PosixConfig::kConfigKey_LocationCapability = { kConfigNamespace_ChipConfig, "location-capability" };
7979
const PosixConfig::Key PosixConfig::kConfigKey_UniqueId = { kConfigNamespace_ChipFactory, "unique-id" };
8080

81+
const PosixConfig::Key PosixConfig::kConfigKey_VendorName = { kConfigNamespace_ChipFactory, "vendor-name" };
82+
const PosixConfig::Key PosixConfig::kConfigKey_ProductName = { kConfigNamespace_ChipFactory, "product-name" };
83+
const PosixConfig::Key PosixConfig::kConfigKey_HardwareVersionString = { kConfigNamespace_ChipFactory, "hardware-version-string" };
84+
const PosixConfig::Key PosixConfig::kConfigKey_SoftwareVersionString = { kConfigNamespace_ChipFactory, "software-version-string" };
85+
8186
// Keys stored in the Chip-counters namespace
8287
const PosixConfig::Key PosixConfig::kCounterKey_RebootCount = { kConfigNamespace_ChipCounters, "reboot-count" };
8388
const PosixConfig::Key PosixConfig::kCounterKey_UpTime = { kConfigNamespace_ChipCounters, "up-time" };

‎src/platform/webos/PosixConfig.h

+5
Original file line numberDiff line numberDiff line change
@@ -82,6 +82,11 @@ class PosixConfig
8282
static const Key kConfigKey_VendorId;
8383
static const Key kConfigKey_ProductId;
8484

85+
static const Key kConfigKey_VendorName;
86+
static const Key kConfigKey_ProductName;
87+
static const Key kConfigKey_HardwareVersionString;
88+
static const Key kConfigKey_SoftwareVersionString;
89+
8590
static const Key kCounterKey_RebootCount;
8691
static const Key kCounterKey_UpTime;
8792
static const Key kCounterKey_TotalOperationalHours;

0 commit comments

Comments
 (0)