fixed merged conflicts with latest code

project-chip · Oct 9, 2024 · 7c468b9 · 7c468b9
2 parents 399ddb7 + b19ffdf
commit 7c468b9
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 1 deletion.
diff --git a/examples/platform/linux/Options.cpp b/examples/platform/linux/Options.cpp
@@ -123,7 +123,6 @@ enum
 
  kDeviceOption_VendorName = 0x1028,
  kDeviceOption_ProductName = 0x1029,
-
  kDeviceOption_HardwareVersionString = 0x102a,
  kDeviceOption_SoftwareVersionString = 0x102b,
  kDeviceOption_SerialNumber = 0x102c,
@@ -707,13 +706,16 @@ bool HandleOption(const char * aProgram, OptionSet * aOptions, int aIdentifier,
  break;
  }
 #endif
+<<<<<<< HEAD
 #if CHIP_DEVICE_CONFIG_ENABLE_WIFIPAF
  case kDeviceOption_WiFi_PAF: {
  LinuxDeviceOptions::GetInstance().mWiFiPAF = true;
  LinuxDeviceOptions::GetInstance().mWiFiPAFExtCmds = aValue;
  break;
  }
 #endif
+=======
+>>>>>>> b19ffdfdca4e1cbaddbd0c737676d54b86a7c37a
  case kDeviceOption_VendorName:
  LinuxDeviceOptions::GetInstance().vendorName.SetValue(std::string{ aValue });
  break;

diff --git a/examples/platform/linux/Options.h b/examples/platform/linux/Options.h
@@ -87,10 +87,12 @@ struct LinuxDeviceOptions
  int32_t subscriptionCapacity = CHIP_IM_MAX_NUM_SUBSCRIPTIONS;
  int32_t subscriptionResumptionRetryIntervalSec = -1;
 #endif
+
 #if CHIP_CONFIG_USE_ACCESS_RESTRICTIONS
  chip::Optional<std::vector<chip::Access::AccessRestrictionProvider::Entry>> commissioningArlEntries;
  chip::Optional<std::vector<chip::Access::AccessRestrictionProvider::Entry>> arlEntries;
 #endif
+
  chip::Optional<std::string> vendorName;
  chip::Optional<std::string> productName;
  chip::Optional<std::string> hardwareVersionString;

diff --git a/src/platform/Infineon/PSOC6/PSOC6Config.cpp b/src/platform/Infineon/PSOC6/PSOC6Config.cpp
@@ -97,6 +97,15 @@ const P6Config::Key P6Config::kConfigKey_HardwareVersionString = { kConfigNamesp
 const P6Config::Key P6Config::kConfigKey_SoftwareVersionString = { kConfigNamespace_ChipConfig, "software-version-string" };
 ;
 
+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 PSOC6Config::Key PSOC6Config::kCounterKey_RebootCount = { kConfigNamespace_ChipCounters, "reboot-count" };
 const PSOC6Config::Key PSOC6Config::kCounterKey_UpTime = { kConfigNamespace_ChipCounters, "up-time" };