From 7ca1b413d9cc769079bc679baa248527b1fb9d92 Mon Sep 17 00:00:00 2001 From: Koichi Hirachi Date: Sun, 19 Nov 2023 05:50:31 +0900 Subject: [PATCH] Refactor loadSetting function to use pointer for IOManager --- hardware/esp32-control/src/SettingLoader.cpp | 10 +++++----- hardware/esp32-control/src/SettingLoader.h | 4 ++-- hardware/esp32-control/src/main.cpp | 7 +------ 3 files changed, 8 insertions(+), 13 deletions(-) diff --git a/hardware/esp32-control/src/SettingLoader.cpp b/hardware/esp32-control/src/SettingLoader.cpp index 2ed9a1ef..a9f748a8 100644 --- a/hardware/esp32-control/src/SettingLoader.cpp +++ b/hardware/esp32-control/src/SettingLoader.cpp @@ -22,7 +22,7 @@ void readFile(fs::FS &fs, const char *path, char *buf) file.close(); } -void loadSetting(char *input, IOManager manager) +void loadSetting(char *input, IOManager *manager) { StaticJsonDocument<384> doc; @@ -45,7 +45,7 @@ void loadSetting(char *input, IOManager manager) const char *stop_id = v["stop_id"]; int pin = v["pin"]; Serial.printf("stop_id: %s, pin: %d\n", stop_id, pin); - manager.addStop(pin, stop_id); + manager->addStop(pin, stop_id); } // POINTS @@ -55,7 +55,7 @@ void loadSetting(char *input, IOManager manager) const char *point_id = v["point_id"]; int pin = v["pin"]; Serial.printf("point_id: %s, pin: %d\n", point_id, pin); - manager.addPoint(pin, point_id); + manager->addPoint(pin, point_id); } // DETECTORS @@ -80,9 +80,9 @@ void loadSetting(char *input, IOManager manager) SETTING_LOADED = true; } -void getSetting(IOManager manager) +void getSetting(IOManager *manager) { - char json_buf[1000]; + char json_buf[4096]; readFile(LittleFS, "/setting.json", json_buf); // jsonファイル読み込み loadSetting(json_buf, manager); } \ No newline at end of file diff --git a/hardware/esp32-control/src/SettingLoader.h b/hardware/esp32-control/src/SettingLoader.h index 8e940105..4bed064e 100644 --- a/hardware/esp32-control/src/SettingLoader.h +++ b/hardware/esp32-control/src/SettingLoader.h @@ -10,8 +10,8 @@ #define FORMAT_LITTLEFS_IF_FAILED true -void getSetting(IOManager manager); -void loadSetting(char *input, IOManager manager); +void getSetting(IOManager *manager); +void loadSetting(char *input, IOManager *manager); extern bool SETTING_LOADED; #endif \ No newline at end of file diff --git a/hardware/esp32-control/src/main.cpp b/hardware/esp32-control/src/main.cpp index 7251f8fc..5a585f53 100644 --- a/hardware/esp32-control/src/main.cpp +++ b/hardware/esp32-control/src/main.cpp @@ -66,18 +66,13 @@ void setup() client.subscribe("stop/+/delta"); client.subscribe("point/+/delta"); - // 各種センサー類の初期化 - // init_servo(); - // 初期状態の取得 - // get_init_state(); - // LittleFS初期化 if (!LittleFS.begin(FORMAT_LITTLEFS_IF_FAILED)) { Serial.println("LittleFS Mount Failed"); return; } - getSetting(manager); + getSetting(&manager); } void callback(char *topic, byte *payload, unsigned int length)