Prepare release and add new parameters

steff393 · Dec 30, 2023 · e01e5b5 · e01e5b5
1 parent a9ecafc
commit e01e5b5
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/data/cfg.js b/data/cfg.js
@@ -39,7 +39,7 @@ function setSectionVisibility(sectionId, isVisible) {
 
 // Default settings 22.05.2023
 const defaultObj = JSON.parse(
-	'{"cfgApSsid":"wbec","cfgApPass":"wbec1234","cfgCntWb":1,"cfgMbCycleTime":10,"cfgMbDelay":100,"cfgMbTimeout":60000,"cfgStandby":4,"cfgFailsafeCurrent":0,"cfgMqttIp":"","cfgMqttLp":[],"cfgMqttPort":1883,"cfgMqttUser":"","cfgMqttPass":"","cfgMqttWattTopic":"wbec/pv/setWatt","cfgMqttWattJson":"","cfgNtpServer":"europe.pool.ntp.org","cfgFoxUser":"","cfgFoxPass":"","cfgFoxDevId":"","cfgPvActive":0,"cfgPvCycleTime":30,"cfgPvLimStart":61,"cfgPvLimStop":50,"cfgPvPhFactor":69,"cfgPvOffset":1,"cfgPvCalcMode":0,"cfgPvInvert":0,"cfgPvInvertBatt":0,"cfgPvMinTime":0,"cfgPvHttpIp":"","cfgPvHttpPath":"/","cfgPvHttpJson":"","cfgPvHttpPort":80,"cfgTotalCurrMax":0,"cfgHwVersion":15,"cfgWifiSleepMode":0,"cfgLoopDelay":255,"cfgKnockOutTimer":0,"cfgShellyIp":"","cfgInverterIp":"","cfgInverterType":0,"cfgInverterPort":0,"cfgInverterAddr":0,"cfgInvSmartAddr":0,"cfgInvRegPowerInv":0,"cfgInvRegPowerInvS":0,"cfgInvRegPowerMet":0,"cfgInvRegPowerMetS":0,"cfgInvRegToGrid":0,"cfgInvRegFromGrid":0,"cfgInvRegBattery":0,"cfgBootlogSize":2000,"cfgBtnDebounce":0,"cfgWifiConnectTimeout":10,"cfgResetOnTimeout":0,"cfgEnergyOffset":0,"cfgDisplayAutoOff":2,"cfgWifiAutoReconnect":1,"cfgLedIp":1,"cfgWifiOff":0,"cfgChargeLog":0,"cfgWbecMac":237,"cfgWbecIp":""}'
+	'{"cfgApSsid":"wbec","cfgApPass":"wbec1234","cfgCntWb":1,"cfgMbCycleTime":10,"cfgMbDelay":100,"cfgMbTimeout":60000,"cfgStandby":4,"cfgFailsafeCurrent":0,"cfgMqttIp":"","cfgMqttLp":[],"cfgMqttPort":1883,"cfgMqttUser":"","cfgMqttPass":"","cfgMqttWattTopic":"wbec/pv/setWatt","cfgMqttWattJson":"","cfgNtpServer":"europe.pool.ntp.org","cfgFoxUser":"","cfgFoxPass":"","cfgFoxDevId":"","cfgPvActive":0,"cfgPvCycleTime":30,"cfgPvLimStart":61,"cfgPvLimStop":50,"cfgPvPhFactor":69,"cfgPvOffset":1,"cfgPvCalcMode":0,"cfgPvInvert":0,"cfgPvInvertBatt":0,"cfgPvMinTime":0,"cfgPvHttpIp":"","cfgPvHttpPath":"/","cfgPvHttpJson":"","cfgPvHttpPort":80,"cfgTotalCurrMax":0,"cfgHwVersion":15,"cfgWifiSleepMode":0,"cfgLoopDelay":255,"cfgKnockOutTimer":0,"cfgShellyIp":"","cfgInverterIp":"","cfgInverterType":0,"cfgInverterPort":0,"cfgInverterAddr":0,"cfgInvSmartAddr":0,"cfgInvRegPowerInv":0,"cfgInvRegPowerInvS":0,"cfgInvRegPowerMet":0,"cfgInvRegPowerMetS":0,"cfgInvRegToGrid":0,"cfgInvRegFromGrid":0,"cfgInvRegBattery":0,"cfgBootlogSize":2000,"cfgBtnDebounce":0,"cfgWifiConnectTimeout":10,"cfgResetOnTimeout":0,"cfgEnergyOffset":0,"cfgDisplayAutoOff":2,"cfgWifiAutoReconnect":1,"cfgWifiScanMethod":0,"cfgLedIp":1,"cfgWifiOff":0,"cfgChargeLog":0,"cfgWallboxIp":"","cfgWallboxPort":502,"cfgWallboxAddr":1,"cfgRfidCurr":160,"cfgAutoEnable":1,"cfgWbecMac":237,"cfgWbecIp":""}'
 );
 
 const descObj = {
@@ -101,11 +101,17 @@ const descObj = {
 	cfgEnergyOffset        :"[Wh] Offset, der vom Energiezähler abgezogen werden kann",
 	cfgDisplayAutoOff      :"[min] Wartezeit für Displayabschaltung",
 	cfgWifiAutoReconnect   :"(!) intern",
+	cfgWifiScanMethod      :"(!) 0: WIFI_FAST_SCAN (default), 1: WIFI_ALL_CHANNEL_SCAN (evtl. bei Mesh)",
 	cfgLedIp               :"IP-Adresse von wbec nach Reset signalisieren, 0:inaktiv, 1:aktiv",
 	cfgWifiOff             :"(!) WLAN abschalten (1) - VORSICHT!",
 	cfgChargeLog           :"Logbuch der Ladevorgänge: 0:inaktiv, 1:aktiv",
-	cfgWbecMac             :"(!) Letztes Byte der wbec-MAC-Adresse ändern (dez.)",
-	cfgWbecIp              :"(!) stat. IP-Adresse für wbec, z.B. 192.168.178.123",
+	cfgWallboxIp           :"(!) connect.home Wallbox",
+	cfgWallboxPort         :"(!) connect.home Wallbox",
+	cfgWallboxAddr         :"(!) connect.home Wallbox",
+	cfgRfidCurr            :"[100mA] Strom bei Freischaltung per RFID",
+	cfgAutoEnable          :"1: nach Wakeup von Standby den letzten Stromwert wiederherstellen",
+	cfgWbecMac             :"(!) wbecLan: Letztes Byte der wbec-MAC-Adresse ändern (dez.)",
+	cfgWbecIp              :"(!) wbecLan: stat. IP-Adresse für wbec, z.B. 192.168.178.123",
 }
 
 

diff --git a/src/globalConfig.cpp b/src/globalConfig.cpp
@@ -8,7 +8,7 @@
 
 const uint8_t m = 5;
 
-#define WBEC_VER(s) "v" MAJOR_VER_STRING(s) ".5.0"     // token stringification
+#define WBEC_VER(s) "v" MAJOR_VER_STRING(s) ".5.1"     // token stringification
 #define MAJOR_VER_STRING(s) #s                         // .. with two levels of macros
 
 char     cfgWbecVersion[]             = WBEC_VER(WBEC_VERSION_MAJOR); // wbec version