diff --git a/esp32/include/ap_service.h b/esp32/include/ap_service.h index 6e318dc..c9af3c7 100644 --- a/esp32/include/ap_service.h +++ b/esp32/include/ap_service.h @@ -8,8 +8,6 @@ #include #include "esp_timer.h" -#define AP_SETTINGS_FILE "/config/apSettings.pb" - class APService : public StatefulService { public: APService(); diff --git a/esp32/include/filesystem.h b/esp32/include/filesystem.h index 140801a..d7ac33e 100644 --- a/esp32/include/filesystem.h +++ b/esp32/include/filesystem.h @@ -9,7 +9,14 @@ #define ESP_FS LittleFS #define FS_CONFIG_DIRECTORY "/config" -#define DEVICE_CONFIG_FILE "/config/peripheral.json" +#define DEVICE_CONFIG_FILE "/config/peripheral.json"' +#define CAMERA_SETTINGS_FILE "/config/cameraSettings.pb" +#define AP_SETTINGS_FILE "/config/apSettings.pb" +#define MDNS_SETTINGS_FILE "/config/mdnsSettings.pb" +#define WIFI_SETTINGS_FILE "/config/wifiSettings.pb" +#define PERIPHERAL_SETTINGS_FILE "/config/peripheralSettings.pb" +#define SERVO_SETTINGS_FILE "/config/servoSettings.pb" + namespace FileSystem { diff --git a/esp32/include/mdns_service.h b/esp32/include/mdns_service.h index d8d4c54..b52140b 100644 --- a/esp32/include/mdns_service.h +++ b/esp32/include/mdns_service.h @@ -8,8 +8,6 @@ #include #include -#define MDNS_SETTINGS_FILE "/config/mdnsSettings.pb" - class MDNSService : public StatefulService { private: FSPersistencePB _persistence; diff --git a/esp32/include/peripherals/camera_service.h b/esp32/include/peripherals/camera_service.h index 59ea436..bcbd044 100644 --- a/esp32/include/peripherals/camera_service.h +++ b/esp32/include/peripherals/camera_service.h @@ -19,7 +19,6 @@ namespace Camera { #endif #define PART_BOUNDARY "frame" -#define CAMERA_SETTINGS_FILE "/config/cameraSettings.pb" camera_fb_t *safe_camera_fb_get(); sensor_t *safe_sensor_get(); diff --git a/esp32/include/peripherals/peripherals.h b/esp32/include/peripherals/peripherals.h index 28b0efd..0c51cc8 100644 --- a/esp32/include/peripherals/peripherals.h +++ b/esp32/include/peripherals/peripherals.h @@ -10,8 +10,6 @@ #include #include -#define PERIPHERAL_SETTINGS_FILE "/config/peripheralSettings.pb" - #include #include diff --git a/esp32/include/peripherals/servo_controller.h b/esp32/include/peripherals/servo_controller.h index 024c707..4e1d4d0 100644 --- a/esp32/include/peripherals/servo_controller.h +++ b/esp32/include/peripherals/servo_controller.h @@ -16,8 +16,6 @@ #define FACTORY_SERVO_OSCILLATOR_FREQUENCY 27000000 #endif -#define SERVO_SETTINGS_FILE "/config/servoSettings.pb" - enum class SERVO_CONTROL_STATE { DEACTIVATED, PWM, ANGLE }; using ServoSettings = api_ServoSettings; diff --git a/esp32/include/wifi_service.h b/esp32/include/wifi_service.h index 1678e26..c006a72 100644 --- a/esp32/include/wifi_service.h +++ b/esp32/include/wifi_service.h @@ -12,8 +12,6 @@ #include