Merge pull request #751 from visualapproach/development_v4

Development v4

Code/data/hwconfig.html

@@ -136,11 +136,11 @@ <h2>Hardware:</h2>
 		</section>
 
 		<section>
-			<p>Ambient Temperature Sensor <span data-text="Requires a DS18B20 sensor to be connected to the pin labeled 'Sensor Pin'. The sensor will update the 'Ambient Temperature' periodically." class="tooltip">?</span></p>
+			<p>Ambient "One Wire Temperature Sensor"<span data-text="Requires a DS18B20 sensor to be connected to the pin labeled 'Sensor Pin'. The sensor will update the 'Ambient Temperature' periodically." class="tooltip left">?</span></p>
 			<table>
 				<tr>
 					<td>Enable <input type="checkbox" id="hasTempSensor" name="hasTempSensor" value="checked"></td>
-					<td>Sensor Pin <span data-text="D0-D8 as labeled on the ESP, but without the 'D'. The ESP will convert to GPIO numbers." class="tooltip">?</span> <input type="text" id="pin8" maxlength="2" style="width:30px"></td>
+					<td>Sensor Pin (Dx)<span data-text="D0-D8 as labeled on the ESP, but without the 'D'. The ESP will convert to GPIO numbers." class="tooltip left">?</span> <input type="text" id="pin8" maxlength="2" style="width:30px"></td>
 				</tr>
 			</table>
 		</section>
@@ -152,22 +152,24 @@ <h2>Hardware:</h2>
 					<td colspan="5">Override <input type="checkbox" id="pwr_override" onclick="onOverrideClick()"></td>
 				</tr>
 				<tr>
-					<td>Heat stage 1<input type="text" id="pwr_heater_stage1" maxlength="4" style="width:30px" 
+					<td style="text-align:right">Heat stage 1<input type="text" id="pwr_heater_stage1" maxlength="4" style="width:30px" 
 						inputmode="numeric" pattern="[0-9]{1,4}"
 						disabled="disabled"></td>
-					<td>Heat stage 2<input type="text" id="pwr_heater_stage2" maxlength="4" style="width:30px" 
+					<td style="text-align:right">Heat stage 2<input type="text" id="pwr_heater_stage2" maxlength="4" style="width:30px" 
 						inputmode="numeric" pattern="[0-9]{1,4}"
 						disabled="disabled"></td>
-					<td>Pump <input type="text" id="pwr_pump" maxlength="4" style="width:30px"
+					<td style="text-align:right">Pump <input type="text" id="pwr_pump" maxlength="4" style="width:30px"
 						inputmode="numeric" pattern="[0-9]{1,4}"
 						disabled="disabled"></td>
-					<td>Idle <input type="text" id="pwr_idle" maxlength="4" style="width:30px"
+                </tr>
+                <tr>
+                    <td style="text-align:right">Idle <input type="text" id="pwr_idle" maxlength="4" style="width:30px"
 						inputmode="numeric" pattern="[0-9]{1,4}"
 						disabled="disabled"></td>
-					<td>Air <input type="text" id="pwr_air" maxlength="4" style="width:30px"
+					<td style="text-align:right">Air <input type="text" id="pwr_air" maxlength="4" style="width:30px"
 						inputmode="numeric" pattern="[0-9]{1,4}"
 						disabled="disabled"></td>
-					<td>Jets <input type="text" id="pwr_jet" maxlength="4" style="width:30px"
+					<td style="text-align:right">Jets <input type="text" id="pwr_jet" maxlength="4" style="width:30px"
 						inputmode="numeric" pattern="[0-9]{1,4}"
 						disabled="disabled"></td>
 				</tr>

Code/data/index.html

@@ -84,7 +84,7 @@ <h2>Control</h2>
 					<td><input type="range" id="amb" min="-40" max="60" step="1" value="20" onmouseup="sendCommand('setAmbient')" ontouchend="sendCommand('setAmbient')"></td>
 					<td style="text-align:right" id="sliderAmbVal">n/a</td>
 				</tr>
-				<tr>
+				<tr id="rowBrightness">
 					<td>Brightness <span data-text="Remember: When set to '0' the display and all buttons on the pump are completely dimmed out (off), but will light up for 5s when pressing a button." class="tooltip">?</span></td>
 					<td><input type="range" id="brt" min="0" max="8" step="1" value="7" onmouseup="sendCommand('setBrightness')" ontouchend="sendCommand('setBrightness')"></td>
 					<td style="text-align:right" id="sliderBrtVal">n/a</td>
@@ -95,7 +95,7 @@ <h2>Control</h2>
 				<tr>
 					<td class="center">Temperature</td>
 					<td class="center">Ambient Temperature</td>
-					<td class="center">Brightness <span data-text="Remember: When set to '0' the display and all buttons on the pump are completely dimmed out (off), but will light up for 5s when pressing a button." class="tooltip left">?</span></td>
+					<td id="brightnessHeader" class="center">Brightness <span data-text="Remember: When set to '0' the display and all buttons on the pump are completely dimmed out (off), but will light up for 5s when pressing a button." class="tooltip left">?</span></td>
 				</tr>
 				<tr>
 					<td class="center">
@@ -119,7 +119,7 @@ <h2>Control</h2>
 						</div>
 					</td>
 					<td class="center">
-						<div class="selector">
+						<div class="selector" id="divBrightness">
 							<button onclick="increaseNumber('selectorBrt');sendCommand('setBrightnessSelector')" class="selectorbutton selectortop">ᐱ</button>
 							<input type="number" id="selectorBrt" min="0" max="8" step="1" value="7" type="text" class="selectorvalue" onchange="sendCommand('setBrightnessSelector')">
 							<button onclick="decreaseNumber('selectorBrt');sendCommand('setBrightnessSelector')" class="selectorbutton selectorbottom">ᐯ</button>
@@ -482,6 +482,18 @@ <h2>Totals</h2>
     // godmode available
     document.getElementById("god").style.display = msgobj.HASGOD ? "table-cell" : "none";
     document.getElementById("godswitch").style.display = msgobj.HASGOD ? "table-cell" : "none";
+    if(msgobj.MODEL.startsWith("NO")){
+        document.getElementById("divBrightness").style.display = "none"
+        document.getElementById("brightnessHeader").style.display = "none"
+        document.getElementById("rowBrightness").style.display = "none"
+    }
+    else
+    {
+        document.getElementById("divBrightness").style.display = "table-cell"
+        document.getElementById("brightnessHeader").style.display = "table-cell"
+        document.getElementById("rowBrightness").style.display = "table-cell"
+    }
+
   }
 
   if (msgobj.CONTENT == "STATES") {
@@ -693,8 +705,8 @@ <h2>Totals</h2>
     {
         setWebConfig();
     }
-    loadWebConfig();
-    connect();
+    setTimeout(loadWebConfig,500);
+    setTimeout(connect, 1000);
 }
 
 function setWebConfig()

Code/data/main.css

@@ -516,7 +516,7 @@ a.topnavicon {
   transform: translateY(-30%);
   left: 100%;
   margin-left: 15px;
-  width: 200px;
+  width: 160px;
   color: #444;
   background: #ccc;
   text-align: left;

Code/data/wifi.html

@@ -43,7 +43,7 @@
 			<h2>Access Point:</h2>
 			<table>
 				<tr>
-					<td><label for="enableAp">Enable specific AP:</label></td>
+					<td><label for="enableAp">Enable specific AP:</label><span data-text="Enable Wi-Fi station to connect to your network. You'd want this on normally!" class="tooltip">?</span></td>
 					<td><input type="checkbox" id="enableAp"></td>
 				</tr>
 				<tr>
@@ -59,10 +59,10 @@ <h2>Access Point:</h2>
 		</section>
 
 		<section>
-			<h2>WiFi Manager Access Point:</h2>
+			<h2>Soft Access Point:</h2>
 			<table>
 				<tr>
-					<td><label for="enableWM">Enable WiFi Manager AP:</label></td>
+					<td><label for="enableWM">Enable Soft AP:</label><span data-text="Enable ESP access point to be able to open this page before your network credentials are set. You'd want this on normally! If your network is unavailable the ESP will fire up its own AP." class="tooltip">?</span></td>
 					<td><input type="checkbox" id="enableWM"></td>
 				</tr>
 			</table>
@@ -112,7 +112,7 @@ <h2>Static IP:</h2>
 			<h2>NTP server:</h2>
 			<table>
 				<tr>
-					<td>Domain name or IP address:</td>
+					<td>Domain name or IP address:<span data-text="Leave blank for default or set your favorite NTP." class="tooltip">?</span></td>
 					<td>
 						<input type="text" id="ip4NTP" maxlength="30" style="width:185px" value="pool.ntp.org">
 					</td>

Code/lib/BWC_unified/FW_VERSION.h

@@ -1 +1 @@
-#define FW_VERSION "2024-06-17-1334"
+#define FW_VERSION "2024-07-07-2211"