Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add support for HourFormat & CalendarType in ConfigurationMgr #13433

Merged
merged 1 commit into from
Jan 11, 2022
Merged

Add support for HourFormat & CalendarType in ConfigurationMgr #13433

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions src/include/platform/ConfigurationManager.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,6 +102,8 @@ class ConfigurationManager
virtual CHIP_ERROR GetCountryCode(char * buf, size_t bufSize, size_t & codeLen) = 0;
virtual CHIP_ERROR GetActiveLocale(char * buf, size_t bufSize, size_t & codeLen) = 0;
virtual CHIP_ERROR GetBreadcrumb(uint64_t & breadcrumb) = 0;
virtual CHIP_ERROR GetHourFormat(uint8_t & format) = 0;
virtual CHIP_ERROR GetCalendarType(uint8_t & type) = 0;
virtual CHIP_ERROR StoreSerialNumber(const char * serialNum, size_t serialNumLen) = 0;
virtual CHIP_ERROR StorePrimaryWiFiMACAddress(const uint8_t * buf) = 0;
virtual CHIP_ERROR StorePrimary802154MACAddress(const uint8_t * buf) = 0;
Expand All @@ -113,6 +115,8 @@ class ConfigurationManager
virtual CHIP_ERROR StoreCountryCode(const char * code, size_t codeLen) = 0;
virtual CHIP_ERROR StoreActiveLocale(const char * code, size_t codeLen) = 0;
virtual CHIP_ERROR StoreBreadcrumb(uint64_t breadcrumb) = 0;
virtual CHIP_ERROR StoreHourFormat(uint8_t format) = 0;
virtual CHIP_ERROR StoreCalendarType(uint8_t type) = 0;
virtual CHIP_ERROR GetRebootCount(uint32_t & rebootCount) = 0;
virtual CHIP_ERROR StoreRebootCount(uint32_t rebootCount) = 0;
virtual CHIP_ERROR GetTotalOperationalHours(uint32_t & totalOperationalHours) = 0;
Expand Down
46 changes: 46 additions & 0 deletions src/include/platform/internal/GenericConfigurationManagerImpl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,52 @@ CHIP_ERROR GenericConfigurationManagerImpl<ConfigClass>::StoreRegulatoryLocation
return WriteConfigValue(ConfigClass::kConfigKey_RegulatoryLocation, value);
}

template <class ConfigClass>
CHIP_ERROR GenericConfigurationManagerImpl<ConfigClass>::GetHourFormat(uint8_t & format)
{
uint32_t value = 0;

CHIP_ERROR err = ReadConfigValue(ConfigClass::kConfigKey_HourFormat, value);

if (err == CHIP_NO_ERROR)
{
VerifyOrReturnError(value <= UINT8_MAX, CHIP_ERROR_INVALID_INTEGER_VALUE);
format = static_cast<uint8_t>(value);
}

return err;
}

template <class ConfigClass>
CHIP_ERROR GenericConfigurationManagerImpl<ConfigClass>::StoreHourFormat(uint8_t format)
{
uint32_t value = format;
return WriteConfigValue(ConfigClass::kConfigKey_HourFormat, value);
}

template <class ConfigClass>
CHIP_ERROR GenericConfigurationManagerImpl<ConfigClass>::GetCalendarType(uint8_t & type)
{
uint32_t value = 0;

CHIP_ERROR err = ReadConfigValue(ConfigClass::kConfigKey_CalendarType, value);

if (err == CHIP_NO_ERROR)
{
VerifyOrReturnError(value <= UINT8_MAX, CHIP_ERROR_INVALID_INTEGER_VALUE);
type = static_cast<uint8_t>(value);
}

return err;
}

template <class ConfigClass>
CHIP_ERROR GenericConfigurationManagerImpl<ConfigClass>::StoreCalendarType(uint8_t type)
{
uint32_t value = type;
return WriteConfigValue(ConfigClass::kConfigKey_CalendarType, value);
}

template <class ConfigClass>
CHIP_ERROR GenericConfigurationManagerImpl<ConfigClass>::GetCountryCode(char * buf, size_t bufSize, size_t & codeLen)
{
Expand Down
4 changes: 4 additions & 0 deletions src/include/platform/internal/GenericConfigurationManagerImpl.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,10 @@ class GenericConfigurationManagerImpl : public ConfigurationManager
CHIP_ERROR GetLocalConfigDisabled(bool & disabled) override;
CHIP_ERROR GetReachable(bool & reachable) override;
CHIP_ERROR GetUniqueId(char * buf, size_t bufSize) override;
CHIP_ERROR GetHourFormat(uint8_t & format) override;
CHIP_ERROR StoreHourFormat(uint8_t format) override;
CHIP_ERROR GetCalendarType(uint8_t & type) override;
CHIP_ERROR StoreCalendarType(uint8_t type) override;
CHIP_ERROR RunUnitTests(void) override;
bool IsFullyProvisioned() override;
void InitiateFactoryReset() override;
Expand Down
2 changes: 2 additions & 0 deletions src/platform/Ameba/AmebaConfig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ const AmebaConfig::Key AmebaConfig::kConfigKey_RegulatoryLocation = { k
const AmebaConfig::Key AmebaConfig::kConfigKey_CountryCode = { kConfigNamespace_ChipConfig, "country-code" };
const AmebaConfig::Key AmebaConfig::kConfigKey_ActiveLocale = { kConfigNamespace_ChipConfig, "active-locale" };
const AmebaConfig::Key AmebaConfig::kConfigKey_Breadcrumb = { kConfigNamespace_ChipConfig, "breadcrumb" };
const AmebaConfig::Key AmebaConfig::kConfigKey_HourFormat = { kConfigNamespace_ChipConfig, "hour-format" };
const AmebaConfig::Key AmebaConfig::kConfigKey_CalendarType = { kConfigNamespace_ChipConfig, "calendar-type" };

// Keys stored in the Chip-counters namespace
const AmebaConfig::Key AmebaConfig::kCounterKey_RebootCount = { kConfigNamespace_ChipCounters, "reboot-count" };
Expand Down
4 changes: 4 additions & 0 deletions src/platform/Ameba/AmebaConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,10 @@ class AmebaConfig
static const Key kConfigKey_CountryCode;
static const Key kConfigKey_ActiveLocale;
static const Key kConfigKey_Breadcrumb;
static const Key kConfigKey_HourFormat;
static const Key kConfigKey_CalendarType;

// Counter keys
static const Key kCounterKey_RebootCount;
static const Key kCounterKey_UpTime;
static const Key kCounterKey_TotalOperationalHours;
Expand Down
2 changes: 2 additions & 0 deletions src/platform/Darwin/PosixConfig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ const PosixConfig::Key PosixConfig::kConfigKey_RegulatoryLocation = { kConfigNam
const PosixConfig::Key PosixConfig::kConfigKey_CountryCode = { kConfigNamespace_ChipConfig, "country-code" };
const PosixConfig::Key PosixConfig::kConfigKey_ActiveLocale = { kConfigNamespace_ChipConfig, "active-locale" };
const PosixConfig::Key PosixConfig::kConfigKey_Breadcrumb = { kConfigNamespace_ChipConfig, "breadcrumb" };
const PosixConfig::Key PosixConfig::kConfigKey_HourFormat = { kConfigNamespace_ChipConfig, "hour-format" };
const PosixConfig::Key PosixConfig::kConfigKey_CalendarType = { kConfigNamespace_ChipConfig, "calendar-type" };

// Prefix used for NVS keys that contain Chip group encryption keys.
const char PosixConfig::kGroupKeyNamePrefix[] = "gk-";
Expand Down
2 changes: 2 additions & 0 deletions src/platform/Darwin/PosixConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ class PosixConfig
static const Key kConfigKey_CountryCode;
static const Key kConfigKey_ActiveLocale;
static const Key kConfigKey_Breadcrumb;
static const Key kConfigKey_HourFormat;
static const Key kConfigKey_CalendarType;

static const char kGroupKeyNamePrefix[];

Expand Down
8 changes: 5 additions & 3 deletions src/platform/EFR32/EFR32Config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,9 +94,11 @@ class EFR32Config
static constexpr Key kConfigKey_RegulatoryLocation = EFR32ConfigKey(kChipConfig_KeyBase, 0x09);
static constexpr Key kConfigKey_CountryCode = EFR32ConfigKey(kChipConfig_KeyBase, 0x0A);
static constexpr Key kConfigKey_Breadcrumb = EFR32ConfigKey(kChipConfig_KeyBase, 0x0B);
static constexpr Key kConfigKey_GroupKeyBase = EFR32ConfigKey(kChipConfig_KeyBase, 0x0C);
static constexpr Key kConfigKey_ActiveLocale = EFR32ConfigKey(kChipConfig_KeyBase, 0x0D);
static constexpr Key kConfigKey_GroupKeyMax = EFR32ConfigKey(kChipConfig_KeyBase, 0x1B); // Allows 16 Group Keys to be created.
static constexpr Key kConfigKey_ActiveLocale = EFR32ConfigKey(kChipConfig_KeyBase, 0x0C);
static constexpr Key kConfigKey_HourFormat = EFR32ConfigKey(kChipConfig_KeyBase, 0x0D);
static constexpr Key kConfigKey_CalendarType = EFR32ConfigKey(kChipConfig_KeyBase, 0x0E);
static constexpr Key kConfigKey_GroupKeyBase = EFR32ConfigKey(kChipConfig_KeyBase, 0x0F);
static constexpr Key kConfigKey_GroupKeyMax = EFR32ConfigKey(kChipConfig_KeyBase, 0x1E); // Allows 16 Group Keys to be created.

// CHIP Counter Keys
static constexpr Key kConfigKey_BootCount = EFR32ConfigKey(kChipCounter_KeyBase, 0x00);
Expand Down
2 changes: 2 additions & 0 deletions src/platform/ESP32/ESP32Config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ const ESP32Config::Key ESP32Config::kConfigKey_RegulatoryLocation = { kConfigNam
const ESP32Config::Key ESP32Config::kConfigKey_CountryCode = { kConfigNamespace_ChipConfig, "country-code" };
const ESP32Config::Key ESP32Config::kConfigKey_ActiveLocale = { kConfigNamespace_ChipConfig, "active-locale" };
const ESP32Config::Key ESP32Config::kConfigKey_Breadcrumb = { kConfigNamespace_ChipConfig, "breadcrumb" };
const ESP32Config::Key ESP32Config::kConfigKey_HourFormat = { kConfigNamespace_ChipConfig, "hour-format" };
const ESP32Config::Key ESP32Config::kConfigKey_CalendarType = { kConfigNamespace_ChipConfig, "calendar-type" };

// Keys stored in the Chip-counters namespace
const ESP32Config::Key ESP32Config::kCounterKey_RebootCount = { kConfigNamespace_ChipCounters, "reboot-count" };
Expand Down
4 changes: 4 additions & 0 deletions src/platform/ESP32/ESP32Config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,10 @@ class ESP32Config
static const Key kConfigKey_CountryCode;
static const Key kConfigKey_ActiveLocale;
static const Key kConfigKey_Breadcrumb;
static const Key kConfigKey_HourFormat;
static const Key kConfigKey_CalendarType;

// CHIP Counter keys
static const Key kCounterKey_RebootCount;
static const Key kCounterKey_UpTime;
static const Key kCounterKey_TotalOperationalHours;
Expand Down
2 changes: 2 additions & 0 deletions src/platform/Linux/PosixConfig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,8 @@ const PosixConfig::Key PosixConfig::kConfigKey_CountryCode = { kConfigNam
const PosixConfig::Key PosixConfig::kConfigKey_ActiveLocale = { kConfigNamespace_ChipConfig, "active-locale" };
const PosixConfig::Key PosixConfig::kConfigKey_Breadcrumb = { kConfigNamespace_ChipConfig, "breadcrumb" };
const PosixConfig::Key PosixConfig::kConfigKey_LocationCapability = { kConfigNamespace_ChipConfig, "location-capability" };
const PosixConfig::Key PosixConfig::kConfigKey_HourFormat = { kConfigNamespace_ChipConfig, "hour-format" };
const PosixConfig::Key PosixConfig::kConfigKey_CalendarType = { kConfigNamespace_ChipConfig, "calendar-type" };

// Keys stored in the Chip-counters namespace
const PosixConfig::Key PosixConfig::kCounterKey_RebootCount = { kConfigNamespace_ChipCounters, "reboot-count" };
Expand Down
2 changes: 2 additions & 0 deletions src/platform/Linux/PosixConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,8 @@ class PosixConfig
static const Key kConfigKey_ActiveLocale;
static const Key kConfigKey_Breadcrumb;
static const Key kConfigKey_LocationCapability;
static const Key kConfigKey_HourFormat;
static const Key kConfigKey_CalendarType;

static const Key kCounterKey_RebootCount;
static const Key kCounterKey_UpTime;
Expand Down
10 changes: 6 additions & 4 deletions src/platform/P6/P6Config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,10 +57,6 @@ const P6Config::Key P6Config::kConfigKey_HardwareVersion = { kConfigNamespac
const P6Config::Key P6Config::kConfigKey_ManufacturingDate = { kConfigNamespace_ChipFactory, "mfg-date" };
const P6Config::Key P6Config::kConfigKey_SetupPinCode = { kConfigNamespace_ChipFactory, "pin-code" };
const P6Config::Key P6Config::kConfigKey_SetupDiscriminator = { kConfigNamespace_ChipFactory, "discriminator" };
const P6Config::Key P6Config::kConfigKey_RegulatoryLocation = { kConfigNamespace_ChipConfig, "regulatory-location" };
const P6Config::Key P6Config::kConfigKey_CountryCode = { kConfigNamespace_ChipConfig, "country-code" };
const P6Config::Key P6Config::kConfigKey_ActiveLocale = { kConfigNamespace_ChipConfig, "active-locale" };
const P6Config::Key P6Config::kConfigKey_Breadcrumb = { kConfigNamespace_ChipConfig, "breadcrumb" };

// Keys stored in the chip-config namespace
const P6Config::Key P6Config::kConfigKey_FabricId = { kConfigNamespace_ChipConfig, "fabric-id" };
Expand All @@ -71,6 +67,12 @@ const P6Config::Key P6Config::kConfigKey_GroupKeyIndex = { kConfigNamespace
const P6Config::Key P6Config::kConfigKey_LastUsedEpochKeyId = { kConfigNamespace_ChipConfig, "last-ek-id" };
const P6Config::Key P6Config::kConfigKey_FailSafeArmed = { kConfigNamespace_ChipConfig, "fail-safe-armed" };
const P6Config::Key P6Config::kConfigKey_WiFiStationSecType = { kConfigNamespace_ChipConfig, "sta-sec-type" };
const P6Config::Key P6Config::kConfigKey_RegulatoryLocation = { kConfigNamespace_ChipConfig, "regulatory-location" };
const P6Config::Key P6Config::kConfigKey_CountryCode = { kConfigNamespace_ChipConfig, "country-code" };
const P6Config::Key P6Config::kConfigKey_ActiveLocale = { kConfigNamespace_ChipConfig, "active-locale" };
const P6Config::Key P6Config::kConfigKey_Breadcrumb = { kConfigNamespace_ChipConfig, "breadcrumb" };
const P6Config::Key P6Config::kConfigKey_HourFormat = { kConfigNamespace_ChipConfig, "hour-format" };
const P6Config::Key P6Config::kConfigKey_CalendarType = { kConfigNamespace_ChipConfig, "calendar-type" };

// Keys stored in the Chip-counters namespace
const P6Config::Key P6Config::kCounterKey_RebootCount = { kConfigNamespace_ChipCounters, "reboot-count" };
Expand Down
4 changes: 4 additions & 0 deletions src/platform/P6/P6Config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,10 @@ class P6Config
static const Key kConfigKey_CountryCode;
static const Key kConfigKey_ActiveLocale;
static const Key kConfigKey_Breadcrumb;
static const Key kConfigKey_HourFormat;
static const Key kConfigKey_CalendarType;

// CHIP Counter keys
static const Key kCounterKey_RebootCount;
static const Key kCounterKey_UpTime;
static const Key kCounterKey_TotalOperationalHours;
Expand Down
2 changes: 2 additions & 0 deletions src/platform/Tizen/PosixConfig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,8 @@ const PosixConfig::Key PosixConfig::kConfigKey_RegulatoryLocation = { kConfigNam
const PosixConfig::Key PosixConfig::kConfigKey_CountryCode = { kConfigNamespace_ChipConfig, "country-code" };
const PosixConfig::Key PosixConfig::kConfigKey_Breadcrumb = { kConfigNamespace_ChipConfig, "breadcrumb" };
const PosixConfig::Key PosixConfig::kConfigKey_ActiveLocale = { kConfigNamespace_ChipConfig, "active-locale" };
const PosixConfig::Key PosixConfig::kConfigKey_HourFormat = { kConfigNamespace_ChipConfig, "hour-format" };
const PosixConfig::Key PosixConfig::kConfigKey_CalendarType = { kConfigNamespace_ChipConfig, "calendar-type" };

// Prefix used for NVS keys that contain Chip group encryption keys.
const char PosixConfig::kGroupKeyNamePrefix[] = "gk-";
Expand Down
2 changes: 2 additions & 0 deletions src/platform/Tizen/PosixConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ class PosixConfig
static const Key kConfigKey_CountryCode;
static const Key kConfigKey_Breadcrumb;
static const Key kConfigKey_ActiveLocale;
static const Key kConfigKey_HourFormat;
static const Key kConfigKey_CalendarType;

static const char kGroupKeyNamePrefix[];

Expand Down
5 changes: 4 additions & 1 deletion src/platform/Zephyr/ZephyrConfig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,6 +72,8 @@ const ZephyrConfig::Key ZephyrConfig::kConfigKey_RegulatoryLocation = CONFIG_KEY
const ZephyrConfig::Key ZephyrConfig::kConfigKey_CountryCode = CONFIG_KEY(NAMESPACE_CONFIG "country-code");
const ZephyrConfig::Key ZephyrConfig::kConfigKey_ActiveLocale = CONFIG_KEY(NAMESPACE_CONFIG "active-locale");
const ZephyrConfig::Key ZephyrConfig::kConfigKey_Breadcrumb = CONFIG_KEY(NAMESPACE_CONFIG "breadcrumb");
const ZephyrConfig::Key ZephyrConfig::kConfigKey_HourFormat = CONFIG_KEY(NAMESPACE_CONFIG "hour-format");
const ZephyrConfig::Key ZephyrConfig::kConfigKey_CalendarType = CONFIG_KEY(NAMESPACE_CONFIG "calendar-type");

// Keys stored in the counters namespace
const ZephyrConfig::Key ZephyrConfig::kCounterKey_RebootCount = CONFIG_KEY(NAMESPACE_COUNTERS "reboot-count");
Expand All @@ -86,7 +88,8 @@ constexpr const char * sAllResettableConfigKeys[] = {
ZephyrConfig::kConfigKey_FabricSecret, ZephyrConfig::kConfigKey_GroupKeyIndex,
ZephyrConfig::kConfigKey_LastUsedEpochKeyId, ZephyrConfig::kConfigKey_FailSafeArmed,
ZephyrConfig::kConfigKey_RegulatoryLocation, ZephyrConfig::kConfigKey_CountryCode,
ZephyrConfig::kConfigKey_ActiveLocale, ZephyrConfig::kConfigKey_Breadcrumb
ZephyrConfig::kConfigKey_ActiveLocale, ZephyrConfig::kConfigKey_Breadcrumb,
ZephyrConfig::kConfigKey_HourFormat, ZephyrConfig::kConfigKey_CalendarType,
};

// Data structure to be passed as a parameter of Zephyr's settings_load_subtree_direct() function
Expand Down
3 changes: 3 additions & 0 deletions src/platform/Zephyr/ZephyrConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,9 @@ class ZephyrConfig
static const Key kConfigKey_CountryCode;
static const Key kConfigKey_ActiveLocale;
static const Key kConfigKey_Breadcrumb;
static const Key kConfigKey_HourFormat;
static const Key kConfigKey_CalendarType;

static const Key kCounterKey_RebootCount;
static const Key kCounterKey_BootReason;
static const Key kCounterKey_TotalOperationalHours;
Expand Down
2 changes: 2 additions & 0 deletions src/platform/android/AndroidConfig.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -93,6 +93,8 @@ const AndroidConfig::Key AndroidConfig::kConfigKey_RegulatoryLocation = { kConfi
const AndroidConfig::Key AndroidConfig::kConfigKey_CountryCode = { kConfigNamespace_ChipConfig, "country-code" };
const AndroidConfig::Key AndroidConfig::kConfigKey_ActiveLocale = { kConfigNamespace_ChipConfig, "active-locale" };
const AndroidConfig::Key AndroidConfig::kConfigKey_Breadcrumb = { kConfigNamespace_ChipConfig, "breadcrumb" };
const AndroidConfig::Key AndroidConfig::kConfigKey_HourFormat = { kConfigNamespace_ChipConfig, "hour-format" };
const AndroidConfig::Key AndroidConfig::kConfigKey_CalendarType = { kConfigNamespace_ChipConfig, "calendar-type" };

// Prefix used for NVS keys that contain Chip group encryption keys.
const char AndroidConfig::kGroupKeyNamePrefix[] = "gk-";
Expand Down
2 changes: 2 additions & 0 deletions src/platform/android/AndroidConfig.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,6 +76,8 @@ class AndroidConfig
static const Key kConfigKey_CountryCode;
static const Key kConfigKey_ActiveLocale;
static const Key kConfigKey_Breadcrumb;
static const Key kConfigKey_HourFormat;
static const Key kConfigKey_CalendarType;
static const Key kConfigKey_ProductId;
static const Key kConfigKey_ProductName;
static const Key kConfigKey_SoftwareVersion;
Expand Down
2 changes: 2 additions & 0 deletions src/platform/android/java/chip/platform/ConfigurationManager.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ public interface ConfigurationManager {
String kConfigKey_CountryCode = "country-code";
String kConfigKey_ActiveLocale = "active-locale";
String kConfigKey_Breadcrumb = "breadcrumb";
String kConfigKey_HourFormat = "hour-format";
String kConfigKey_CalendarType = "calendar-type";

// Prefix used for NVS keys that contain Chip group encryption keys.
String kGroupKeyNamePrefix = "gk-";
Expand Down
8 changes: 6 additions & 2 deletions src/platform/cc13x2_26x2/CC13X2_26X2Config.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,12 +89,16 @@ const CC13X2_26X2Config::Key CC13X2_26X2Config::kConfigKey_Breadcrumb =
.itemID = 0x001c } };
const CC13X2_26X2Config::Key CC13X2_26X2Config::kConfigKey_ActiveLocale = { { .systemID = kCC13X2_26X2ChipFactory_Sysid,
.itemID = 0x001d } };
const CC13X2_26X2Config::Key CC13X2_26X2Config::kConfigKey_HourFormat = { { .systemID = kCC13X2_26X2ChipFactory_Sysid,
.itemID = 0x001e } };
const CC13X2_26X2Config::Key CC13X2_26X2Config::kConfigKey_CalendarType = { { .systemID = kCC13X2_26X2ChipFactory_Sysid,
.itemID = 0x001f } };

/* Internal for the KVS interface. */
const CC13X2_26X2Config::Key CC13X2_26X2Config::kConfigKey_KVS_key = { { .systemID = kCC13X2_26X2ChipFactory_Sysid,
.itemID = 0x001e } };
.itemID = 0x0020 } };
const CC13X2_26X2Config::Key CC13X2_26X2Config::kConfigKey_KVS_value = { { .systemID = kCC13X2_26X2ChipFactory_Sysid,
.itemID = 0x001f } };
.itemID = 0x0021 } };

/* Static local variables */
static NVINTF_nvFuncts_t sNvoctpFps = { 0 };
Expand Down
2 changes: 2 additions & 0 deletions src/platform/cc13x2_26x2/CC13X2_26X2Config.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,8 @@ class CC13X2_26X2Config
static const Key kConfigKey_CountryCode;
static const Key kConfigKey_ActiveLocale;
static const Key kConfigKey_Breadcrumb;
static const Key kConfigKey_HourFormat;
static const Key kConfigKey_CalendarType;
static const Key kConfigKey_KVS_key; // special key for KVS system, key storage
static const Key kConfigKey_KVS_value; // special key for KVS system, value storage

Expand Down
Loading