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

♻️ Replaces JsonObject with JsonVariant

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
esp32/lib/ESP32-sveltekit/event_socket.cpp
+3 -3
View File
@@ -81,8 +81,8 @@ esp_err_t EventSocket::onFrame(PsychicWebSocketRequest *request, httpd_ws_frame
ESP_LOGV("EventSocket", "Disconnect: %s", event); ESP_LOGV("EventSocket", "Disconnect: %s", event);
client_subscriptions[event].remove(request->client()->socket()); client_subscriptions[event].remove(request->client()->socket());
} else if (message_type == EVENT) { } else if (message_type == EVENT) {
JsonObject jsonObject = msg[2].as<JsonObject>(); JsonVariant payload = msg[2].as<JsonVariant>();
handleEventCallbacks(event, jsonObject, request->client()->socket()); handleEventCallbacks(event, payload, request->client()->socket());
return ESP_OK; return ESP_OK;
} }
return ESP_OK; return ESP_OK;
@@ -149,7 +149,7 @@ void EventSocket::send(PsychicWebSocketClient *client, const char *data, size_t
#endif #endif
} }
void EventSocket::handleEventCallbacks(String event, JsonObject &jsonObject, int originId) { void EventSocket::handleEventCallbacks(String event, JsonVariant &jsonObject, int originId) {
for (auto &callback : event_callbacks[event]) { for (auto &callback : event_callbacks[event]) {
callback(jsonObject, originId); callback(jsonObject, originId);
} }
esp32/lib/ESP32-sveltekit/event_socket.h
+2 -2
View File
@@ -9,7 +9,7 @@
enum message_type_t { CONNECT = 0, DISCONNECT = 1, EVENT = 2, PING = 3, PONG = 4, BINARY_EVENT = 5 }; enum message_type_t { CONNECT = 0, DISCONNECT = 1, EVENT = 2, PING = 3, PONG = 4, BINARY_EVENT = 5 };
typedef std::function<void(JsonObject &root, int originId)> EventCallback; typedef std::function<void(JsonVariant &root, int originId)> EventCallback;
typedef std::function<void(const String &originId, bool sync)> SubscribeCallback; typedef std::function<void(const String &originId, bool sync)> SubscribeCallback;
class EventSocket { class EventSocket {
@@ -32,7 +32,7 @@ class EventSocket {
std::map<String, std::list<int>> client_subscriptions; std::map<String, std::list<int>> client_subscriptions;
std::map<String, std::list<EventCallback>> event_callbacks; std::map<String, std::list<EventCallback>> event_callbacks;
std::map<String, std::list<SubscribeCallback>> subscribe_callbacks; std::map<String, std::list<SubscribeCallback>> subscribe_callbacks;
void handleEventCallbacks(String event, JsonObject &jsonObject, int originId); void handleEventCallbacks(String event, JsonVariant &jsonObject, int originId);
void send(PsychicWebSocketClient *client, const char *data, size_t len); void send(PsychicWebSocketClient *client, const char *data, size_t len);
void handleSubscribeCallbacks(String event, const String &originId); void handleSubscribeCallbacks(String event, const String &originId);
esp32/lib/ESP32-sveltekit/mdns_service.cpp
+4 -4
View File
@@ -67,12 +67,12 @@ void MDNSService::addServices() {
esp_err_t MDNSService::getStatus(PsychicRequest *request) { esp_err_t MDNSService::getStatus(PsychicRequest *request) {
PsychicJsonResponse response = PsychicJsonResponse(request, false); PsychicJsonResponse response = PsychicJsonResponse(request, false);
JsonObject root = response.getRoot(); JsonVariant root = response.getRoot();
getStatus(root); getStatus(root);
return response.send(); return response.send();
} }
void MDNSService::getStatus(JsonObject &root) { void MDNSService::getStatus(JsonVariant &root) {
state().read(state(), root); state().read(state(), root);
root["started"] = _started; root["started"] = _started;
} }
@@ -82,7 +82,7 @@ esp_err_t MDNSService::queryServices(PsychicRequest *request, JsonVariant &json)
String proto = json["protocol"].as<String>(); String proto = json["protocol"].as<String>();
PsychicJsonResponse response = PsychicJsonResponse(request, false); PsychicJsonResponse response = PsychicJsonResponse(request, false);
JsonObject root = response.getRoot(); JsonVariant root = response.getRoot();
ESP_LOGI(TAG, "Querying for service: %s, protocol: %s", service.c_str(), proto.c_str()); ESP_LOGI(TAG, "Querying for service: %s, protocol: %s", service.c_str(), proto.c_str());
@@ -91,7 +91,7 @@ esp_err_t MDNSService::queryServices(PsychicRequest *request, JsonVariant &json)
JsonArray servicesArray = root["services"].to<JsonArray>(); JsonArray servicesArray = root["services"].to<JsonArray>();
for (int i = 0; i < n; i++) { for (int i = 0; i < n; i++) {
JsonObject serviceObj = servicesArray.add<JsonObject>(); JsonVariant serviceObj = servicesArray.add<JsonVariant>();
serviceObj["name"] = MDNS.hostname(i); serviceObj["name"] = MDNS.hostname(i);
serviceObj["ip"] = MDNS.IP(i); serviceObj["ip"] = MDNS.IP(i);
serviceObj["port"] = MDNS.port(i); serviceObj["port"] = MDNS.port(i);
esp32/lib/ESP32-sveltekit/mdns_service.h
+1 -1
View File
@@ -25,7 +25,7 @@ class MDNSService : public StatefulService<MDNSSettings> {
void begin(); void begin();
esp_err_t getStatus(PsychicRequest *request); esp_err_t getStatus(PsychicRequest *request);
void getStatus(JsonObject &root); void getStatus(JsonVariant &root);
static esp_err_t queryServices(PsychicRequest *request, JsonVariant &json); static esp_err_t queryServices(PsychicRequest *request, JsonVariant &json);
esp32/lib/ESP32-sveltekit/motion.h
+12 -12
View File
@@ -24,13 +24,13 @@ class MotionService {
MotionService(ServoController *servoController) : _servoController(servoController) {} MotionService(ServoController *servoController) : _servoController(servoController) {}
void begin() { void begin() {
socket.onEvent(INPUT_EVENT, [&](JsonObject &root, int originId) { handleInput(root, originId); }); socket.onEvent(INPUT_EVENT, [&](JsonVariant &root, int originId) { handleInput(root, originId); });
socket.onEvent(MODE_EVENT, [&](JsonObject &root, int originId) { handleMode(root, originId); }); socket.onEvent(MODE_EVENT, [&](JsonVariant &root, int originId) { handleMode(root, originId); });
socket.onEvent(ANGLES_EVENT, [&](JsonObject &root, int originId) { anglesEvent(root, originId); }); socket.onEvent(ANGLES_EVENT, [&](JsonVariant &root, int originId) { anglesEvent(root, originId); });
socket.onEvent(POSITION_EVENT, [&](JsonObject &root, int originId) { positionEvent(root, originId); }); socket.onEvent(POSITION_EVENT, [&](JsonVariant &root, int originId) { positionEvent(root, originId); });
socket.onSubscribe(ANGLES_EVENT, socket.onSubscribe(ANGLES_EVENT,
std::bind(&MotionService::syncAngles, this, std::placeholders::_1, std::placeholders::_2)); std::bind(&MotionService::syncAngles, this, std::placeholders::_1, std::placeholders::_2));
@@ -38,16 +38,16 @@ class MotionService {
body_state.updateFeet(kinematics.default_feet_positions); body_state.updateFeet(kinematics.default_feet_positions);
} }
void anglesEvent(JsonObject &root, int originId) { void anglesEvent(JsonVariant &root, int originId) {
JsonArray array = root["data"].as<JsonArray>(); JsonArray array = root.as<JsonArray>();
for (int i = 0; i < 12; i++) { for (int i = 0; i < 12; i++) {
angles[i] = array[i]; angles[i] = array[i];
} }
syncAngles(String(originId)); syncAngles(String(originId));
} }
void positionEvent(JsonObject &root, int originId) { void positionEvent(JsonVariant &root, int originId) {
JsonArray array = root["data"].as<JsonArray>(); JsonArray array = root.as<JsonArray>();
body_state.omega = array[0]; body_state.omega = array[0];
body_state.phi = array[1]; body_state.phi = array[1];
body_state.psi = array[2]; body_state.psi = array[2];
@@ -56,8 +56,8 @@ class MotionService {
body_state.zm = array[5]; body_state.zm = array[5];
} }
void handleInput(JsonObject &root, int originId) { void handleInput(JsonVariant &root, int originId) {
JsonArray array = root["data"].as<JsonArray>(); JsonArray array = root.as<JsonArray>();
command.lx = array[1]; command.lx = array[1];
command.lx = array[1]; command.lx = array[1];
command.ly = array[2]; command.ly = array[2];
@@ -81,8 +81,8 @@ class MotionService {
} }
} }
void handleMode(JsonObject &root, int originId) { void handleMode(JsonVariant &root, int originId) {
motionState = static_cast<MOTION_STATE>(root["data"].as<int>()); motionState = static_cast<MOTION_STATE>(root.as<int>());
ESP_LOGV("MotionService", "Mode %d", motionState); ESP_LOGV("MotionService", "Mode %d", motionState);
motionState == MOTION_STATE::DEACTIVATED ? _servoController->deactivate() : _servoController->activate(); motionState == MOTION_STATE::DEACTIVATED ? _servoController->deactivate() : _servoController->activate();
JsonDocument doc; JsonDocument doc;
esp32/lib/ESP32-sveltekit/peripherals/peripherals.h
+1 -1
View File
@@ -55,7 +55,7 @@ class Peripherals : public StatefulService<PeripheralsConfiguration> {
_eventEndpoint.begin(); _eventEndpoint.begin();
_persistence.readFromFS(); _persistence.readFromFS();
socket.onEvent(EVENT_I2C_SCAN, [&](JsonObject &root, int originId) { socket.onEvent(EVENT_I2C_SCAN, [&](JsonVariant &root, int originId) {
scanI2C(); scanI2C();
emitI2C(); emitI2C();
}); });
esp32/lib/ESP32-sveltekit/peripherals/servo_controller.h
+5 -5
View File
@@ -33,12 +33,12 @@ class ServoController : public StatefulService<ServoSettings> {
void begin() { void begin() {
socket.onEvent(EVENT_SERVO_CONFIGURATION_SETTINGS, socket.onEvent(EVENT_SERVO_CONFIGURATION_SETTINGS,
[&](JsonObject &root, int originId) { servoEvent(root, originId); }); [&](JsonVariant &root, int originId) { servoEvent(root, originId); });
socket.onEvent(EVENT_SERVO_STATE, [&](JsonObject &root, int originId) { stateUpdate(root, originId); }); socket.onEvent(EVENT_SERVO_STATE, [&](JsonVariant &root, int originId) { stateUpdate(root, originId); });
_persistence.readFromFS(); _persistence.readFromFS();
initializePCA(); initializePCA();
socket.onEvent(EVENT_SERVO_STATE, [&](JsonObject &root, int originId) { socket.onEvent(EVENT_SERVO_STATE, [&](JsonVariant &root, int originId) {
is_active = root["active"] | false; is_active = root["active"] | false;
is_active ? activate() : deactivate(); is_active ? activate() : deactivate();
}); });
@@ -66,13 +66,13 @@ class ServoController : public StatefulService<ServoSettings> {
_pca.sleep(); _pca.sleep();
} }
void stateUpdate(JsonObject &root, int originId) { void stateUpdate(JsonVariant &root, int originId) {
bool active = root["active"].as<bool>(); bool active = root["active"].as<bool>();
ESP_LOGI("SERVOCONTROLLER", "Setting state %d", active); ESP_LOGI("SERVOCONTROLLER", "Setting state %d", active);
active ? activate() : deactivate(); active ? activate() : deactivate();
} }
void servoEvent(JsonObject &root, int originId) { void servoEvent(JsonVariant &root, int originId) {
control_state = SERVO_CONTROL_STATE::PWM; control_state = SERVO_CONTROL_STATE::PWM;
int8_t servo_id = root["servo_id"]; int8_t servo_id = root["servo_id"];
uint16_t pwm = root["pwm"].as<uint16_t>(); uint16_t pwm = root["pwm"].as<uint16_t>();
esp32/lib/ESP32-sveltekit/settings/ap_settings.h
+2 -2
View File
@@ -75,7 +75,7 @@ class APSettings {
localIP == settings.localIP && gatewayIP == settings.gatewayIP && subnetMask == settings.subnetMask; localIP == settings.localIP && gatewayIP == settings.gatewayIP && subnetMask == settings.subnetMask;
} }
static void read(APSettings &settings, JsonObject &root) { static void read(APSettings &settings, JsonVariant &root) {
root["provision_mode"] = settings.provisionMode; root["provision_mode"] = settings.provisionMode;
root["ssid"] = settings.ssid; root["ssid"] = settings.ssid;
root["password"] = settings.password; root["password"] = settings.password;
@@ -87,7 +87,7 @@ class APSettings {
root["subnet_mask"] = settings.subnetMask.toString(); root["subnet_mask"] = settings.subnetMask.toString();
} }
static StateUpdateResult update(JsonObject &root, APSettings &settings) { static StateUpdateResult update(JsonVariant &root, APSettings &settings) {
APSettings newSettings = {}; APSettings newSettings = {};
newSettings.provisionMode = root["provision_mode"] | FACTORY_AP_PROVISION_MODE; newSettings.provisionMode = root["provision_mode"] | FACTORY_AP_PROVISION_MODE;
switch (settings.provisionMode) { switch (settings.provisionMode) {
esp32/lib/ESP32-sveltekit/settings/camera_settings.h
+2 -2
View File
@@ -39,7 +39,7 @@ class CameraSettings {
uint8_t dcw; uint8_t dcw;
uint8_t colorbar; uint8_t colorbar;
static void read(CameraSettings &settings, JsonObject &root) { static void read(CameraSettings &settings, JsonVariant &root) {
root["pixformat"] = settings.pixformat; root["pixformat"] = settings.pixformat;
root["framesize"] = settings.framesize; root["framesize"] = settings.framesize;
root["quality"] = settings.quality; root["quality"] = settings.quality;
@@ -71,7 +71,7 @@ class CameraSettings {
root["colorbar"] = settings.colorbar; root["colorbar"] = settings.colorbar;
} }
static StateUpdateResult update(JsonObject &root, CameraSettings &settings) { static StateUpdateResult update(JsonVariant &root, CameraSettings &settings) {
settings.pixformat = root["pixformat"]; settings.pixformat = root["pixformat"];
settings.framesize = root["framesize"]; settings.framesize = root["framesize"];
settings.brightness = root["brightness"]; settings.brightness = root["brightness"];
esp32/lib/ESP32-sveltekit/settings/mdns_settings.h
+12 -12
View File
@@ -18,12 +18,12 @@ typedef struct {
String key; String key;
String value; String value;
void serialize(JsonObject &json) const { void serialize(JsonVariant &json) const {
json["key"] = key; json["key"] = key;
json["value"] = value; json["value"] = value;
} }
bool deserialize(const JsonObject &json) { bool deserialize(const JsonVariant &json) {
key = json["key"].as<String>(); key = json["key"].as<String>();
value = json["value"].as<String>(); value = json["value"].as<String>();
@@ -37,7 +37,7 @@ typedef struct {
uint16_t port; uint16_t port;
std::vector<mdns_txt_record_t> txtRecords; std::vector<mdns_txt_record_t> txtRecords;
void serialize(JsonObject &json) const { void serialize(JsonVariant &json) const {
json["service"] = service; json["service"] = service;
json["protocol"] = protocol; json["protocol"] = protocol;
json["port"] = port; json["port"] = port;
@@ -45,13 +45,13 @@ typedef struct {
if (txtRecords.size() > 0) { if (txtRecords.size() > 0) {
JsonArray txtArray = json["txt_records"].to<JsonArray>(); JsonArray txtArray = json["txt_records"].to<JsonArray>();
for (const auto &txt : txtRecords) { for (const auto &txt : txtRecords) {
JsonObject txtObj = txtArray.add<JsonObject>(); JsonVariant txtObj = txtArray.add<JsonVariant>();
txt.serialize(txtObj); txt.serialize(txtObj);
} }
} }
} }
bool deserialize(const JsonObject &json) { bool deserialize(const JsonVariant &json) {
service = json["service"].as<String>(); service = json["service"].as<String>();
protocol = json["protocol"].as<String>(); protocol = json["protocol"].as<String>();
port = json["port"] | 0; port = json["port"] | 0;
@@ -59,7 +59,7 @@ typedef struct {
txtRecords.clear(); txtRecords.clear();
if (json["txt_records"].is<JsonArray>()) { if (json["txt_records"].is<JsonArray>()) {
JsonArray txtArray = json["txt_records"]; JsonArray txtArray = json["txt_records"];
for (JsonObject txtObj : txtArray) { for (JsonVariant txtObj : txtArray) {
mdns_txt_record_t txt; mdns_txt_record_t txt;
if (txt.deserialize(txtObj)) { if (txt.deserialize(txtObj)) {
txtRecords.push_back(txt); txtRecords.push_back(txt);
@@ -78,31 +78,31 @@ class MDNSSettings {
std::vector<mdns_service_t> services; std::vector<mdns_service_t> services;
std::vector<mdns_txt_record_t> globalTxtRecords; std::vector<mdns_txt_record_t> globalTxtRecords;
static void read(MDNSSettings &settings, JsonObject &root) { static void read(MDNSSettings &settings, JsonVariant &root) {
root["hostname"] = settings.hostname; root["hostname"] = settings.hostname;
root["instance"] = settings.instance; root["instance"] = settings.instance;
JsonArray servicesArray = root["services"].to<JsonArray>(); JsonArray servicesArray = root["services"].to<JsonArray>();
for (const auto &service : settings.services) { for (const auto &service : settings.services) {
JsonObject serviceObj = servicesArray.add<JsonObject>(); JsonVariant serviceObj = servicesArray.add<JsonVariant>();
service.serialize(serviceObj); service.serialize(serviceObj);
} }
JsonArray txtArray = root["global_txt_records"].to<JsonArray>(); JsonArray txtArray = root["global_txt_records"].to<JsonArray>();
for (const auto &txt : settings.globalTxtRecords) { for (const auto &txt : settings.globalTxtRecords) {
JsonObject txtObj = txtArray.add<JsonObject>(); JsonVariant txtObj = txtArray.add<JsonVariant>();
txt.serialize(txtObj); txt.serialize(txtObj);
} }
} }
static StateUpdateResult update(JsonObject &root, MDNSSettings &settings) { static StateUpdateResult update(JsonVariant &root, MDNSSettings &settings) {
settings.hostname = root["hostname"] | FACTORY_MDNS_HOSTNAME; settings.hostname = root["hostname"] | FACTORY_MDNS_HOSTNAME;
settings.instance = root["instance"] | FACTORY_MDNS_INSTANCE; settings.instance = root["instance"] | FACTORY_MDNS_INSTANCE;
settings.services.clear(); settings.services.clear();
if (root["services"].is<JsonArray>()) { if (root["services"].is<JsonArray>()) {
JsonArray servicesArray = root["services"]; JsonArray servicesArray = root["services"];
for (JsonObject serviceObj : servicesArray) { for (JsonVariant serviceObj : servicesArray) {
mdns_service_t service; mdns_service_t service;
if (service.deserialize(serviceObj)) { if (service.deserialize(serviceObj)) {
settings.services.push_back(service); settings.services.push_back(service);
@@ -121,7 +121,7 @@ class MDNSSettings {
settings.globalTxtRecords.clear(); settings.globalTxtRecords.clear();
if (root["global_txt_records"].is<JsonArray>()) { if (root["global_txt_records"].is<JsonArray>()) {
JsonArray txtArray = root["global_txt_records"]; JsonArray txtArray = root["global_txt_records"];
for (JsonObject txtObj : txtArray) { for (JsonVariant txtObj : txtArray) {
mdns_txt_record_t txt; mdns_txt_record_t txt;
if (txt.deserialize(txtObj)) { if (txt.deserialize(txtObj)) {
settings.globalTxtRecords.push_back(txt); settings.globalTxtRecords.push_back(txt);
esp32/lib/ESP32-sveltekit/settings/ntp_settings.h
+2 -2
View File
@@ -25,14 +25,14 @@ class NTPSettings {
String tzFormat; String tzFormat;
String server; String server;
static void read(NTPSettings &settings, JsonObject &root) { static void read(NTPSettings &settings, JsonVariant &root) {
root["enabled"] = settings.enabled; root["enabled"] = settings.enabled;
root["server"] = settings.server; root["server"] = settings.server;
root["tz_label"] = settings.tzLabel; root["tz_label"] = settings.tzLabel;
root["tz_format"] = settings.tzFormat; root["tz_format"] = settings.tzFormat;
} }
static StateUpdateResult update(JsonObject &root, NTPSettings &settings) { static StateUpdateResult update(JsonVariant &root, NTPSettings &settings) {
settings.enabled = root["enabled"] | FACTORY_NTP_ENABLED; settings.enabled = root["enabled"] | FACTORY_NTP_ENABLED;
settings.server = root["server"] | FACTORY_NTP_SERVER; settings.server = root["server"] | FACTORY_NTP_SERVER;
settings.tzLabel = root["tz_label"] | FACTORY_NTP_TIME_ZONE_LABEL; settings.tzLabel = root["tz_label"] | FACTORY_NTP_TIME_ZONE_LABEL;
esp32/lib/ESP32-sveltekit/settings/peripherals_settings.h
+2 -2
View File
@@ -34,13 +34,13 @@ class PeripheralsConfiguration {
long frequency = I2C_FREQUENCY; long frequency = I2C_FREQUENCY;
std::vector<PinConfig> pins; std::vector<PinConfig> pins;
static void read(PeripheralsConfiguration &settings, JsonObject &root) { static void read(PeripheralsConfiguration &settings, JsonVariant &root) {
root["sda"] = settings.sda; root["sda"] = settings.sda;
root["scl"] = settings.scl; root["scl"] = settings.scl;
root["frequency"] = settings.frequency; root["frequency"] = settings.frequency;
} }
static StateUpdateResult update(JsonObject &root, PeripheralsConfiguration &settings) { static StateUpdateResult update(JsonVariant &root, PeripheralsConfiguration &settings) {
settings.sda = root["sda"] | SDA_PIN; settings.sda = root["sda"] | SDA_PIN;
settings.scl = root["scl"] | SCL_PIN; settings.scl = root["scl"] | SCL_PIN;
settings.frequency = root["frequency"] | I2C_FREQUENCY; settings.frequency = root["frequency"] | I2C_FREQUENCY;
esp32/lib/ESP32-sveltekit/settings/servo_settings.h
+4 -4
View File
@@ -19,22 +19,22 @@ class ServoSettings {
{306, -1, 0, 2.2, "Servo4"}, {306, -1, 45, 2.1055555, "Servo5"}, {306, -1, -90, 1.96923, "Servo6"}, {306, -1, 0, 2.2, "Servo4"}, {306, -1, 45, 2.1055555, "Servo5"}, {306, -1, -90, 1.96923, "Servo6"},
{306, 1, 0, 2.2, "Servo7"}, {306, 1, -45, 2.1055555, "Servo8"}, {306, 1, 90, 1.96923, "Servo9"}, {306, 1, 0, 2.2, "Servo7"}, {306, 1, -45, 2.1055555, "Servo8"}, {306, 1, 90, 1.96923, "Servo9"},
{306, 1, 0, 2.2, "Servo10"}, {306, -1, 45, 2.1055555, "Servo11"}, {306, -1, -90, 1.96923, "Servo12"}}; {306, 1, 0, 2.2, "Servo10"}, {306, -1, 45, 2.1055555, "Servo11"}, {306, -1, -90, 1.96923, "Servo12"}};
static void read(ServoSettings &settings, JsonObject &root) { static void read(ServoSettings &settings, JsonVariant &root) {
JsonArray servos = root["servos"].to<JsonArray>(); JsonArray servos = root["servos"].to<JsonArray>();
for (auto &servo : settings.servos) { for (auto &servo : settings.servos) {
JsonObject newServo = servos.add<JsonObject>(); JsonVariant newServo = servos.add<JsonVariant>();
newServo["center_pwm"] = servo.centerPwm; newServo["center_pwm"] = servo.centerPwm;
newServo["direction"] = servo.direction; newServo["direction"] = servo.direction;
newServo["center_angle"] = servo.centerAngle; newServo["center_angle"] = servo.centerAngle;
newServo["conversion"] = servo.conversion; newServo["conversion"] = servo.conversion;
} }
} }
static StateUpdateResult update(JsonObject &root, ServoSettings &settings) { static StateUpdateResult update(JsonVariant &root, ServoSettings &settings) {
if (root["servos"].is<JsonArray>()) { if (root["servos"].is<JsonArray>()) {
JsonArray servosJson = root["servos"]; JsonArray servosJson = root["servos"];
int i = 0; int i = 0;
for (auto servo : servosJson) { for (auto servo : servosJson) {
JsonObject servoObject = servo.as<JsonObject>(); JsonVariant servoObject = servo.as<JsonVariant>();
uint8_t servoId = i; // servoObject["id"].as<uint8_t>(); uint8_t servoId = i; // servoObject["id"].as<uint8_t>();
settings.servos[servoId].centerPwm = servoObject["center_pwm"].as<float>(); settings.servos[servoId].centerPwm = servoObject["center_pwm"].as<float>();
settings.servos[servoId].centerAngle = servoObject["center_angle"].as<float>(); settings.servos[servoId].centerAngle = servoObject["center_angle"].as<float>();
esp32/lib/ESP32-sveltekit/settings/wifi_settings.h
+6 -6
View File
@@ -37,7 +37,7 @@ typedef struct {
IPAddress dnsIP2; IPAddress dnsIP2;
bool available; bool available;
void serialize(JsonObject &json) const { void serialize(JsonVariant &json) const {
json["ssid"] = ssid; json["ssid"] = ssid;
json["password"] = password; json["password"] = password;
json["static_ip_config"] = staticIPConfig; json["static_ip_config"] = staticIPConfig;
@@ -50,7 +50,7 @@ typedef struct {
} }
} }
bool deserialize(const JsonObject &json) { bool deserialize(const JsonVariant &json) {
String newSsid = json["ssid"].as<String>(); String newSsid = json["ssid"].as<String>();
String newPassword = json["password"].as<String>(); String newPassword = json["password"].as<String>();
if (newSsid.length() < 1 || newSsid.length() > 31 || newPassword.length() > 64) { if (newSsid.length() < 1 || newSsid.length() > 31 || newPassword.length() > 64) {
@@ -98,24 +98,24 @@ class WiFiSettings {
String hostname; String hostname;
bool priorityBySignalStrength; bool priorityBySignalStrength;
std::vector<wifi_settings_t> wifiSettings; std::vector<wifi_settings_t> wifiSettings;
static void read(WiFiSettings &settings, JsonObject &root) { static void read(WiFiSettings &settings, JsonVariant &root) {
root["hostname"] = settings.hostname; root["hostname"] = settings.hostname;
root["priority_RSSI"] = settings.priorityBySignalStrength; root["priority_RSSI"] = settings.priorityBySignalStrength;
JsonArray wifiNetworks = root["wifi_networks"].to<JsonArray>(); JsonArray wifiNetworks = root["wifi_networks"].to<JsonArray>();
for (const auto &wifi : settings.wifiSettings) { for (const auto &wifi : settings.wifiSettings) {
JsonObject wifiNetwork = wifiNetworks.add<JsonObject>(); JsonVariant wifiNetwork = wifiNetworks.add<JsonVariant>();
wifi.serialize(wifiNetwork); wifi.serialize(wifiNetwork);
} }
ESP_LOGV("WiFiSettings", "WiFi Settings read"); ESP_LOGV("WiFiSettings", "WiFi Settings read");
} }
static StateUpdateResult update(JsonObject &root, WiFiSettings &settings) { static StateUpdateResult update(JsonVariant &root, WiFiSettings &settings) {
settings.hostname = root["hostname"] | FACTORY_WIFI_HOSTNAME; settings.hostname = root["hostname"] | FACTORY_WIFI_HOSTNAME;
settings.priorityBySignalStrength = root["priority_RSSI"] | true; settings.priorityBySignalStrength = root["priority_RSSI"] | true;
settings.wifiSettings.clear(); settings.wifiSettings.clear();
if (root["wifi_networks"].is<JsonArray>()) { if (root["wifi_networks"].is<JsonArray>()) {
JsonArray wifiNetworks = root["wifi_networks"]; JsonArray wifiNetworks = root["wifi_networks"];
int networkCount = 0; int networkCount = 0;
for (JsonObject wifiNetwork : wifiNetworks) { for (JsonVariant wifiNetwork : wifiNetworks) {
if (networkCount >= 5) { if (networkCount >= 5) {
ESP_LOGE("WiFiSettings", "Too many wifi networks"); ESP_LOGE("WiFiSettings", "Too many wifi networks");
break; break;
esp32/lib/ESP32-sveltekit/template/stateful_endpoint.h
+2 -4
View File
@@ -21,9 +21,7 @@ class StatefulHttpEndpoint {
: _stateReader(stateReader), _stateUpdater(stateUpdater), _statefulService(statefulService) {} : _stateReader(stateReader), _stateUpdater(stateUpdater), _statefulService(statefulService) {}
esp_err_t handleStateUpdate(PsychicRequest *request, JsonVariant &json) { esp_err_t handleStateUpdate(PsychicRequest *request, JsonVariant &json) {
if (!json.is<JsonObject>()) return request->reply(400); JsonVariant jsonObject = json.as<JsonVariant>();
JsonObject jsonObject = json.as<JsonObject>();
StateUpdateResult outcome = _statefulService->updateWithoutPropagation(jsonObject, _stateUpdater); StateUpdateResult outcome = _statefulService->updateWithoutPropagation(jsonObject, _stateUpdater);
if (outcome == StateUpdateResult::ERROR) if (outcome == StateUpdateResult::ERROR)
@@ -43,7 +41,7 @@ class StatefulHttpEndpoint {
esp_err_t getState(PsychicRequest *request) { esp_err_t getState(PsychicRequest *request) {
PsychicJsonResponse response = PsychicJsonResponse(request, false); PsychicJsonResponse response = PsychicJsonResponse(request, false);
JsonObject jsonObject = response.getRoot(); JsonVariant jsonObject = response.getRoot();
_statefulService->read(jsonObject, _stateReader); _statefulService->read(jsonObject, _stateReader);
return response.send(); return response.send();
} }
esp32/lib/ESP32-sveltekit/template/stateful_persistence.h
+4 -4
View File
@@ -39,8 +39,8 @@ class FSPersistence {
if (settingsFile) { if (settingsFile) {
JsonDocument jsonDocument; JsonDocument jsonDocument;
DeserializationError error = deserializeJson(jsonDocument, settingsFile); DeserializationError error = deserializeJson(jsonDocument, settingsFile);
if (error == DeserializationError::Ok && jsonDocument.is<JsonObject>()) { if (error == DeserializationError::Ok) {
JsonObject jsonObject = jsonDocument.as<JsonObject>(); JsonVariant jsonObject = jsonDocument.as<JsonVariant>();
_statefulService->updateWithoutPropagation(jsonObject, _stateUpdater); _statefulService->updateWithoutPropagation(jsonObject, _stateUpdater);
settingsFile.close(); settingsFile.close();
return; return;
@@ -59,7 +59,7 @@ class FSPersistence {
bool writeToFS() { bool writeToFS() {
JsonDocument jsonDocument; JsonDocument jsonDocument;
JsonObject jsonObject = jsonDocument.to<JsonObject>(); JsonVariant jsonObject = jsonDocument.to<JsonVariant>();
_statefulService->read(jsonObject, _stateReader); _statefulService->read(jsonObject, _stateReader);
mkdirs(); mkdirs();
@@ -112,7 +112,7 @@ class FSPersistence {
// is supplied, this virtual function allows that to be changed. // is supplied, this virtual function allows that to be changed.
virtual void applyDefaults() { virtual void applyDefaults() {
JsonDocument jsonDocument; JsonDocument jsonDocument;
JsonObject jsonObject = jsonDocument.as<JsonObject>(); JsonVariant jsonObject = jsonDocument.as<JsonVariant>();
_statefulService->updateWithoutPropagation(jsonObject, _stateUpdater); _statefulService->updateWithoutPropagation(jsonObject, _stateUpdater);
} }
}; };
esp32/lib/ESP32-sveltekit/template/stateful_service.h
+5 -5
View File
@@ -11,10 +11,10 @@
#include <template/state_result.h> #include <template/state_result.h>
template <typename T> template <typename T>
using JsonStateUpdater = std::function<StateUpdateResult(JsonObject &root, T &settings)>; using JsonStateUpdater = std::function<StateUpdateResult(JsonVariant &root, T &settings)>;
template <typename T> template <typename T>
using JsonStateReader = std::function<void(T &settings, JsonObject &root)>; using JsonStateReader = std::function<void(T &settings, JsonVariant &root)>;
using HandlerId = size_t; using HandlerId = size_t;
using StateUpdateCallback = std::function<void(const String &originId)>; using StateUpdateCallback = std::function<void(const String &originId)>;
@@ -98,7 +98,7 @@ class StatefulService {
return result; return result;
} }
StateUpdateResult update(JsonObject &jsonObject, JsonStateUpdater<T> stateUpdater, const String &originId) { StateUpdateResult update(JsonVariant &jsonObject, JsonStateUpdater<T> stateUpdater, const String &originId) {
lock(); lock();
StateUpdateResult result = stateUpdater(jsonObject, state_); StateUpdateResult result = stateUpdater(jsonObject, state_);
unlock(); unlock();
@@ -106,7 +106,7 @@ class StatefulService {
return result; return result;
} }
StateUpdateResult updateWithoutPropagation(JsonObject &jsonObject, JsonStateUpdater<T> stateUpdater) { StateUpdateResult updateWithoutPropagation(JsonVariant &jsonObject, JsonStateUpdater<T> stateUpdater) {
lock(); lock();
StateUpdateResult result = stateUpdater(jsonObject, state_); StateUpdateResult result = stateUpdater(jsonObject, state_);
unlock(); unlock();
@@ -119,7 +119,7 @@ class StatefulService {
unlock(); unlock();
} }
void read(JsonObject &jsonObject, JsonStateReader<T> stateReader) { void read(JsonVariant &jsonObject, JsonStateReader<T> stateReader) {
lock(); lock();
stateReader(state_, jsonObject); stateReader(state_, jsonObject);
unlock(); unlock();
esp32/lib/ESP32-sveltekit/template/stateful_socket.h
+3 -5
View File
@@ -27,16 +27,14 @@ class EventEndpoint {
StatefulService<T> *_statefulService; StatefulService<T> *_statefulService;
const char *_event; const char *_event;
void updateState(JsonObject &root, int originId) { void updateState(JsonVariant &root, int originId) {
_statefulService->update(root, _stateUpdater, String(originId)); _statefulService->update(root, _stateUpdater, String(originId));
} }
void syncState(const String &originId, bool sync = false) { void syncState(const String &originId, bool sync = false) {
JsonDocument jsonDocument; JsonDocument jsonDocument;
JsonObject root = jsonDocument.to<JsonObject>(); JsonVariant root = jsonDocument.to<JsonVariant>();
String output;
_statefulService->read(root, _stateReader); _statefulService->read(root, _stateReader);
JsonVariant obj = jsonDocument.as<JsonVariant>(); socket.emit(_event, root, originId.c_str(), sync);
socket.emit(_event, obj, originId.c_str(), sync);
} }
}; };
esp32/lib/ESP32-sveltekit/utils/json_utils.h
+3 -3
View File
@@ -7,7 +7,7 @@
class JsonUtils { class JsonUtils {
public: 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 = {}; IPAddress defaultIp = {};
if (!defaultIp.fromString(def)) { if (!defaultIp.fromString(def)) {
defaultIp = INADDR_NONE; defaultIp = INADDR_NONE;
@@ -15,14 +15,14 @@ class JsonUtils {
readIP(root, key, ip, defaultIp); 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) { 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(JsonVariant &root, const String &key, const IPAddress &ip) {
if (IPUtils::isSet(ip)) { if (IPUtils::isSet(ip)) {
root[key] = ip.toString(); root[key] = ip.toString();
} }