AP password setting

vitotai · Sep 16, 2024 · 710639a · 710639a
1 parent 394abfd
commit 710639a
Show file tree

Hide file tree

Showing 91 changed files with 7,262 additions and 7,214 deletions.
diff --git a/README.md b/README.md
@@ -44,6 +44,10 @@ You will need to run the hardware setup procedure after upgrading to v2.4 from p
 * The gravity caluated by the controller is slightly different from that shown on chart. It is because the formula are derived speratedly. Due to different float precision, the formula is different. The difference should be small, though.
 
 ## Version History
+ * 2024/09/16 update
+   * trying ESP32 framework 6.8.1
+   * No password for AP mode by default; workaround for an issue in newer framework.
+   * Add BLE sensor supports(not enabled by default)
  * 4.4
    * Settings might be reset, save it before updgrading.
    * (ESP32) Rapt Pill support

diff --git a/htmljs/dist/chinese/BPLLogViewer.htm b/htmljs/dist/chinese/BPLLogViewer.htm
diff --git a/htmljs/dist/chinese/BPLLogViewer.htm.gz b/htmljs/dist/chinese/BPLLogViewer.htm.gz
diff --git a/htmljs/dist/chinese/BPLogWebViewer.htm b/htmljs/dist/chinese/BPLogWebViewer.htm
diff --git a/htmljs/dist/chinese/BPLogWebViewer.htm.gz b/htmljs/dist/chinese/BPLogWebViewer.htm.gz
diff --git a/htmljs/dist/chinese/config.htm b/htmljs/dist/chinese/config.htm
diff --git a/htmljs/dist/chinese/config.htm.gz b/htmljs/dist/chinese/config.htm.gz
diff --git a/htmljs/dist/chinese/setup.htm b/htmljs/dist/chinese/setup.htm
diff --git a/htmljs/dist/chinese/setup.htm.gz b/htmljs/dist/chinese/setup.htm.gz
diff --git a/htmljs/dist/english/BPLLogViewer.htm b/htmljs/dist/english/BPLLogViewer.htm
diff --git a/htmljs/dist/english/BPLLogViewer.htm.gz b/htmljs/dist/english/BPLLogViewer.htm.gz
diff --git a/htmljs/dist/english/BPLogWebViewer.htm b/htmljs/dist/english/BPLogWebViewer.htm
diff --git a/htmljs/dist/english/BPLogWebViewer.htm.gz b/htmljs/dist/english/BPLogWebViewer.htm.gz
diff --git a/htmljs/dist/english/config.htm b/htmljs/dist/english/config.htm
diff --git a/htmljs/dist/english/config.htm.gz b/htmljs/dist/english/config.htm.gz
diff --git a/htmljs/dist/english/setup.htm b/htmljs/dist/english/setup.htm
diff --git a/htmljs/dist/english/setup.htm.gz b/htmljs/dist/english/setup.htm.gz
diff --git a/htmljs/dist/italian/BPLLogViewer.htm b/htmljs/dist/italian/BPLLogViewer.htm
diff --git a/htmljs/dist/italian/BPLLogViewer.htm.gz b/htmljs/dist/italian/BPLLogViewer.htm.gz
diff --git a/htmljs/dist/italian/BPLogWebViewer.htm b/htmljs/dist/italian/BPLogWebViewer.htm
diff --git a/htmljs/dist/italian/BPLogWebViewer.htm.gz b/htmljs/dist/italian/BPLogWebViewer.htm.gz
diff --git a/htmljs/dist/italian/config.htm b/htmljs/dist/italian/config.htm
diff --git a/htmljs/dist/italian/config.htm.gz b/htmljs/dist/italian/config.htm.gz
diff --git a/htmljs/dist/italian/setup.htm b/htmljs/dist/italian/setup.htm
diff --git a/htmljs/dist/italian/setup.htm.gz b/htmljs/dist/italian/setup.htm.gz
diff --git a/htmljs/dist/norwegian/BPLLogViewer.htm b/htmljs/dist/norwegian/BPLLogViewer.htm
diff --git a/htmljs/dist/norwegian/BPLLogViewer.htm.gz b/htmljs/dist/norwegian/BPLLogViewer.htm.gz
diff --git a/htmljs/dist/norwegian/BPLogWebViewer.htm b/htmljs/dist/norwegian/BPLogWebViewer.htm
diff --git a/htmljs/dist/norwegian/BPLogWebViewer.htm.gz b/htmljs/dist/norwegian/BPLogWebViewer.htm.gz
diff --git a/htmljs/dist/norwegian/config.htm b/htmljs/dist/norwegian/config.htm
diff --git a/htmljs/dist/norwegian/config.htm.gz b/htmljs/dist/norwegian/config.htm.gz
diff --git a/htmljs/dist/norwegian/control_s.htm b/htmljs/dist/norwegian/control_s.htm
diff --git a/htmljs/dist/norwegian/control_s.htm.gz b/htmljs/dist/norwegian/control_s.htm.gz
diff --git a/htmljs/dist/norwegian/setup.htm b/htmljs/dist/norwegian/setup.htm
diff --git a/htmljs/dist/norwegian/setup.htm.gz b/htmljs/dist/norwegian/setup.htm.gz
diff --git a/htmljs/dist/portuguese-br/BPLLogViewer.htm b/htmljs/dist/portuguese-br/BPLLogViewer.htm
diff --git a/htmljs/dist/portuguese-br/BPLLogViewer.htm.gz b/htmljs/dist/portuguese-br/BPLLogViewer.htm.gz
diff --git a/htmljs/dist/portuguese-br/BPLogWebViewer.htm b/htmljs/dist/portuguese-br/BPLogWebViewer.htm
diff --git a/htmljs/dist/portuguese-br/BPLogWebViewer.htm.gz b/htmljs/dist/portuguese-br/BPLogWebViewer.htm.gz
diff --git a/htmljs/dist/portuguese-br/config.htm b/htmljs/dist/portuguese-br/config.htm
diff --git a/htmljs/dist/portuguese-br/config.htm.gz b/htmljs/dist/portuguese-br/config.htm.gz
diff --git a/htmljs/dist/portuguese-br/control_s.htm b/htmljs/dist/portuguese-br/control_s.htm
diff --git a/htmljs/dist/portuguese-br/control_s.htm.gz b/htmljs/dist/portuguese-br/control_s.htm.gz
diff --git a/htmljs/dist/portuguese-br/setup.htm b/htmljs/dist/portuguese-br/setup.htm
diff --git a/htmljs/dist/portuguese-br/setup.htm.gz b/htmljs/dist/portuguese-br/setup.htm.gz
diff --git a/htmljs/dist/slovak/BPLLogViewer.htm b/htmljs/dist/slovak/BPLLogViewer.htm
diff --git a/htmljs/dist/slovak/BPLLogViewer.htm.gz b/htmljs/dist/slovak/BPLLogViewer.htm.gz
diff --git a/htmljs/dist/slovak/BPLogWebViewer.htm b/htmljs/dist/slovak/BPLogWebViewer.htm
diff --git a/htmljs/dist/slovak/BPLogWebViewer.htm.gz b/htmljs/dist/slovak/BPLogWebViewer.htm.gz
diff --git a/htmljs/dist/slovak/config.htm b/htmljs/dist/slovak/config.htm
diff --git a/htmljs/dist/slovak/config.htm.gz b/htmljs/dist/slovak/config.htm.gz
diff --git a/htmljs/dist/slovak/control_s.htm b/htmljs/dist/slovak/control_s.htm
diff --git a/htmljs/dist/slovak/control_s.htm.gz b/htmljs/dist/slovak/control_s.htm.gz
diff --git a/htmljs/dist/slovak/setup.htm b/htmljs/dist/slovak/setup.htm
diff --git a/htmljs/dist/slovak/setup.htm.gz b/htmljs/dist/slovak/setup.htm.gz
diff --git a/htmljs/dist/spanish/BPLLogViewer.htm b/htmljs/dist/spanish/BPLLogViewer.htm
diff --git a/htmljs/dist/spanish/BPLLogViewer.htm.gz b/htmljs/dist/spanish/BPLLogViewer.htm.gz
diff --git a/htmljs/dist/spanish/BPLogWebViewer.htm b/htmljs/dist/spanish/BPLogWebViewer.htm
diff --git a/htmljs/dist/spanish/BPLogWebViewer.htm.gz b/htmljs/dist/spanish/BPLogWebViewer.htm.gz
diff --git a/htmljs/dist/spanish/config.htm b/htmljs/dist/spanish/config.htm
diff --git a/htmljs/dist/spanish/config.htm.gz b/htmljs/dist/spanish/config.htm.gz
diff --git a/htmljs/dist/spanish/setup.htm b/htmljs/dist/spanish/setup.htm
diff --git a/htmljs/dist/spanish/setup.htm.gz b/htmljs/dist/spanish/setup.htm.gz
diff --git a/htmljs/src/config.tmpl.html b/htmljs/src/config.tmpl.html
@@ -108,6 +108,14 @@ <h6 class="inline-header">
                             <option value="3"><%= config_stationap %></option>
                         </select>
                     </div>
+
+                    <div layout horizontal cross-center>
+                      <h6 class="inline-header">
+                          <%= config_ap_password %>
+                      </h6>
+                      <input type="checkbox" id="eap" name="eap" class="switch-input" checked>
+                      <label for="eap" class="switch-label" style="min-width: 0;"></label>
+                  </div>                  
                     <div layout horizontal cross-center>
                         <h6 class="inline-header">
                             <%= config_network %>
@@ -441,4 +449,4 @@ <h6 class="inline-header">
 
 </body>
 
-</html>
+</html>
diff --git a/htmljs/src/js/chart-edit.js b/htmljs/src/js/chart-edit.js
@@ -8,7 +8,7 @@ BrewChart.prototype.calInfo=function(){
     cdata[idx++]=0xF3;
     cdata[idx++]=points.length;
     for(var i=0;i<points.length;i++){
-        var raw =Math.round((t.devType == 2)? points[i][0]*1000:points[i][0]*10);
+        var raw =Math.round((t.devType == 2)? points[i][0]*10000:points[i][0]*100);
         var gravity =Math.round(t.plato? points[i][1]*100:points[i][1]*10000);
         cdata[idx++]= (raw >> 8) & 0xFF;
         cdata[idx++]= raw & 0xFF;

diff --git a/htmljs/src/js/script-setup.js b/htmljs/src/js/script-setup.js
@@ -17,6 +17,7 @@ var HW_1W_2413=3;
 var HW_EXT_SENSOR=5;
 var HW_ENV_SENSOR= 6;
 var HW_BME280=7;
+var HW_BTHOME=8;
 
 var devices = {
     pinlabel:function(pin){

diff --git a/htmljs/src/locales/chinese.json b/htmljs/src/locales/chinese.json
@@ -207,6 +207,7 @@
     "config_save":"儲存",
     "confg_restore_from":"從檔案中載入",
     "config_restore":"回復",
+    "config_ap_password":"AP模式使用密碼",
 
     "__gdc_html": "gdc.html",
     "gravity_title": "比重計",
@@ -496,4 +497,4 @@
     "gravity_change_24h": "比重變化 24H",
 
     "end": "***END***"
-}
+}
diff --git a/htmljs/src/locales/english.json b/htmljs/src/locales/english.json
@@ -209,6 +209,7 @@
     "config_save":"Save",
     "confg_restore_from":"Restore from",
     "config_restore":"Restore",
+    "config_ap_password":"Enable AP Password",
 
     "__gdc_html": "gdc.html",
     "gravity_title": "Gravity Device",
@@ -499,4 +500,4 @@
     "gravity_change_24h": "Gravity Change 24H",
 
     "__end__": "END"
-}
+}
diff --git a/htmljs/src/locales/italian.json b/htmljs/src/locales/italian.json
@@ -207,6 +207,7 @@
     "config_save":"Save",
     "confg_restore_from":"Restore from",
     "config_restore":"Restore",
+    "config_ap_password":"Enable AP Password",
 
     "__gdc_html": "gdc.html",
     "gravity_title": "Dispositivo densità",

diff --git a/htmljs/src/locales/norwegian.json b/htmljs/src/locales/norwegian.json
@@ -206,6 +206,7 @@
     "config_save":"Save",
     "confg_restore_from":"Restore from",
     "config_restore":"Restore",
+    "config_ap_password":"Enable AP Password",
 
     "__gdc_html": "gdc.html",
     "gravity_title": "Enhet egenvekt",
@@ -495,4 +496,4 @@
     "gravity_change_24h": "Gravity Change 24H",
 
     "__end__": "END"
-}
+}
diff --git a/htmljs/src/locales/portuguese-br.json b/htmljs/src/locales/portuguese-br.json
@@ -205,6 +205,7 @@
     "config_save":"Save",
     "confg_restore_from":"Restore from",
     "config_restore":"Restore",
+    "config_ap_password":"Enable AP Password",
 
     "__gdc_html": "gdc.html",
     "gravity_title": "BrewPiLess | Densidade",
@@ -496,4 +497,4 @@
     "gravity_change_24h": "Gravity Change 24H",
 
     "__end__": "END"
-}
+}
diff --git a/htmljs/src/locales/slovak.json b/htmljs/src/locales/slovak.json
@@ -206,6 +206,7 @@
     "config_save":"Save",
     "confg_restore_from":"Restore from",
     "config_restore":"Restore",
+    "config_ap_password":"Enable AP Password",
 
     "__gdc_html": "gdc.html",
     "gravity_title": "Zariadenie na meranie hustoty",

diff --git a/htmljs/src/locales/spanish.json b/htmljs/src/locales/spanish.json
@@ -206,6 +206,7 @@
     "config_save":"Save",
     "confg_restore_from":"Restore from",
     "config_restore":"Restore",
+    "config_ap_password":"Enable AP Password",
 
     "__gdc_html": "gdc.html",
     "gravity_title": "Dens&iacute;metro",
@@ -495,4 +496,4 @@
     "gravity_change_24h": "Gravity Change 24H",
 
     "__end__": "END"
-}
+}
diff --git a/src/BPLSettings.cpp b/src/BPLSettings.cpp
@@ -143,6 +143,7 @@ bool BPLSettings::autoCapSettingsSanity(void){ return true;}
 #define  KeyGateway   "gw"
 #define  KeyNetmask    "mask"
 #define  KeyDNS "dns"
+#define  KeySecuredAP "eap"
 
 #define KeyFlashChipId "fid"
 #define KeyFlashRealSize "frsize"
@@ -201,6 +202,7 @@ void BPLSettings::defaultSystemConfiguration(void){
     syscfg->netmask = (uint32_t) IPAddress(0,0,0,0);
     syscfg->dns = (uint32_t) IPAddress(0,0,0,0);
     syscfg->glycolChilling = 0;
+	syscfg->securedAp = false;
 	#if TWOFACED_LCD
 	syscfg->displayMode = 0;
 	#endif
@@ -236,7 +238,8 @@ bool BPLSettings::dejsonSystemConfiguration(String json){
         syscfg->passwordLcd = root[KeyProtect];
         syscfg->wifiMode = root[KeyWifi];
         syscfg->backlite = root[KeyLcdBackLight];
-		#if TWOFACED_LCD		
+		syscfg->securedAp = root[KeySecuredAP];
+		#if TWOFACED_LCD
 		syscfg->displayMode = root[KeyDisplayMode];
 		#endif
         syscfg->glycolChilling=root[KeyGlycol];
@@ -270,7 +273,7 @@ String BPLSettings::jsonSystemConfiguration(void){
     root[KeyNetmask]= IPAddress(syscfg->netmask).toString();
 	root[KeyDNS] = IPAddress(syscfg->dns).toString();
 	root[KeyGlycol] = syscfg->glycolChilling;
-
+	root[KeySecuredAP] = syscfg->securedAp;
 	#if TWOFACED_LCD		
 	root[KeyDisplayMode] = syscfg->displayMode;
 	#endif

diff --git a/src/BPLSettings.h b/src/BPLSettings.h
@@ -20,7 +20,8 @@ typedef struct _SystemConfiguration{
     uint32_t dns;
     uint8_t  displayMode;
     uint8_t glycolChilling;
-    uint8_t _padding[2];
+    uint8_t securedAp;
+    uint8_t _padding;
 }SystemConfiguration;
 
 //*****************************************************

diff --git a/src/BrewPiLess.cpp b/src/BrewPiLess.cpp
@@ -536,6 +536,10 @@ class BrewPiWebHandler: public AsyncWebHandler
 					DBG_PRINTF("config saved: %s\n",theSettings.systemConfiguration()->hostnetworkname);
 					request->send(200,ApplicationJsonType,"{}");
 					display.setAutoOffPeriod(theSettings.systemConfiguration()->backlite);
+					if (theSettings.systemConfiguration()->securedAp){
+						WiFi.eraseAP();
+						// https://github.com/espressif/arduino-esp32/issues/8976
+					}
 
 					#if TWOFACED_LCD
 					sharedDisplayManager.setDisplayMode(theSettings.systemConfiguration()->displayMode);
@@ -1952,14 +1956,14 @@ void setup(void){
 	WiFiConfiguration *wifiCon=theSettings.getWifiConfiguration();
 
 	if(strlen(syscfg->hostnetworkname)>0)
-		WiFiSetup.begin(wifiMode,syscfg->hostnetworkname,syscfg->password,
+		WiFiSetup.begin(wifiMode,syscfg->hostnetworkname,syscfg->securedAp? syscfg->password:NULL,
 					wifiCon->ssid[0]? wifiCon->ssid:NULL,
 					wifiCon->pass[0]? wifiCon->pass:NULL);
 	else // something wrong with the file
 		WiFiSetup.begin(wifiMode,DEFAULT_HOSTNAME,DEFAULT_PASSWORD);
 #else
 	if(strlen(syscfg->hostnetworkname)>0)
-		WiFiSetup.begin(wifiMode,syscfg->hostnetworkname,syscfg->password);
+		WiFiSetup.begin(wifiMode,syscfg->hostnetworkname,syscfg->securedAp? syscfg->password:NULL);
 	else // something wrong with the file
 		WiFiSetup.begin(wifiMode,DEFAULT_HOSTNAME,DEFAULT_PASSWORD);
 #endif

diff --git a/src/WiFiSetup.cpp b/src/WiFiSetup.cpp
@@ -60,12 +60,13 @@ void WiFiSetupClass::enterBackupApMode(void)
 }
 
 void WiFiSetupClass::createNetwork(){
-	if(strlen(_apPassword)>=8)
+	if(_apPassword != NULL && strlen(_apPassword)>=8){
 		WiFi.softAP(_apName, _apPassword);
-	else
+		DBG_PRINTF("\ncreate network:%s pass:%s\n",_apName, _apPassword);
+	}else{
 		WiFi.softAP(_apName);
-
-	DBG_PRINTF("\ncreate network:%s pass:%s\n",_apName, _apPassword);
+		DBG_PRINTF("\ncreate network:%s without pass\n",_apName);
+	}
 }
 
 void WiFiSetupClass::setupApService(void)
@@ -95,19 +96,19 @@ void WiFiSetupClass::begin(WiFiMode mode, char const *ssid,const char *passwd,ch
 	_mode= mode;
 	WiFiMode mode2use = (_mode == WIFI_OFF)? WIFI_AP_STA:_mode;
 
-	DBG_PRINTF("\nSaved SSID:\"%s\" targetSSID:%s\n",WiFi.SSID().c_str(),targetSSID? targetSSID:"NULL");
-	DBG_PRINTF("\nAP mode:%d, used;%d autoReconect:%d\n",mode,mode2use,WiFi.getAutoReconnect());
 
 	if( (mode2use == WIFI_STA || mode2use == WIFI_AP_STA) 
 		 && _targetSSID == NULL 
-		 && (WiFi.SSID() == "[Your SSID]" || WiFi.SSID() == "" || WiFi.SSID() == NULL)){
+		 /*&& (WiFi.SSID() == "[Your SSID]" || WiFi.SSID() == "" || WiFi.SSID() == NULL)*/){
 			DBG_PRINTF("Invalid SSID!");
 			mode2use = WIFI_AP;
 	}
 	_apName=(ssid == NULL || *ssid=='\0')? DEFAULT_HOSTNAME:ssid;	
 	_apPassword=(passwd !=NULL && *passwd=='\0')? NULL:passwd;
 
-	WiFi.setAutoConnect(true);
+	DBG_PRINTF("\nSaved SSID:\"%s\" targetSSID:%s\n",WiFi.SSID().c_str(),targetSSID? targetSSID:"NULL");
+	DBG_PRINTF("\nAP mode:%d, used;%d autoReconect:%d\n",mode,mode2use,WiFi.getAutoReconnect());
+
 	WiFi.mode(mode2use);
 	// start AP
 	if( mode2use == WIFI_AP || mode2use == WIFI_AP_STA){