sensorLogger now inserts value in db in the right order

Norberg · Norberg · commit 7fcea46c74f0 · 2009-09-16T09:14:48.000+02:00
readSensor now closes serialconection even if exception ocurred
diff --git a/readSensor.py b/readSensor.py
@@ -3,11 +3,13 @@
 def readSensor():
 	ser = serial.Serial(port="/dev/ttyUSB0", baudrate=9600, timeout=3)
 	ser.open()
+	ser.flushInput() # flush old input before getting new
 	input = ser.readline()
 	try:
 		sensor = re.split(" Sensor: | ", input)[1]
 	except:
 		#print "Incorretly formated:", input
+		ser.close()
 		return readSensor()
 		
 	if sensor == "Temp":
@@ -31,3 +33,4 @@ def main():
 
 if __name__ == "__main__":
 	main()
+	main()
diff --git a/sensorLogger.py b/sensorLogger.py
@@ -1,9 +1,10 @@
-import sqlite3, time, datetime
+import sqlite3, time, datetime, os
 import readSensor
 
 #settings
 loggTime = 5 # nr of minutes between logging to db
-sensorLookUp = {"10 DE C6 35 1 8 0 86" : "outside", \
+sensorLookUp = {"10 DE C6 35 1 8 0 86" : "indoor", \
+		"10 87 35 36 1 8 0 5E" : "outdoor", \
 		"10 C4 EB 35 1 8 0 6" : "test"}
 
 def logging():
@@ -33,8 +34,8 @@ def logging():
 	for name in sensorReadings:
 		#date, time, value, sensor, name
 		c.execute("insert into sensors values(?, ?, ?, ?, ?)",\
-			 [date, time, sensorReadings[name][0], \
-			  sensorReadings[name][1], name])
+			 [date, time, sensorReadings[name][1], \
+			  sensorReadings[name][0], name])
 
 	conn.commit();
 	c.close()
@@ -50,6 +51,7 @@ def main():
 		if minutesToday % loggTime == 0 and lastLoged != minutesToday:
 			lastLoged = minutesToday
 			logging()
+			os.system("gnuplot temp.plot")
 		time.sleep(30) # sleep 30 seconds	
 			
 
diff --git a/sensors.db b/sensors.db
diff --git a/temp.plot b/temp.plot
@@ -4,12 +4,12 @@ set xlabel "Datetime"
 set ylabel "Celcius"
 
 set terminal png
-set output "temp.png"
+set output "/var/www/temp.png"
 set datafile separator "|"
 set style data lines
 set grid
 set yrange [0:*]
 set xdata time
 set timefmt x "%H:%M"
 set format x "%H:%M"
-plot "< sqlite3 temp.db \"SELECT time, degree from temp where date = date('now') and sensor = 'test';\"" using 1:2 title "test", "< sqlite3 temp.db \"SELECT time, degree from temp where date = date('now') and sensor = 'outside';\"" using 1:2 title "outside"
+plot "< sqlite3 sensors.db \"SELECT time, value from sensors where date = date('now') and name = 'outdoor';\"" using 1:2 title "outdoor", "< sqlite3 sensors.db \"SELECT time, value from sensors where date = date('now') and name = 'indoor';\"" using 1:2 title "indoor"
