📦 Moves utilities to own folder

runeharlyk · Nov 14, 2024 · f2d8611 · f2d8611
1 parent 0d596d9
commit f2d8611
Show file tree

Hide file tree

Showing 13 changed files with 23 additions and 95 deletions.
diff --git a/esp32/lib/ESP32-sveltekit/BatteryService.h b/esp32/lib/ESP32-sveltekit/BatteryService.h
@@ -15,9 +15,9 @@
  **/
 
 #include <event_socket.h>
-#include <JsonUtils.h>
+#include <utils/json_utils.h>
 #include <Peripherals.h>
-#include <timing.h>
+#include <utils/timing.h>
 
 #define ADC_VOLTAGE 0
 #define ADC_CURRENT 1

diff --git a/esp32/lib/ESP32-sveltekit/MotionService.h b/esp32/lib/ESP32-sveltekit/MotionService.h
@@ -4,7 +4,7 @@
 #include <event_socket.h>
 #include <Kinematics.h>
 #include <ServoController.h>
-#include <timing.h>
+#include <utils/timing.h>
 #include <MathUtils.h>
 
 #include <gait/state.h>

diff --git a/esp32/lib/ESP32-sveltekit/Peripherals.h b/esp32/lib/ESP32-sveltekit/Peripherals.h
@@ -5,7 +5,7 @@
 #include <stateful_persistence.h>
 #include <stateful_service.h>
 #include <MathUtils.h>
-#include <timing.h>
+#include <utils/timing.h>
 #include <filesystem.h>
 #include <features.h>
 #include <settings/peripherals_settings.h>

diff --git a/esp32/lib/ESP32-sveltekit/SettingValue.cpp b/esp32/lib/ESP32-sveltekit/SettingValue.cpp
diff --git a/esp32/lib/ESP32-sveltekit/SettingValue.h b/esp32/lib/ESP32-sveltekit/SettingValue.h
diff --git a/esp32/lib/ESP32-sveltekit/ap_service.h b/esp32/lib/ESP32-sveltekit/ap_service.h
@@ -2,7 +2,7 @@
 #include <stateful_service_endpoint.h>
 #include <stateful_persistence.h>
 #include <settings/ap_settings.h>
-#include <timing.h>
+#include <utils/timing.h>
 #include <WiFi.h>
 
 class APService : public StatefulService<APSettings> {

diff --git a/esp32/lib/ESP32-sveltekit/settings/ap_settings.h b/esp32/lib/ESP32-sveltekit/settings/ap_settings.h
@@ -3,9 +3,9 @@
 #include <WiFi.h>
 #include <IPAddress.h>
 #include <ArduinoJson.h>
-#include <JsonUtils.h>
-#include <string_utilities.h>
-#include <IPUtils.h>
+#include <utils/json_utils.h>
+#include <utils/string_utils.h>
+#include <utils/ip_utils.h>
 #include <state_result.h>
 
 #include <DNSServer.h>

diff --git a/esp32/lib/ESP32-sveltekit/settings/wifi_settings.h b/esp32/lib/ESP32-sveltekit/settings/wifi_settings.h
@@ -3,9 +3,9 @@
 #include <WiFi.h>
 #include <IPAddress.h>
 #include <ArduinoJson.h>
-#include <JsonUtils.h>
-#include <IPUtils.h>
-#include <string_utilities.h>
+#include <utils/json_utils.h>
+#include <utils/ip_utils.h>
+#include <utils/string_utils.h>
 #include <state_result.h>
 
 #ifndef FACTORY_WIFI_SSID

diff --git a/esp32/lib/ESP32-sveltekit/IPUtils.h → esp32/lib/ESP32-sveltekit/utils/ip_utils.h b/esp32/lib/ESP32-sveltekit/IPUtils.h → esp32/lib/ESP32-sveltekit/utils/ip_utils.h
diff --git a/esp32/lib/ESP32-sveltekit/JsonUtils.h → esp32/lib/ESP32-sveltekit/utils/json_utils.h b/esp32/lib/ESP32-sveltekit/JsonUtils.h → esp32/lib/ESP32-sveltekit/utils/json_utils.h
@@ -2,7 +2,7 @@
 #define JsonUtils_h
 
 #include <Arduino.h>
-#include <IPUtils.h>
+#include <utils/ip_utils.h>
 #include <ArduinoJson.h>
 
 class JsonUtils {

diff --git a/esp32/lib/ESP32-sveltekit/string_utilities.h → .../lib/ESP32-sveltekit/utils/string_utils.h b/esp32/lib/ESP32-sveltekit/string_utilities.h → .../lib/ESP32-sveltekit/utils/string_utils.h
diff --git a/esp32/lib/ESP32-sveltekit/timing.h → esp32/lib/ESP32-sveltekit/utils/timing.h b/esp32/lib/ESP32-sveltekit/timing.h → esp32/lib/ESP32-sveltekit/utils/timing.h
@@ -29,4 +29,14 @@
         }                                                                                   \
     }
 
+#define CALLS_PER_SECOND(name)                                            \
+    static unsigned long name##_count = 0;                                \
+    static unsigned long last_time = 0;                                   \
+    name##_count++;                                                       \
+    if (millis() - last_time >= 1000) {                                   \
+        Serial.printf("%s: %lu calls per second\n", #name, name##_count); \
+        name##_count = 0;                                                 \
+        last_time = millis();                                             \
+    }
+
 #endif
diff --git a/esp32/lib/ESP32-sveltekit/wifi_service.h b/esp32/lib/ESP32-sveltekit/wifi_service.h
@@ -6,7 +6,7 @@
 #include <ESPmDNS.h>
 
 #include <filesystem.h>
-#include <timing.h>
+#include <utils/timing.h>
 #include <stateful_service.h>
 #include <stateful_persistence.h>
 #include <stateful_service_endpoint.h>