🔥 Clean up arduino libs

This commit is contained in:
Rune Harlyk
2025-10-09 18:31:40 +02:00
parent bc31b1b2dd
commit b184449e7b
19 changed files with 31 additions and 76 deletions
+5 -8
View File
@@ -1,8 +1,6 @@
#ifndef JsonUtils_h
#define JsonUtils_h
#pragma once
#include <Arduino.h>
#include <utils/ip_utils.h>
#include <ArduinoJson.h>
#include <string>
@@ -11,22 +9,21 @@ class JsonUtils {
static void readIP(const JsonVariant &root, const std::string &key, IPAddress &ip, const std::string &def) {
IPAddress defaultIp = {};
if (!defaultIp.fromString(def.c_str())) {
defaultIp = INADDR_NONE;
defaultIp = IPAddress(0, 0, 0, 0);
}
readIP(root, key, ip, defaultIp);
}
static void readIP(const JsonVariant &root, const std::string &key, IPAddress &ip,
const IPAddress &defaultIp = INADDR_NONE) {
const IPAddress &defaultIp = IPAddress(0, 0, 0, 0)) {
if (!root[key].is<std::string>() || !ip.fromString(root[key].as<std::string>().c_str())) {
ip = defaultIp;
}
}
static void writeIP(JsonVariant &root, const std::string &key, const IPAddress &ip) {
if (IPUtils::isSet(ip)) {
if (ip != IPAddress(0, 0, 0, 0)) {
root[key] = ip.toString();
}
}
};
#endif // end JsonUtils
};