♻️ Replaces JsonObject with JsonVariant

This commit is contained in:
Rune Harlyk
2025-07-10 17:34:52 +02:00
committed by Rune Harlyk
parent 144b99c180
commit e3cfe89e19
19 changed files with 75 additions and 79 deletions
+3 -3
View File
@@ -7,7 +7,7 @@
class JsonUtils {
public:
static void readIP(const JsonObject &root, const String &key, IPAddress &ip, const String &def) {
static void readIP(const JsonVariant &root, const String &key, IPAddress &ip, const String &def) {
IPAddress defaultIp = {};
if (!defaultIp.fromString(def)) {
defaultIp = INADDR_NONE;
@@ -15,14 +15,14 @@ class JsonUtils {
readIP(root, key, ip, defaultIp);
}
static void readIP(const JsonObject &root, const String &key, IPAddress &ip,
static void readIP(const JsonVariant &root, const String &key, IPAddress &ip,
const IPAddress &defaultIp = INADDR_NONE) {
if (!root[key].is<String>() || !ip.fromString(root[key].as<String>())) {
ip = defaultIp;
}
}
static void writeIP(JsonObject &root, const String &key, const IPAddress &ip) {
static void writeIP(JsonVariant &root, const String &key, const IPAddress &ip) {
if (IPUtils::isSet(ip)) {
root[key] = ip.toString();
}