add some units and prefixes to the JSON output

sirleech · May 9, 2012 · 51b1fbd · 51b1fbd
1 parent 191e727
commit 51b1fbd
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/temperature.py b/temperature.py
@@ -24,7 +24,7 @@ def exportToJson(temperature):
 	import utils
 	import json
 	f = open('sensors/temperature.json','w')
-	reading = {'temperature': temperature, 'lastUpdated': utils.getTimeString()}
+	reading = {'unit':'degrees celcius','unitPrefix':'&deg;C','value': temperature, 'lastUpdated': utils.getTimeString()}
 	f.write(json.dumps(reading))
 	f.close()
 

diff --git a/web/index.html b/web/index.html
@@ -20,8 +20,8 @@
 				client.onreadystatechange = function() {
 					 //alert(client.responseText);
 					 var temperatureReading = eval('(' + client.responseText + ')');
-					 document.getElementById("temp").innerHTML = Math.round(temperatureReading.temperature*10)/10 +"c";
-					 document.getElementById("lastUpdated").innerHTML = temperatureReading.lastUpdated;
+					 document.getElementById("temp").innerHTML = Math.round(temperatureReading.value*10)/10 + temperatureReading.unitPrefix;
+					 document.getElementById("lastUpdated").innerHTML = temperatureReading.value;
 				}
 				client.send();
 			}