feat: Use reactive functions to update UI (#183)

* feat: introduce reactive ui

* feat: Use reactive functions to rerender screen

Author: jniebuhr

platformio.ini

@@ -45,6 +45,7 @@ build_flags =
 	-DCONFIG_MAX_FILENAME_LEN=64
 	-DCONFIG_MAX_URL_LEN=128
     "-DTEMPLATE_PLACEHOLDER=\'$\'"
+    -DCONFIG_NIMBLE_CPP_LOG_LEVEL=2
 lib_deps =
 	lvgl/lvgl @ 8.3.11
 	lewisxhe/SensorLib @ 0.1.8

src/display/core/Controller.cpp

@@ -277,10 +277,6 @@ void Controller::setTargetTemp(int temperature) {
     default:;
     }
     updateLastAction();
-    int targetTemp = getTargetTemp();
-    if (targetTemp > 0) {
-        targetTemp = targetTemp + settings.getTemperatureOffset();
-    }
 }
 
 int Controller::getTargetDuration() const { return settings.getTargetDuration(); }

src/display/core/Settings.cpp

@@ -42,57 +42,16 @@ Settings::Settings() {
     homeAssistantPassword = preferences.getString("ha_pw", "");
     timezone = preferences.getString("tz", DEFAULT_TIMEZONE);
     preferences.end();
+
+    xTaskCreate(loopTask, "Settings::loop", configMINIMAL_STACK_SIZE * 6, this, 1, &taskHandle);
 }
 
 void Settings::batchUpdate(const SettingsCallback &callback) {
-    inBatch = true;
     callback(this);
-    inBatch = false;
     save();
 }
 
-void Settings::save() {
-    if (inBatch)
-        return;
-    preferences.begin(PREFERENCES_KEY, false);
-    preferences.putInt("sm", startupMode);
-    preferences.putInt("tb", targetBrewTemp);
-    preferences.putInt("ts", targetSteamTemp);
-    preferences.putInt("tw", targetWaterTemp);
-    preferences.putInt("td", targetDuration);
-    preferences.putInt("tv", targetVolume);
-    preferences.putInt("tgv", targetGrindVolume);
-    preferences.putInt("tgd", targetGrindDuration);
-    preferences.putDouble("del_br", brewDelay);
-    preferences.putDouble("del_gd", grindDelay);
-    preferences.putBool("del_ad", delayAdjust);
-    preferences.putInt("to", temperatureOffset);
-    preferences.putString("pid", pid);
-    preferences.putString("ws", wifiSsid);
-    preferences.putString("wp", wifiPassword);
-    preferences.putString("mn", mdnsName);
-    preferences.putBool("hk", homekit);
-    preferences.putBool("vt", volumetricTarget);
-    preferences.putString("oc", otaChannel);
-    preferences.putInt("ipt", infusePumpTime);
-    preferences.putInt("ibt", infuseBloomTime);
-    preferences.putInt("pt", pressurizeTime);
-    preferences.putString("ssc", savedScale);
-    preferences.putBool("bf_a", boilerFillActive);
-    preferences.putInt("bf_su", startupFillTime);
-    preferences.putInt("bf_st", steamFillTime);
-    preferences.putBool("sg_a", smartGrindActive);
-    preferences.putString("sg_i", smartGrindIp);
-    preferences.putBool("sg_t", smartGrindToggle);
-    preferences.putInt("sg_m", smartGrindMode);
-    preferences.putBool("ha_a", homeAssistant);
-    preferences.putString("ha_i", homeAssistantIP);
-    preferences.putInt("ha_p", homeAssistantPort);
-    preferences.putString("ha_u", homeAssistantUser);
-    preferences.putString("ha_pw", homeAssistantPassword);
-    preferences.putString("tz", timezone);
-    preferences.end();
-}
+void Settings::save() { dirty = true; }
 
 void Settings::setTargetBrewTemp(const int target_brew_temp) {
     targetBrewTemp = target_brew_temp;
@@ -276,3 +235,57 @@ void Settings::setTimezone(String timezone) {
     this->timezone = std::move(timezone);
     save();
 }
+
+void Settings::doSave() {
+    if (!dirty) {
+        return;
+    }
+    dirty = false;
+    ESP_LOGI("Settings", "Saving settings");
+    preferences.begin(PREFERENCES_KEY, false);
+    preferences.putInt("sm", startupMode);
+    preferences.putInt("tb", targetBrewTemp);
+    preferences.putInt("ts", targetSteamTemp);
+    preferences.putInt("tw", targetWaterTemp);
+    preferences.putInt("td", targetDuration);
+    preferences.putInt("tv", targetVolume);
+    preferences.putInt("tgv", targetGrindVolume);
+    preferences.putInt("tgd", targetGrindDuration);
+    preferences.putDouble("del_br", brewDelay);
+    preferences.putDouble("del_gd", grindDelay);
+    preferences.putBool("del_ad", delayAdjust);
+    preferences.putInt("to", temperatureOffset);
+    preferences.putString("pid", pid);
+    preferences.putString("ws", wifiSsid);
+    preferences.putString("wp", wifiPassword);
+    preferences.putString("mn", mdnsName);
+    preferences.putBool("hk", homekit);
+    preferences.putBool("vt", volumetricTarget);
+    preferences.putString("oc", otaChannel);
+    preferences.putInt("ipt", infusePumpTime);
+    preferences.putInt("ibt", infuseBloomTime);
+    preferences.putInt("pt", pressurizeTime);
+    preferences.putString("ssc", savedScale);
+    preferences.putBool("bf_a", boilerFillActive);
+    preferences.putInt("bf_su", startupFillTime);
+    preferences.putInt("bf_st", steamFillTime);
+    preferences.putBool("sg_a", smartGrindActive);
+    preferences.putString("sg_i", smartGrindIp);
+    preferences.putBool("sg_t", smartGrindToggle);
+    preferences.putInt("sg_m", smartGrindMode);
+    preferences.putBool("ha_a", homeAssistant);
+    preferences.putString("ha_i", homeAssistantIP);
+    preferences.putInt("ha_p", homeAssistantPort);
+    preferences.putString("ha_u", homeAssistantUser);
+    preferences.putString("ha_pw", homeAssistantPassword);
+    preferences.putString("tz", timezone);
+    preferences.end();
+}
+
+void Settings::loopTask(void *arg) {
+    auto *settings = static_cast<Settings *>(arg);
+    while (true) {
+        settings->doSave();
+        vTaskDelay(1000 / portTICK_PERIOD_MS);
+    }
+}

src/display/core/Settings.h

@@ -96,7 +96,7 @@ class Settings {
 
   private:
     Preferences preferences;
-    bool inBatch = false;
+    bool dirty = false;
 
     int targetBrewTemp = 93;
     int targetSteamTemp = 155;
@@ -137,6 +137,10 @@ class Settings {
     String timezone = DEFAULT_TIMEZONE;
 
     String otaChannel = DEFAULT_OTA_CHANNEL;
+
+    void doSave();
+    xTaskHandle taskHandle;
+    static void loopTask(void *arg);
 };
 
 #endif // SETTINGS_H