Support/os34dc

www/css/main.css

@@ -1150,5 +1150,23 @@ button[id^="start_1-"] {
 	margin-right: 5px;
 }
 
+/*
+  Fix for vertical alignment on desktop/wide screens.
+*/
+@media screen and (min-width: 480px) {
+    /* 1. Turn the container into a flexbox */
+    .ui-field-contain {
+        display: flex;
+        align-items: center;
+    }
 
+    /* 2. Remove the old float property that interferes */
+    .ui-field-contain > label {
+        float: none !important;
+    }
 
+    /* 3. ADDED: Force the sensor fieldset to take full width */
+    .ui-field-contain .sensor-options {
+        width: 100%;
+    }
+}

www/js/home.js

@@ -157,10 +157,10 @@ window.currLocal = true;
 						if ( loadedScripts === totalScripts ) {
 							// Once all scripts loaded, insert main.js
 							insertScript( assetLocation + "js/main.js", function () {
-                                                                try {
-                                                                        OSApp.Storage.setItemSync( "testQuota", "true" );
-                                                                        OSApp.Storage.removeItemSync( "testQuota" );
-                                                                        init();
+								try {
+									OSApp.Storage.setItemSync( "testQuota", "true" );
+									OSApp.Storage.removeItemSync( "testQuota" );
+									init();
 								} catch ( err ) {
 									if ( err.code === 22 ) {
 										document.body.innerHTML = "<div class='spinner'><div class='logo'></div>" +
@@ -243,8 +243,8 @@ window.currLocal = true;
 				document.title = "Loading...";
 
 				// Inject site information to storage so Application loads current device
-                                OSApp.Storage.setItemSync( "sites", JSON.stringify( sites ) );
-                                OSApp.Storage.setItemSync( "current_site", currentSite );
+				OSApp.Storage.setItemSync( "sites", JSON.stringify( sites ) );
+				OSApp.Storage.setItemSync( "current_site", currentSite );
 				finishInit();
 			},
 			wrongPassword = function() {
@@ -262,7 +262,7 @@ window.currLocal = true;
 						"<div class='logo'></div><span class='feedback'>Unable to load UI</span>" +
 					"</div>" );
 			},
-                        sites = JSON.parse( OSApp.Storage.getItemSync( "sites" ) ),
+			sites = JSON.parse( OSApp.Storage.getItemSync( "sites" ) ),
 			loader;
 
 		// Fix to allow CORS ajax requests to work on IE8 and 9

www/js/main.js

@@ -35,8 +35,8 @@ OSApp.Constants = {
 		"wl":23, "den":24, "ipas":25, "devid":26, "con":27, "lit":28, "dim":29, "bst":30, "uwt":31, "ntp1":32, "ntp2":33,
 		"ntp3":34, "ntp4":35, "lg":36, "mas2":37, "mton2":38, "mtof2":39, "fpr0":41, "fpr1":42, "re":43, "dns1": 44,
 		"dns2":45, "dns3":46, "dns4":47, "sar":48, "ife":49, "sn1t":50, "sn1o":51, "sn2t":52, "sn2o":53, "sn1on":54,
-		"sn1of":55, "sn2on":56, "sn2of":57, "subn1":58, "subn2":59, "subn3":60, "subn4":61, "laton":62, "latof":63,
-		"ife2":64, "imin":65, "imax":66
+		"sn1of":55, "sn2on":56, "sn2of":57, "subn1":58, "subn2":59, "subn3":60, "subn4":61, "fwire":62, "laton":63, "latof":64,
+		"ife2":65, "imin":66, "imax":67, "tpdv":68
 	},
 	options: { // Option constants
 		IGNORE_SENSOR_1: 1,

www/js/modules/dashboard.js

@@ -970,8 +970,14 @@ OSApp.Dashboard.displayPage = function() {
 
 							// Show the remaining time if it's greater than 0
 							line += " <span id=" + ( qPause ? "'pause" : "'countdown-" ) + sid + "' class='nobr'>(" + OSApp.Dates.sec2hms( rem ) + " " + OSApp.Language._( "remaining" ) + ")</span>";
-							if ( OSApp.currentSession.controller.status[ sid ] ) {
+
+							if ( isRunning ) {
 								addTimer( sid, rem );
+							} else {
+								// Station is scheduled/paused but not running - remove timer if it exists
+								if ( OSApp.uiState.timers[ "station-" + sid ] ) {
+									delete OSApp.uiState.timers[ "station-" + sid ];
+								}
 							}
 						}
 						if ( card.find( ".rem" ).length === 0 ) {
@@ -1088,8 +1094,10 @@ OSApp.Dashboard.displayPage = function() {
 						maximum: 64800,
 						seconds: sites[ currentSite ].lastRunTime[ sid ] > 0 ? sites[ currentSite ].lastRunTime[ sid ] : 0,
 						helptext: OSApp.Language._( "Enter a duration to manually run " ) + name,
-						callback: function( duration ) {
-							OSApp.Firmware.sendToOS( "/cm?sid=" + sid + "&en=1&t=" + duration + "&pw=", "json" ).done( function() {
+						showQOCheckbox: OSApp.Groups.canPreempt( stationGID ) && OSApp.Stations.isSequential( sid ),
+						callback: function( duration, qo ) {
+							var preParam = qo ? "&qo=1" : "";
+							OSApp.Firmware.sendToOS( "/cm?sid=" + sid + "&en=1&t=" + duration + preParam + "&pw=", "json" ).done( function() {
 
 								// Update local state until next device refresh occurs
 								OSApp.Stations.setPID( sid, OSApp.Constants.options.MANUAL_STATION_PID );

www/js/modules/groups.js

@@ -63,7 +63,12 @@ OSApp.Groups.numActiveStations = function( gid ) {
 
 // If more than 1 stations (includes the one to be turned off) are active
 OSApp.Groups.canShift = function( gid ) {
-	return OSApp.Groups.numActiveStations( gid ) > 1;
+	return OSApp.Firmware.checkOSVersion( 220 ) && OSApp.Groups.numActiveStations( gid ) > 1;
+};
+
+// If at least 1 station in this group is active
+OSApp.Groups.canPreempt = function( gid ) {
+	return OSApp.Firmware.checkOSVersion( 2214 ) && ( OSApp.Groups.numActiveStations( gid ) > 0 );
 };
 
 // Tbh, not sure if this belongs here in groups.js (mellodev)

www/js/modules/logs.js

@@ -76,9 +76,9 @@ OSApp.Logs.displayPage = function() {
 			}
 
 			$.each( data, function() {
-                                var station = this[ 1 ],
-                                        duration = parseInt( this[ 2 ] ),
-                                        flowRate = ( typeof this[ 4 ] !== "undefined" ) ? OSApp.Utils.flowRateToVolume( parseFloat( this[ 4 ] ) ) : null;
+				var station = this[ 1 ],
+					duration = parseInt( this[ 2 ] ),
+					flowRate = ( typeof this[ 4 ] !== "undefined" ) ? OSApp.Utils.flowRateToVolume( parseFloat( this[ 4 ] ) ) : null;
 
 				// Adjust for negative watering time firmware bug
 				if ( duration < 0 ) {
@@ -114,15 +114,15 @@ OSApp.Logs.displayPage = function() {
 
 				if ( type === "table" ) {
 					switch ( grouping ) {
-                                                case "station":
-                                                        var stationItem = [ utc, OSApp.Dates.dhms2str( OSApp.Dates.sec2dhms( duration ) ), station, new Date( utc.getTime() + ( duration * 1000 ) ), flowRate ];
-                                                        sortedData[ station ].push( stationItem );
-                                                        break;
-                                                case "day":
-                                                        var day = Math.floor( date.getTime() / 1000 / 60 / 60 / 24 ),
-                                                                item = [ utc, OSApp.Dates.dhms2str( OSApp.Dates.sec2dhms( duration ) ), station, new Date( utc.getTime() + ( duration * 1000 ) ), flowRate ];
+						case "station":
+							var stationItem = [ utc, OSApp.Dates.dhms2str( OSApp.Dates.sec2dhms( duration ) ), station, new Date( utc.getTime() + ( duration * 1000 ) ), flowRate ];
+							sortedData[ station ].push( stationItem );
+							break;
+						case "day":
+							var day = Math.floor( date.getTime() / 1000 / 60 / 60 / 24 ),
+								item = [ utc, OSApp.Dates.dhms2str( OSApp.Dates.sec2dhms( duration ) ), station, new Date( utc.getTime() + ( duration * 1000 ) ), flowRate ];
 
-                                                        // Item structure: [startDate, runtime, station, endDate, flowRate]
+							// Item structure: [startDate, runtime, station, endDate, flowRate]
 
 							if ( typeof sortedData[ day ] !== "object" ) {
 								sortedData[ day ] = [ item ];
@@ -349,13 +349,13 @@ OSApp.Logs.displayPage = function() {
 				wlSorted = extraData[ 0 ],
 				flSorted = extraData[ 1 ],
 				stats = extraData[ 2 ],
-                                tableHeader = "<table class=\"table-logs-datatables\"><thead><tr>" +
-                                        "<th data-priority='1'>" + OSApp.Language._( "Station" ) + "</th>" +
-                                        "<th data-priority='2'>" + OSApp.Language._( "Runtime" ) + "</th>" +
-                                        "<th data-priority='3'>" + OSApp.Language._( "Start Time" ) + "</th>" +
-                                        "<th data-priority='4'>" + OSApp.Language._( "End Time" ) + "</th>" +
-                                        "<th data-priority='5'>" + OSApp.Language._( "Flow Rate" ) + "</th>" +
-                                        "</tr></thead><tbody>",
+				tableHeader = "<table class=\"table-logs-datatables\"><thead><tr>" +
+					"<th data-priority='1'>" + OSApp.Language._( "Station" ) + "</th>" +
+					"<th data-priority='2'>" + OSApp.Language._( "Runtime" ) + "</th>" +
+					"<th data-priority='3'>" + OSApp.Language._( "Start Time" ) + "</th>" +
+					"<th data-priority='4'>" + OSApp.Language._( "End Time" ) + "</th>" +
+					"<th data-priority='5'>" + OSApp.Language._( "Flow Rate" ) + "</th>" +
+					"</tr></thead><tbody>",
 				html = showStats( stats ) + "<div data-role='collapsible-set' data-inset='true' data-theme='b' data-collapsed-icon='arrow-d' data-expanded-icon='arrow-u'>",
 				i = 0,
 				group, ct, k;
@@ -419,20 +419,20 @@ OSApp.Logs.displayPage = function() {
 
 					for ( k = 0; k < sortedData[ group ].length; k++ ) {
 						var sid = ( grouping === 'station' ) ? group  : sortedData[group][k][2];
-						var stationName = OSApp.Stations.getName(sid);
+						var stationName = stations[sid];
 						var runTime = sortedData[ group ][ k ][ 1 ];
 						var startTime = formatTime( sortedData[ group ][ k ][ 0 ], grouping ) ;
-                                                var endTime = formatTime( sortedData[ group ][ k ][ 3 ], grouping );
-                                                var fRate = sortedData[ group ][ k ][ 4 ];
-                                                var flowDisplay = ( typeof fRate === "number" ) ? fRate.toFixed( 2 ) + " L/min" : "";
-
-                                                groupArray[ i ] += "<tr>" +
-                                                        "<td>" + stationName + "</td>" + // Station name
-                                                        "<td>" + runTime + "</td>" + // Runtime
-                                                        "<td>" + startTime + "</td>" + // Startdate
-                                                        "<td>" + endTime + "</td>" + // Enddate
-                                                        "<td>" + flowDisplay + "</td>" + // Flow rate
-                                                        "</tr>";
+						var endTime = formatTime( sortedData[ group ][ k ][ 3 ], grouping );
+						var fRate = sortedData[ group ][ k ][ 4 ];
+						var flowDisplay = ( typeof fRate === "number" ) ? fRate.toFixed( 2 ) + " L/min" : "";
+
+						groupArray[ i ] += "<tr>" +
+							"<td>" + stationName + "</td>" + // Station name
+							"<td>" + runTime + "</td>" + // Runtime
+							"<td>" + startTime + "</td>" + // Startdate
+							"<td>" + endTime + "</td>" + // Enddate
+							"<td>" + flowDisplay + "</td>" + // Flow rate
+							"</tr>";
 					}
 					groupArray[ i ] += "</tbody></table></div>";
 

www/js/modules/options.js

@@ -202,7 +202,7 @@ OSApp.Options.showOptions = function( expandItem ) {
 						return true;
 					case "o49":
 						opt.o49 = data & 0xff;
-						opt.o64 = ( data >> 8 ) & 0xff;
+						opt.o65 = ( data >> 8 ) & 0xff;
 						return true;
 					case "o31":
 						if ( parseInt( data ) === 3 && !OSApp.Utils.unescapeJSON( $( "#wto" )[ 0 ].value ).baseETo ) {
@@ -233,6 +233,13 @@ OSApp.Options.showOptions = function( expandItem ) {
 							return true;
 						}
 						break;
+					case "tpdv":
+						var v = parseFloat( data );
+						if ( isNaN( v ) ) {
+								v = 0;
+						}
+						opt.tpdv = Math.round( v * 10 );
+						return true;
 					case "o18":
 					case "o37":
 						if ( parseInt( data ) > ( parseInt( page.find( "#o15" ).val() ) + 1 ) * 8 ) {
@@ -335,7 +342,15 @@ OSApp.Options.showOptions = function( expandItem ) {
 		timezones, tz, i;
 
 	page.find( ".submit" ).on( "click", submitOptions );
-
+	// Snap Target PD Voltage slider to 0 or ≥5.0 V
+	page.on("input change", "#tpdv", function() {
+		let v = parseFloat(this.value);
+		if (v > 0 && v < 5) {
+			// Decide which side to snap to: closer to 0 or 5
+			this.value = (v < 2.5) ? 0 : 5.0;
+			$(this).slider("refresh"); // update the UI
+		}
+	});
 	list = "<fieldset data-role='collapsible'" + ( typeof expandItem !== "string" || expandItem === "system" ? " data-collapsed='false'" : "" ) + ">" +
 		"<legend>" + OSApp.Language._( "System" ) + "</legend>";
 
@@ -845,6 +860,18 @@ OSApp.Options.showOptions = function( expandItem ) {
 			"</label><button data-mini='true' id='o30' value='" + OSApp.currentSession.controller.options.bst + "'>" + OSApp.currentSession.controller.options.bst + "ms</button></div>";
 	}
 
+	if ( OSApp.Firmware.checkOSVersion( 2214 ) && typeof OSApp.currentSession.controller.options.tpdv !== "undefined" && typeof OSApp.currentSession.controller.settings.apdv !== "undefined" && OSApp.currentSession.controller.settings.apdv > 0) {
+		list += "<div class='ui-field-contain'><label for='tpdv'>" + OSApp.Language._( "Target PD Voltage" ) +
+			"<button data-helptext='" +
+				OSApp.Language._( "The holding current of your solenoid multiplied by its coil resistance (e.g. 0.25A×30Ω=7.5V). Set to 0 to use system default." ) +
+			"' class='help-icon btn-no-border ui-btn ui-icon-info ui-btn-icon-notext'></button>" +
+			( typeof OSApp.currentSession.controller.settings.apdv !== "undefined" ?
+				"<br><span class='nobr'>(" + OSApp.Language._( "Actual" ) + ": " + ( OSApp.currentSession.controller.settings.apdv / 10 ).toFixed(1) + " V)</span>" :
+				"" ) +
+			"</label>" +
+			"<input type='range' id='tpdv' min='0' max='21' step='0.1' data-highlight='true' value='" + ( OSApp.currentSession.controller.options.tpdv / 10 ) + "'></div>";
+		}
+
 	if ( OSApp.Firmware.checkOSVersion( 2213 ) && typeof OSApp.currentSession.controller.options.imin !== "undefined" ) {
 		list += "<div class='ui-field-contain'><label for='imin'>" + OSApp.Language._( "Undercurrent Threshold" ) +
 			"<button data-helptext='" +
@@ -1733,7 +1760,7 @@ OSApp.Options.showOptions = function( expandItem ) {
 								"<label for='server' style='padding-top:10px'>" + OSApp.Language._( "Broker/Server" ) + "</label>" +
 							"</div>" +
 							"<div class='ui-block-b' style='width:60%'>" +
-								"<input class='mqtt-input' type='text' id='server' data-mini='true' maxlength='50' autocomplete='off' autocorrect='off' autocapitalize='off' spellcheck='false'" +
+								"<input class='mqtt-input' type='text' id='server' data-mini='true' maxlength='64' autocomplete='off' autocorrect='off' autocapitalize='off' spellcheck='false'" +
 									( options.en ? "" : "disabled='disabled'" ) + " placeholder='" + OSApp.Language._( "broker" ) + "' value='" + options.host + "' required />" +
 							"</div>" +
 							"<div class='ui-block-a' style='width:40%'>" +