ESP-DASH Pro NG

mathieucarbou · Nov 27, 2024 · da2a715 · da2a715
1 parent 438398b
commit da2a715
Show file tree

Hide file tree

Showing 6 changed files with 650 additions and 643 deletions.
diff --git a/include/YaSolRWebsite.h b/include/YaSolRWebsite.h
@@ -19,23 +19,20 @@ namespace YaSolR {
       void resetPID();
 
     private:
-      void _boolConfig(Card& card, const char* key);
+      void _boolConfig(dash::SwitchCard& card, const char* key);
       void _daysConfig(Card& card, const char* key);
-      void _floatConfig(Card& card, const char* key);
       void _numConfig(Card& card, const char* key);
-      void _pinConfig(Card& card, const char* key);
+      void _pinConfig(dash::FeedbackTextInputCard<int32_t>& card, const char* key);
       void _passwordConfig(Card& card, const char* key);
       void _sliderConfig(Card& card, const char* key);
       void _percentageSlider(Card& card, const char* key);
       void _textConfig(Card& card, const char* key);
 
       void _outputDimmerSlider(Card& card, Mycila::RouterOutput& output);
-      void _outputBypassSwitch(Card& card, Mycila::RouterOutput& output);
-      void _relaySwitch(Card& card, Mycila::RouterRelay& relay);
+      void _outputBypassSwitch(dash::SwitchCard& card, Mycila::RouterOutput& output);
+      void _relaySwitch(dash::SwitchCard& card, Mycila::RouterRelay& relay);
 
-      void _pinout(Card& card, int32_t pin, std::unordered_map<int32_t, Card*>& pinout);
-      void _status(Card& card, const char* key, bool enabled, bool state = true, const char* err = "");
-      void _temperature(Card& card, Mycila::DS18& sensor);
-      void _temperature(Card& card, Mycila::RouterOutput& output);
+      void _pinout(dash::FeedbackTextInputCard<int32_t>& card, const char* key, std::unordered_map<int32_t, dash::FeedbackTextInputCard<int32_t>*>& pinout);
+      void _status(dash::FeedbackSwitchCard & card, const char* key, bool enabled, bool state = true, const char* err = "");
   };
 } // namespace YaSolR
diff --git a/include/i18n/en.h b/include/i18n/en.h
@@ -11,18 +11,18 @@
 #define YASOLR_LBL_004 "Application: Manufacturer"
 #define YASOLR_LBL_005 "Device: Boot Count"
 #define YASOLR_LBL_006 "Device: Cores"
-#define YASOLR_LBL_007 "Device: Heap Memory Total"
-#define YASOLR_LBL_008 "Device: Heap Memory Usage"
-#define YASOLR_LBL_009 "Device: Heap Memory Used"
+#define YASOLR_LBL_007 "Device: Heap Memory Total (bytes)"
+#define YASOLR_LBL_008 "Device: Heap Memory Usage (%)"
+#define YASOLR_LBL_009 "Device: Heap Memory Used (bytes)"
 #define YASOLR_LBL_010 "Device: ID"
 #define YASOLR_LBL_011 "Device: Model"
 #define YASOLR_LBL_012 "Device: Revision"
 #define YASOLR_LBL_013 "Firmware: Build Hash"
 #define YASOLR_LBL_014 "Firmware: Build Timestamp"
 #define YASOLR_LBL_015 "Firmware: Filename"
-#define YASOLR_LBL_016 "Grid: Energy"
-#define YASOLR_LBL_017 "Grid: Energy Returned"
-#define YASOLR_LBL_018 "Grid: Frequency"
+#define YASOLR_LBL_016 "Grid: Energy (kWh)"
+#define YASOLR_LBL_017 "Grid: Energy Returned (kWh)"
+#define YASOLR_LBL_018 "Grid: Frequency (Hz)"
 #define YASOLR_LBL_019 YASOLR_LBL_087 ": Hostname"
 #define YASOLR_LBL_020 YASOLR_LBL_087 ": Interface"
 #define YASOLR_LBL_021 YASOLR_LBL_087 ": Access Point IP Address"
@@ -32,8 +32,8 @@
 #define YASOLR_LBL_025 YASOLR_LBL_087 ": WiFi IP Address"
 #define YASOLR_LBL_026 YASOLR_LBL_087 ": WiFi MAC Address"
 #define YASOLR_LBL_027 YASOLR_LBL_087 ": WiFi SSID"
-#define YASOLR_LBL_028 YASOLR_LBL_087 ": WiFi RSSI"
-#define YASOLR_LBL_029 YASOLR_LBL_087 ": WiFi Signal"
+#define YASOLR_LBL_028 YASOLR_LBL_087 ": WiFi RSSI (dBm)"
+#define YASOLR_LBL_029 YASOLR_LBL_087 ": WiFi Signal (%)"
 #define YASOLR_LBL_034 "Time"
 #define YASOLR_LBL_035 "Uptime"
 #define YASOLR_LBL_036 "Routed Power"
@@ -124,7 +124,7 @@
 #define YASOLR_LBL_120 "LED Yellow"
 #define YASOLR_LBL_121 "PZEM (TX) Serial RX"
 #define YASOLR_LBL_122 "PZEM (RX) Serial TX"
-#define YASOLR_LBL_123 "Pending"
+// #define YASOLR_LBL_123 "Pending"
 #define YASOLR_LBL_124 "Not started"
 #define YASOLR_LBL_125 "Zero-Cross Detection"
 #define YASOLR_LBL_126 "Hardware"
@@ -156,7 +156,7 @@
 #define YASOLR_LBL_154 "Invalid"
 #define YASOLR_LBL_155 "Input Only"
 #define YASOLR_LBL_156 "I/O"
-#define YASOLR_LBL_157 YASOLR_LBL_128 " Remote UDP: Message Rate"
+#define YASOLR_LBL_157 YASOLR_LBL_128 " Remote UDP (msg/s)"
 #define YASOLR_LBL_158 "Grid Excess Remaining"
 #define YASOLR_LBL_159 "PID Controller"
 #define YASOLR_LBL_160 "Proportional Mode"
@@ -184,9 +184,9 @@
 #define YASOLR_LBL_182 YASOLR_LBL_070 " " YASOLR_LBL_048 " MQTT Topic"
 #define YASOLR_LBL_183 YASOLR_LBL_046 " Dimmer Min/Max Remapping"
 #define YASOLR_LBL_184 YASOLR_LBL_070 " Dimmer Min/Max Remapping"
-#define YASOLR_LBL_185
+// #define YASOLR_LBL_185
 #define YASOLR_LBL_186 "Resistance Value Detection"
-#define YASOLR_LBL_187
+// #define YASOLR_LBL_187
 #define YASOLR_LBL_030 "Relay: " YASOLR_LBL_046 " Bypass Relay Switch Count"
 #define YASOLR_LBL_031 "Relay: " YASOLR_LBL_070 " Bypass Relay Switch Count"
 #define YASOLR_LBL_032 "Relay: " YASOLR_LBL_074 " Switch Count"
@@ -196,11 +196,11 @@
 #define YASOLR_LBL_190 "Gateway"
 #define YASOLR_LBL_191 "DNS Server"
 #define YASOLR_LBL_192 "Device: Reboot Reason"
-#define YASOLR_LBL_193
-#define YASOLR_LBL_194
-#define YASOLR_LBL_195
-#define YASOLR_LBL_196
-#define YASOLR_LBL_197
-#define YASOLR_LBL_198
-#define YASOLR_LBL_199
-#define YASOLR_LBL_200
+// #define YASOLR_LBL_193
+// #define YASOLR_LBL_194
+// #define YASOLR_LBL_195
+// #define YASOLR_LBL_196
+// #define YASOLR_LBL_197
+// #define YASOLR_LBL_198
+// #define YASOLR_LBL_199
+// #define YASOLR_LBL_200
diff --git a/include/i18n/fr.h b/include/i18n/fr.h
@@ -10,18 +10,18 @@
 #define YASOLR_LBL_004 "Application: Développeur"
 #define YASOLR_LBL_005 "Micro-contrôleur: Démarrages"
 #define YASOLR_LBL_006 "Micro-contrôleur: Coeurs"
-#define YASOLR_LBL_007 "Micro-contrôleur: Mémoire Heap: totale"
-#define YASOLR_LBL_008 "Micro-contrôleur: Mémoire Heap: utilisation"
-#define YASOLR_LBL_009 "Micro-contrôleur: Mémoire Heap: utilisée"
+#define YASOLR_LBL_007 "Micro-contrôleur: Mémoire Heap: totale (bytes)"
+#define YASOLR_LBL_008 "Micro-contrôleur: Mémoire Heap: utilisation (%)"
+#define YASOLR_LBL_009 "Micro-contrôleur: Mémoire Heap: utilisée (bytes)"
 #define YASOLR_LBL_010 "Micro-contrôleur: ID"
 #define YASOLR_LBL_011 "Micro-contrôleur: Modèle"
 #define YASOLR_LBL_012 "Micro-contrôleur: Révision"
 #define YASOLR_LBL_013 "Micro-logiciel: Hachage de construction"
 #define YASOLR_LBL_014 "Micro-logiciel: Date de construction"
 #define YASOLR_LBL_015 "Micro-logiciel: Nom de fichier"
-#define YASOLR_LBL_016 "Réseau électrique: Énergie"
-#define YASOLR_LBL_017 "Réseau électrique: Énergie retournée"
-#define YASOLR_LBL_018 "Réseau électrique: Fréquence"
+#define YASOLR_LBL_016 "Réseau électrique: Énergie (kWh)"
+#define YASOLR_LBL_017 "Réseau électrique: Énergie retournée (kWh)"
+#define YASOLR_LBL_018 "Réseau électrique: Fréquence (Hz)"
 #define YASOLR_LBL_019 "Réseau: Nom d'hôte"
 #define YASOLR_LBL_020 "Réseau: Interface"
 #define YASOLR_LBL_021 "Réseau: Point d'accès: Adresse IP"
@@ -31,8 +31,8 @@
 #define YASOLR_LBL_025 "Réseau: WiFi: Adresse IP"
 #define YASOLR_LBL_026 "Réseau: WiFi: Adresse MAC"
 #define YASOLR_LBL_027 "Réseau: WiFi: SSID"
-#define YASOLR_LBL_028 "Réseau: WiFi: RSSI"
-#define YASOLR_LBL_029 "Réseau: WiFi: Signal"
+#define YASOLR_LBL_028 "Réseau: WiFi: RSSI (dBm)"
+#define YASOLR_LBL_029 "Réseau: WiFi: Signal (%)"
 #define YASOLR_LBL_030 "Relais: Déclenchements relais marche forcée sortie 1"
 #define YASOLR_LBL_031 "Relais: Déclenchements relais marche forcée sortie 2"
 #define YASOLR_LBL_032 "Relais: Déclenchements relais 1"
@@ -126,7 +126,7 @@
 #define YASOLR_LBL_120 "LED Jaune"
 #define YASOLR_LBL_121 "PZEM (TX) Serial RX"
 #define YASOLR_LBL_122 "PZEM (RX) Serial TX"
-#define YASOLR_LBL_123 "En attente"
+// #define YASOLR_LBL_123 "En attente"
 #define YASOLR_LBL_124 "Non démarré"
 #define YASOLR_LBL_125 "Détection de passage par zéro"
 #define YASOLR_LBL_126 "Matériel"
@@ -160,7 +160,7 @@
 #define YASOLR_LBL_154 "Invalide"
 #define YASOLR_LBL_155 "Entrée uniquement"
 #define YASOLR_LBL_156 "E/S"
-#define YASOLR_LBL_157 "JSY Remote UDP: Débit"
+#define YASOLR_LBL_157 "JSY Remote UDP: Débit (msg/s)"
 #define YASOLR_LBL_158 "Surplus réseau restant"
 #define YASOLR_LBL_159 "Contrôleur PID"
 #define YASOLR_LBL_160 "Mode proportionnel"
@@ -188,19 +188,19 @@
 #define YASOLR_LBL_182 "Topic MQTT pour la température sortie 2"
 #define YASOLR_LBL_183 "Redéfinition Min/Max Variateur Sortie 1"
 #define YASOLR_LBL_184 "Redéfinition Min/Max Variateur Sortie 2"
-#define YASOLR_LBL_185
+// #define YASOLR_LBL_185
 #define YASOLR_LBL_186 "Détection valeur résistances"
-#define YASOLR_LBL_187
+// #define YASOLR_LBL_187
 #define YASOLR_LBL_188 "Adresse IP statique"
 #define YASOLR_LBL_189 "Masque de sous-réseau"
 #define YASOLR_LBL_190 "Passerelle"
 #define YASOLR_LBL_191 "Serveur DNS"
 #define YASOLR_LBL_192 "Micro-contrôleur: Raison du reboot"
-#define YASOLR_LBL_193
-#define YASOLR_LBL_194
-#define YASOLR_LBL_195
-#define YASOLR_LBL_196
-#define YASOLR_LBL_197
-#define YASOLR_LBL_198
-#define YASOLR_LBL_199
-#define YASOLR_LBL_200
+// #define YASOLR_LBL_193
+// #define YASOLR_LBL_194
+// #define YASOLR_LBL_195
+// #define YASOLR_LBL_196
+// #define YASOLR_LBL_197
+// #define YASOLR_LBL_198
+// #define YASOLR_LBL_199
+// #define YASOLR_LBL_200
diff --git a/lib/ESPDASHPro b/lib/ESPDASHPro
diff --git a/platformio.ini b/platformio.ini
@@ -133,7 +133,8 @@ build_flags =
   -D DASH_DEFAULT_CARD_SIZE_XS=12
   -D DASH_DEFAULT_CARD_SIZE_XXL=3
   -D DASH_USE_STL_STRING=1
-  ; -D DASH_JSON_SIZE=4096
+  -D DASH_JSON_SIZE=4096
+  -D DASH_DEBUG=1
   ; WebSerial
   -D WSL_HIGH_PERF
   ; YaSolR
@@ -150,8 +151,8 @@ build_flags =
   ; -Og
   ; -Os
   ; -D CONFIG_ARDUHAL_LOG_COLORS
-  -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_INFO
-  ; -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG
+  ; -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_INFO
+  -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_DEBUG
   ; -D CORE_DEBUG_LEVEL=ARDUHAL_LOG_LEVEL_VERBOSE
 build_unflags =
     -std=gnu++11