Mobile 1.0.28

Author: oepi-loepi

Changelog.txt

@@ -1,3 +1,6 @@
+1.0.28
+- added sensors info
+
 1.0.27
 - added lighttpd.conf again to the app (was removed in previous version)
 

index.html

@@ -278,8 +278,38 @@
                     </td>
                 </tr>
             </table>
-            
+           
         </fieldset>
+		<br>
+		
+		<!--<table id="modes" cellspacing="100">-->
+		<table id="sensors" style="border:1px solid black;border-collapse:collapse;">
+			<tr>
+				<td style="border:1px solid black;" width="100px" >
+					<div id="sensor_1">
+						<div class="mode-title">Humidity</div>
+						<div class="sensor-hum" id="sensor1">12,0&#x00B0;</div>
+					</div>
+				</td>
+				<td style="border:1px solid black;" width="100px">
+						<div >TVOC</div>
+						<div class="sensor-tvoc" id="sensor2">18,0&#x00B0;</div>
+				</td>
+			</tr>
+			<tr>
+				<td style="border:1px solid black;" width="100px">
+					<div id="sensor_3" class="">
+						<div >ECO2</div>
+						<div class="sensor-eco2" id="sensor3">15,0&#x00B0;</div>
+					</div>
+				</td>
+				<td style="border:1px solid black;" width="100px">
+						<div>Light Int.</div>
+						<div class="sensorlight" id="sensor4">20,0&#x00B0;</div>
+					</div>
+				</td>
+			</tr>
+		</table>
 
 	</div><!-- /content -->
 

javascript/mobile.js

@@ -56,6 +56,7 @@ var PRODUFLOW_INFO_URL = "/hcb_rrd?action=getRrdData&loggerName=elec_produ_flow&
 var PRODU_INFO_LT_URL = "/hcb_rrd?action=getRrdData&loggerName=elec_quantity_lt_produ&rra=10yrdays&readableTime=1&nullForNaN=1&from=";
 var PRODU_INFO_NT_URL = "/hcb_rrd?action=getRrdData&loggerName=elec_quantity_nt_produ&rra=10yrdays&readableTime=1&nullForNaN=1&from=";
 
+var SENSOR_INFO_URL = "/tsc/sensors?" + Math.random();
 
 //var WATER_INFO_URL =  "water_mobile.json?tst=" + Math.random();
 var WATER_INFO_URL =  "/water.html?tst=" + Math.random();
@@ -89,6 +90,8 @@ var produNTInfoT = null;
 var waterInfoT = null;
 var waterFlowInfoT = null;
 
+var sensorInfoT = null;
+
 var plugsInfoT = null;
 var temperatureInfoT = null;
 
@@ -116,6 +119,7 @@ function initPage()
 		getSolarFlowInfo();
 		getPlugsInfo();
 		getTemperatureInfo_2();
+		getSensorInfo();
 		$.mobile.changePage("#main");
 	}
 	else
@@ -1159,6 +1163,7 @@ function handleWaterInfo(data)
 {
 	//console.log("waterdata " + data)
 	if(data && (data.result == "ok"))
+
 	{
 		if(data.water)
 			//console.log("waterflow " + data.water.flow)
@@ -1175,6 +1180,21 @@ function handleWaterInfo(data)
 }
 
 
+function handleSensorInfo(data)
+{
+	console.log("sensordata " + data)
+	if(data){
+			$("#sensors").show();
+			$("#sensor1").html(data.humidity + " %");
+			$("#sensor2").html(data.tvoc  + " ppm");
+			$("#sensor3").html(data.eco2  + " ppm");
+			$("#sensor4").html(data.intensity  + " lux");
+	}
+	else{
+		 $("#sensors").hide();
+	}
+}
+
 
 function getPwrusageInfo()
 {
@@ -1297,6 +1317,14 @@ function getWaterInfo()
 		$.getJSON( WATER_INFO_URL, handleWaterInfo);
 }
 
+function getSensorInfo()
+{
+		if(sensorInfoT != null)
+		clearTimeout(sensorInfoT);
+		$.getJSON( SENSOR_INFO_URL, handleSensorInfo);
+}
+
+
 function getPlugsInfo()
 {
 	if(plugsInfoT != null)