Darkages/SpotMicroESP32-Leika
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

🪄 Formats JsonUtils

Browse Source
This commit is contained in:
Rune Harlyk
2024-07-09 20:07:32 +02:00
committed by Rune Harlyk
parent 2d57fc5fee
commit cee796c705
1 changed files with 8 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files
esp32/lib/ESP32-sveltekit/JsonUtils.h
+8 -15
View File
@@ -19,29 +19,22 @@
#include <IPUtils.h> #include <IPUtils.h>
#include <ArduinoJson.h> #include <ArduinoJson.h>
class JsonUtils class JsonUtils {
{ public:
public: static void readIP(JsonObject &root, const String &key, IPAddress &ip, const String &def) {
static void readIP(JsonObject &root, const String &key, IPAddress &ip, const String &def)
{
IPAddress defaultIp = {}; IPAddress defaultIp = {};
if (!defaultIp.fromString(def)) if (!defaultIp.fromString(def)) {
{
defaultIp = INADDR_NONE; defaultIp = INADDR_NONE;
} }
readIP(root, key, ip, defaultIp); readIP(root, key, ip, defaultIp);
} }
static void readIP(JsonObject &root, const String &key, IPAddress &ip, const IPAddress &defaultIp = INADDR_NONE) static void readIP(JsonObject &root, const String &key, IPAddress &ip, const IPAddress &defaultIp = INADDR_NONE) {
{ if (!root[key].is<String>() || !ip.fromString(root[key].as<String>())) {
if (!root[key].is<String>() || !ip.fromString(root[key].as<String>()))
{
ip = defaultIp; ip = defaultIp;
} }
} }
static void writeIP(JsonObject &root, const String &key, const IPAddress &ip) static void writeIP(JsonObject &root, const String &key, const IPAddress &ip) {
{ if (IPUtils::isSet(ip)) {
if (IPUtils::isSet(ip))
{
root[key] = ip.toString(); root[key] = ip.toString();
} }
} }