(bugfix) TextFields were not refreshed immediately

mathieucarbou · Jan 15, 2025 · 7c8f40a · 7c8f40a
1 parent 653121c
commit 7c8f40a
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 21 deletions.
diff --git a/include/yasolr_dashboard.h b/include/yasolr_dashboard.h
@@ -129,15 +129,14 @@ namespace YaSolR {
         });
       }
 
-      void _textConfig(dash::TextInputCard<const char*>& card, const char* key) {
+      void _textConfig(dash::TextInputCard<std::string>& card, const char* key) {
         card.onChange([key, &card](const std::optional<std::string>& value) {
           if (value.has_value()) {
             config.set(key, value.value());
-            card.setValue(config.get(key));
           } else {
             config.unset(key);
-            card.removeValue();
           }
+          card.setValue(config.get(key));
           dashboard.refresh(card);
         });
       }

diff --git a/src/yasolr_dashboard.cpp b/src/yasolr_dashboard.cpp
@@ -148,8 +148,8 @@ dash::SwitchCard _output1DimmerAuto(dashboard, YASOLR_LBL_060);
 dash::SwitchCard _output1BypassAuto(dashboard, YASOLR_LBL_064);
 dash::TextInputCard<uint8_t> _output1AutoStartTemp(dashboard, YASOLR_LBL_065);
 dash::TextInputCard<uint8_t> _output1AutoStoptTemp(dashboard, YASOLR_LBL_066);
-dash::TextInputCard<const char*> _output1AutoStartTime(dashboard, YASOLR_LBL_067);
-dash::TextInputCard<const char*> _output1AutoStoptTime(dashboard, YASOLR_LBL_068);
+dash::TextInputCard _output1AutoStartTime(dashboard, YASOLR_LBL_067);
+dash::TextInputCard _output1AutoStoptTime(dashboard, YASOLR_LBL_068);
 dash::WeekCard<const char*> _output1AutoStartWDays(dashboard, YASOLR_LBL_069);
 
 dash::FeedbackCard<const char*> _output2State(dashboard, YASOLR_LBL_047);
@@ -173,8 +173,8 @@ dash::SwitchCard _output2DimmerAuto(dashboard, YASOLR_LBL_060);
 dash::SwitchCard _output2BypassAuto(dashboard, YASOLR_LBL_064);
 dash::TextInputCard<uint8_t> _output2AutoStartTemp(dashboard, YASOLR_LBL_065);
 dash::TextInputCard<uint8_t> _output2AutoStoptTemp(dashboard, YASOLR_LBL_066);
-dash::TextInputCard<const char*> _output2AutoStartTime(dashboard, YASOLR_LBL_067);
-dash::TextInputCard<const char*> _output2AutoStoptTime(dashboard, YASOLR_LBL_068);
+dash::TextInputCard _output2AutoStartTime(dashboard, YASOLR_LBL_067);
+dash::TextInputCard _output2AutoStoptTime(dashboard, YASOLR_LBL_068);
 dash::WeekCard<const char*> _output2AutoStartWDays(dashboard, YASOLR_LBL_069);
 
 dash::SwitchCard _relay1Switch(dashboard, YASOLR_LBL_073);
@@ -192,32 +192,32 @@ dash::LinkCard<const char*> _consoleLink(dashboard, YASOLR_LBL_084);
 dash::LinkCard<const char*> _debugInfo(dashboard, YASOLR_LBL_178);
 
 dash::PasswordCard _adminPwd(dashboard, YASOLR_LBL_088, YASOLR_HIDDEN_PWD);
-dash::TextInputCard<const char*> _ntpServer(dashboard, YASOLR_LBL_089);
+dash::TextInputCard _ntpServer(dashboard, YASOLR_LBL_089);
 dash::AsyncDropdownCard<const char*> _ntpTimezone(dashboard, YASOLR_LBL_090, "/timezones");
 dash::TimeSyncCard _ntpSync(dashboard, YASOLR_LBL_091);
-dash::TextInputCard<const char*> _wifiSSID(dashboard, YASOLR_LBL_092);
+dash::TextInputCard _wifiSSID(dashboard, YASOLR_LBL_092);
 dash::PasswordCard _wifiPwd(dashboard, YASOLR_LBL_093, YASOLR_HIDDEN_PWD);
-dash::TextInputCard<const char*> _staticIP(dashboard, YASOLR_LBL_188);
-dash::TextInputCard<const char*> _subnetMask(dashboard, YASOLR_LBL_189);
-dash::TextInputCard<const char*> _gateway(dashboard, YASOLR_LBL_190);
-dash::TextInputCard<const char*> _dnsServer(dashboard, YASOLR_LBL_191);
+dash::TextInputCard _staticIP(dashboard, YASOLR_LBL_188);
+dash::TextInputCard _subnetMask(dashboard, YASOLR_LBL_189);
+dash::TextInputCard _gateway(dashboard, YASOLR_LBL_190);
+dash::TextInputCard _dnsServer(dashboard, YASOLR_LBL_191);
 dash::SwitchCard _apMode(dashboard, YASOLR_LBL_094);
 
-dash::TextInputCard<const char*> _mqttServer(dashboard, YASOLR_LBL_096);
+dash::TextInputCard _mqttServer(dashboard, YASOLR_LBL_096);
 dash::TextInputCard<uint16_t> _mqttPort(dashboard, YASOLR_LBL_097);
-dash::TextInputCard<const char*> _mqttUser(dashboard, YASOLR_LBL_098);
+dash::TextInputCard _mqttUser(dashboard, YASOLR_LBL_098);
 dash::PasswordCard _mqttPwd(dashboard, YASOLR_LBL_099, YASOLR_HIDDEN_PWD);
 dash::SwitchCard _mqttSecured(dashboard, YASOLR_LBL_100);
 dash::FileUploadCard _mqttServerCert(dashboard, YASOLR_LBL_101, ".pem");
 dash::PushButtonCard _mqttServerCertDelete(dashboard, YASOLR_LBL_049);
 dash::SliderCard<uint8_t> _mqttPublishInterval(dashboard, YASOLR_LBL_102, 1, 30, 1, "s");
-dash::TextInputCard<const char*> _mqttTopic(dashboard, YASOLR_LBL_103);
+dash::TextInputCard _mqttTopic(dashboard, YASOLR_LBL_103);
 dash::SwitchCard _haDiscovery(dashboard, YASOLR_LBL_104);
-dash::TextInputCard<const char*> _haDiscoveryTopic(dashboard, YASOLR_LBL_105);
-dash::TextInputCard<const char*> _mqttGridVoltage(dashboard, YASOLR_LBL_106);
-dash::TextInputCard<const char*> _mqttGridPower(dashboard, YASOLR_LBL_107);
-dash::TextInputCard<const char*> _mqttTempO1(dashboard, YASOLR_LBL_181);
-dash::TextInputCard<const char*> _mqttTempO2(dashboard, YASOLR_LBL_182);
+dash::TextInputCard _haDiscoveryTopic(dashboard, YASOLR_LBL_105);
+dash::TextInputCard _mqttGridVoltage(dashboard, YASOLR_LBL_106);
+dash::TextInputCard _mqttGridPower(dashboard, YASOLR_LBL_107);
+dash::TextInputCard _mqttTempO1(dashboard, YASOLR_LBL_181);
+dash::TextInputCard _mqttTempO2(dashboard, YASOLR_LBL_182);
 
 dash::FeedbackTextInputCard<int32_t> _pinDisplayClock(dashboard, YASOLR_LBL_111);
 dash::FeedbackTextInputCard<int32_t> _pinDisplayData(dashboard, YASOLR_LBL_112);