readSensor now close serial conection directly after read input to make sure

Norberg · Norberg · commit ccfb94bf92de · 2009-09-22T10:39:47.000+02:00
closeing is never forgotten, temp.plot now generates correctly even between
 00:00-02:00
diff --git a/readSensor.py b/readSensor.py
@@ -5,23 +5,24 @@ def readSensor():
 	ser.open()
 	ser.flushInput() # flush old input before getting new
 	input = ser.readline()
+	ser.close()
 	try:
 		sensor = re.split(" Sensor: | ", input)[1]
 	except:
 		#print "Incorretly formated:", input
-		ser.close()
 		return readSensor()
 		
 	if sensor == "Temp":
-		id = re.split("Sensor: | ID: | Temp: |C\r\n", input)[2]
-		value = re.split("Sensor: | ID: | Temp: |C\r\n", input)[3]
+		try:
+			id=re.split("Sensor: | ID: | Temp: |C\r\n", input)[2]
+			value=re.split("Sensor: | ID: | Temp: |C\r\n", input)[3]
+		except:
+			return readSensor()
 	elif sensor == "Error":
 		print input
 	else:
 		print "Incorretly formated:", input
 
-	ser.close()
-
 	return value, id, sensor 
 
 def main():
diff --git a/sensorLogger.py b/sensorLogger.py
@@ -28,17 +28,19 @@ def logging():
 		except:
 			print "ID:", id, "not found in sensorLookUp, please add"
 		
-
-	conn = sqlite3.connect("/home/simon/logger/sensors.db")
-	c = conn.cursor()
-	for name in sensorReadings:
-		#date, time, value, sensor, name
-		c.execute("insert into sensors values(?, ?, ?, ?, ?)",\
-			 [date, time, sensorReadings[name][1], \
-			  sensorReadings[name][0], name])
-
-	conn.commit();
-	c.close()
+	try:
+		conn = sqlite3.connect("/home/simon/logger/sensors.db")
+		c = conn.cursor()
+		for name in sensorReadings:
+			#date, time, value, sensor, name
+			c.execute("insert into sensors values(?, ?, ?, ?, ?)",\
+				 [date, time, sensorReadings[name][1], \
+				  sensorReadings[name][0], name])
+
+		conn.commit();
+		c.close()
+	except:
+		return False
 	print "Successfully written readings to db at:", date, time
 	return True # succesfully logged
 
@@ -49,9 +51,9 @@ def main():
 		minutesToday = timetuple[3] * 60 + timetuple[4]
 		#if its time to logg and not allready logged	
 		if minutesToday % loggTime == 0 and lastLoged != minutesToday:
-			lastLoged = minutesToday
-			logging()
-			os.system("gnuplot temp.plot")
+			if logging():
+				lastLoged = minutesToday
+				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
@@ -12,4 +12,4 @@ set yrange [0:*]
 set xdata time
 set timefmt x "%H:%M"
 set format x "%H:%M"
-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"
+plot "< sqlite3 sensors.db \"SELECT time, value from sensors where date = date('now', 'localtime') and name = 'outdoor';\"" using 1:2 title "outdoor", "< sqlite3 sensors.db \"SELECT time, value from sensors where date = date('now', 'localtime') and name = 'indoor';\"" using 1:2 title "indoor"
