♻️ Handle merging

esp32/include/settings/ap_settings.h

@@ -2,7 +2,6 @@
 
 #include <wifi/wifi_idf.h>
 #include <wifi/dns_server.h>
-#include <ArduinoJson.h>
 #include <template/state_result.h>
 #include <platform_shared/api.pb.h>
 #include <cstring>
@@ -77,11 +76,9 @@ inline APSettings APSettings_defaults() {
     return settings;
 }
 
-inline void APSettings_read(const APSettings &settings, APSettings &proto) {
-    proto = settings;
-}
+inline void APSettings_read(const APSettings &settings, APSettings &proto) { proto = settings; }
 
 inline StateUpdateResult APSettings_update(const APSettings &proto, APSettings &settings) {
     settings = proto;
     return StateUpdateResult::CHANGED;
-}
+}

esp32/include/settings/peripherals_settings.h

@@ -7,10 +7,10 @@
  * I2C software connection
  */
 #ifndef SDA_PIN
-#define SDA_PIN SDA
+#define SDA_PIN 21
 #endif
 #ifndef SCL_PIN
-#define SCL_PIN SCL
+#define SCL_PIN 22
 #endif
 #ifndef I2C_FREQUENCY
 #define I2C_FREQUENCY 1000000UL
@@ -35,7 +35,8 @@ inline void PeripheralsConfiguration_read(const PeripheralsConfiguration& settin
     proto = settings;
 }
 
-inline StateUpdateResult PeripheralsConfiguration_update(const PeripheralsConfiguration& proto, PeripheralsConfiguration& settings) {
+inline StateUpdateResult PeripheralsConfiguration_update(const PeripheralsConfiguration& proto,
+                                                         PeripheralsConfiguration& settings) {
     settings = proto;
     return StateUpdateResult::CHANGED;
 }

esp32/include/settings/wifi_settings.h

@@ -1,7 +1,6 @@
 #pragma once
 
 #include <wifi/wifi_idf.h>
-#include <ArduinoJson.h>
 #include <template/state_result.h>
 #include <platform_shared/api.pb.h>
 #include <cstring>
@@ -50,9 +49,7 @@ inline WiFiSettings WiFiSettings_defaults() {
     return settings;
 }
 
-inline void WiFiSettings_read(const WiFiSettings &settings, WiFiSettings &proto) {
-    proto = settings;
-}
+inline void WiFiSettings_read(const WiFiSettings &settings, WiFiSettings &proto) { proto = settings; }
 
 inline StateUpdateResult WiFiSettings_update(const WiFiSettings &proto, WiFiSettings &settings) {
     settings = proto;