[Sysinfo] Fix some code/logic duplication

TD-er · Aug 22, 2022 · dfe7a53 · dfe7a53
1 parent 9bcb5b4
commit dfe7a53
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 4 deletions.
diff --git a/src/src/Helpers/StringProvider.cpp b/src/src/Helpers/StringProvider.cpp
@@ -398,7 +398,7 @@ String getValue(LabelType::Enum label) {
     case LabelType::ESP_CHIP_REVISION:      return String(getChipRevision());
     case LabelType::ESP_CHIP_CORES:         return String(getChipCores());
     case LabelType::ESP_BOARD_NAME:         return get_board_name();
-    case LabelType::FLASH_CHIP_ID:          return String(getFlashChipId());
+    case LabelType::FLASH_CHIP_ID:          return formatToHex(getFlashChipId(), 6);
     case LabelType::FLASH_CHIP_VENDOR:      return formatToHex(getFlashChipId() & 0xFF, 2);
     case LabelType::FLASH_CHIP_MODEL:
     {

diff --git a/src/src/WebServer/SysInfoPage.cpp b/src/src/WebServer/SysInfoPage.cpp
@@ -173,11 +173,9 @@ void handle_sysinfo_json() {
 
   json_open(false, F("storage"));
 
-  uint32_t flashChipId = getFlashChipId();
-
   // Set to HEX may be something like 0x1640E0.
   // Where manufacturer is 0xE0 and device is 0x4016.
-  json_number(F("chip_id"), String(flashChipId));
+  json_number(F("chip_id"), getValue(LabelType::FLASH_CHIP_ID));
   if (flashChipVendorPuya()) {
     if (puyaSupport()) {
       json_prop(F("vendor"), F("puya, supported"));