patrick/OpenDTU-old
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fixed issue in webapi that a inverter serial has to be read as hex

Browse Source
This commit is contained in:
Thomas Basler 2022-05-31 19:26:26 +02:00
parent 87da5ef63d
commit b597e907de
1 changed files with 15 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/WebApi.cpp
View File

@ -618,8 +618,14 @@ void WebApiClass::onInverterList(AsyncWebServerRequest* request)
if (config.Inverter[i].Serial > 0) { if (config.Inverter[i].Serial > 0) {
JsonObject obj = data.createNestedObject(); JsonObject obj = data.createNestedObject();
obj[F("id")] = i; obj[F("id")] = i;
obj[F("serial")] = config.Inverter[i].Serial;
obj[F("name")] = String(config.Inverter[i].Name); obj[F("name")] = String(config.Inverter[i].Name);
// Inverter Serial is read as HEX
char buffer[sizeof(uint64_t) * 8 + 1];
sprintf(buffer, "%0lx%08lx",
((uint32_t)((config.Inverter[i].Serial >> 32) & 0xFFFFFFFF)),
((uint32_t)(config.Inverter[i].Serial & 0xFFFFFFFF)));
obj[F("serial")] = buffer;
} }
} }
@ -689,7 +695,10 @@ void WebApiClass::onInverterAdd(AsyncWebServerRequest* request)
return; return;
} }
inverter->Serial = root[F("serial")].as<uint64_t>(); char* t;
// Interpret the string as a hex value and convert it to uint64_t
inverter->Serial = strtoll(root[F("serial")].as<String>().c_str(), &t, 16);
strncpy(inverter->Name, root[F("name")].as<String>().c_str(), INV_MAX_NAME_STRLEN); strncpy(inverter->Name, root[F("name")].as<String>().c_str(), INV_MAX_NAME_STRLEN);
Configuration.write(); Configuration.write();
@ -763,7 +772,10 @@ void WebApiClass::onInverterEdit(AsyncWebServerRequest* request)
} }
INVERTER_CONFIG_T& inverter = Configuration.get().Inverter[root[F("id")].as<uint8_t>()]; INVERTER_CONFIG_T& inverter = Configuration.get().Inverter[root[F("id")].as<uint8_t>()];
inverter.Serial = root[F("serial")].as<uint64_t>();
char* t;
// Interpret the string as a hex value and convert it to uint64_t
inverter.Serial = strtoll(root[F("serial")].as<String>().c_str(), &t, 16);
strncpy(inverter.Name, root[F("name")].as<String>().c_str(), INV_MAX_NAME_STRLEN); strncpy(inverter.Name, root[F("name")].as<String>().c_str(), INV_MAX_NAME_STRLEN);
Configuration.write(); Configuration.write();