Skip to content

Commit 1279108

Browse files
mkardous-silabspull[bot]
authored andcommitted
[Silabs] Remove generic base class init from configuration manager (#24346)
* Fix factory data provider init * remove commented code * Add missing function to data provider
1 parent 1764dfa commit 1279108

File tree

4 files changed

+25
-11
lines changed

4 files changed

+25
-11
lines changed

examples/platform/silabs/efr32/EFR32DeviceDataProvider.cpp

+18-1
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,24 @@ CHIP_ERROR EFR32DeviceDataProvider::GetManufacturingDate(uint16_t & year, uint8_
321321
ChipLogError(DeviceLayer, "Invalid manufacturing date: %s", dateStr);
322322
}
323323
return err;
324-
return CHIP_ERROR_NOT_IMPLEMENTED;
324+
}
325+
326+
CHIP_ERROR EFR32DeviceDataProvider::GetPartNumber(char * buf, size_t bufSize)
327+
{
328+
size_t partNumberLen = 0; // without counting null-terminator
329+
return SILABSConfig::ReadConfigValueStr(SILABSConfig::kConfigKey_PartNumber, buf, bufSize, partNumberLen);
330+
}
331+
332+
CHIP_ERROR EFR32DeviceDataProvider::GetProductURL(char * buf, size_t bufSize)
333+
{
334+
size_t productUrlLen = 0; // without counting null-terminator
335+
return SILABSConfig::ReadConfigValueStr(SILABSConfig::kConfigKey_ProductURL, buf, bufSize, productUrlLen);
336+
}
337+
338+
CHIP_ERROR EFR32DeviceDataProvider::GetProductLabel(char * buf, size_t bufSize)
339+
{
340+
size_t productLabelLen = 0; // without counting null-terminator
341+
return SILABSConfig::ReadConfigValueStr(SILABSConfig::KConfigKey_ProductLabel, buf, bufSize, productLabelLen);
325342
}
326343

327344
EFR32DeviceDataProvider & EFR32DeviceDataProvider::GetDeviceDataProvider()

examples/platform/silabs/efr32/EFR32DeviceDataProvider.h

+3
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,9 @@ class EFR32DeviceDataProvider : public CommissionableDataProvider,
6060
CHIP_ERROR GetSerialNumber(char * buf, size_t bufSize) override;
6161
CHIP_ERROR GetManufacturingDate(uint16_t & year, uint8_t & month, uint8_t & day) override;
6262
CHIP_ERROR GetHardwareVersion(uint16_t & hardwareVersion) override;
63+
CHIP_ERROR GetPartNumber(char * buf, size_t bufSize) override;
64+
CHIP_ERROR GetProductURL(char * buf, size_t bufSzie) override;
65+
CHIP_ERROR GetProductLabel(char * buf, size_t bufSize) override;
6366
};
6467

6568
} // namespace EFR32

src/platform/silabs/EFR32/ConfigurationManagerImpl.cpp

+1-10
Original file line numberDiff line numberDiff line change
@@ -49,12 +49,6 @@ ConfigurationManagerImpl & ConfigurationManagerImpl::GetDefaultInstance()
4949

5050
CHIP_ERROR ConfigurationManagerImpl::Init()
5151
{
52-
CHIP_ERROR err;
53-
54-
// Initialize the generic implementation base class.
55-
err = Internal::GenericConfigurationManagerImpl<SILABSConfig>::Init();
56-
SuccessOrExit(err);
57-
5852
// TODO: Initialize the global GroupKeyStore object here (#1626)
5953

6054
IncreaseBootCount();
@@ -63,10 +57,7 @@ CHIP_ERROR ConfigurationManagerImpl::Init()
6357
rebootCause = RMU_ResetCauseGet();
6458
RMU_ResetCauseClear();
6559

66-
err = CHIP_NO_ERROR;
67-
68-
exit:
69-
return err;
60+
return CHIP_NO_ERROR;
7061
}
7162

7263
bool ConfigurationManagerImpl::CanFactoryReset()

src/platform/silabs/SilabsConfig.h

+3
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,9 @@ class SILABSConfig
108108
static constexpr Key kConfigKey_VendorName = SILABSConfigKey(kMatterFactory_KeyBase, 0x0D);
109109
static constexpr Key kConfigKey_ProductName = SILABSConfigKey(kMatterFactory_KeyBase, 0x0E);
110110
static constexpr Key kConfigKey_HardwareVersionString = SILABSConfigKey(kMatterFactory_KeyBase, 0x0F);
111+
static constexpr Key KConfigKey_ProductLabel = SILABSConfigKey(kMatterFactory_KeyBase, 0x10);
112+
static constexpr Key kConfigKey_ProductURL = SILABSConfigKey(kMatterFactory_KeyBase, 0x11);
113+
static constexpr Key kConfigKey_PartNumber = SILABSConfigKey(kMatterFactory_KeyBase, 0x12);
111114
static constexpr Key kConfigKey_UniqueId = SILABSConfigKey(kMatterFactory_KeyBase, 0x1F);
112115
// Matter Config Keys
113116
static constexpr Key kConfigKey_ServiceConfig = SILABSConfigKey(kMatterConfig_KeyBase, 0x01);

0 commit comments

Comments
 (0)