01.21.03

ToninoTarsi · Oct 31, 2013 · 6534c18 · 6534c18
1 parent d2983df
commit 6534c18
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 27 deletions.
diff --git a/VERSION b/VERSION
@@ -1 +1 @@
-01.20.99
+01.21.03
diff --git a/sensor_ws2300.py b/sensor_ws2300.py
@@ -70,10 +70,12 @@ def GetData(self):
 			ws2300.Measure.IDS["ws"],  # "wind speed"
 			ws2300.Measure.IDS["w0"],  # "wind direction"
 			ws2300.Measure.IDS["ws"],  # "wind speed gust ???"
+			ws2300.Measure.IDS["wsu"],  # wind speed units
 			#ws2300.Measure.IDS["rh"],  # rain 1h
 			#ws2300.Measure.IDS["wsh"], # "wind speed max ??????????????"
 			]		
 
+
 		while True:
 
 			seconds = datetime.datetime.now().second
@@ -88,8 +90,10 @@ def GetData(self):
 
 				data = [ m.conv.binary2value(d) for m, d in zip(measures, raw_data)]
 
-				#print data
-
+				print "***************DUBUG********************"
+				print data
+				print "***************DUBUG********************"
+
 				globalvars.meteo_data.status = 0
 				globalvars.meteo_data.last_measure_time = datetime.datetime.now()
 				globalvars.meteo_data.idx = globalvars.meteo_data.last_measure_time

diff --git a/swpi.py b/swpi.py
@@ -42,6 +42,12 @@
 socket.setdefaulttimeout(30)
 
 ################################  functions############################
+def reset_sms(modem):
+	modem.enable_textmode(True)
+	modem.enable_clip(True)	
+	modem.enable_nmi(True)
+	log ("sms reset")
+
 
 def new_sms(modem, message):
 	"""Event Function for new incoming SMS"""
@@ -162,9 +168,11 @@ def process_sms(modem, smsID):
 			if (bbConnected ):
 				log("Try to disconnect")
 				modem.disconnectwvdial()
-				modem.enable_textmode(True)
-				modem.enable_clip(True)	
-				modem.enable_nmi(True)
+				#reset_sms(modem)
+
+				#modem.enable_textmode(True)
+				#modem.enable_clip(True)	
+				#modem.enable_nmi(True)
 
 
 			log( "DB sent by mail" )
@@ -194,9 +202,10 @@ def process_sms(modem, smsID):
 			if (bbConnected ):
 				log("Try to disconnect")
 				modem.disconnectwvdial()
-				modem.enable_textmode(True)
-				modem.enable_clip(True)	
-				modem.enable_nmi(True)
+				#reset_sms(modem)
+				#modem.enable_textmode(True)
+				#modem.enable_clip(True)	
+				#modem.enable_nmi(True)
 
 
 			log( "CFG sent by mail" )
@@ -231,9 +240,11 @@ def process_sms(modem, smsID):
 			if (bbConnected ):
 				log("Try to disconnect")
 				modem.disconnectwvdial()
-				modem.enable_textmode(True)
-				modem.enable_clip(True)	
-				modem.enable_nmi(True)
+				#reset_sms(modem)
+
+				#modem.enable_textmode(True)
+				#modem.enable_clip(True)	
+				#modem.enable_nmi(True)
 
 
 			log( "LOG sent by mail" )
@@ -264,9 +275,10 @@ def process_sms(modem, smsID):
 			if (bbConnected ):
 				log("Try to disconnect")
 				modem.disconnectwvdial()
-				modem.enable_textmode(True)
-				modem.enable_clip(True)	
-				modem.enable_nmi(True)
+				#reset_sms(modem)
+				#modem.enable_textmode(True)
+				#modem.enable_clip(True)	
+				#modem.enable_nmi(True)
 
 
 			log( "All LOG sent by mail" )
@@ -399,11 +411,15 @@ def process_sms(modem, smsID):
 		if conn:
 			conn.close()
 
-		modem.sms_del(msgID)	
+		modem.sms_del(msgID)
+		#log("alla fine  dei messaggi reset sms")
+		reset_sms(modem)	
 		return True
 	except :
 		log( "D - Exept in MSG" )
 		modem.sms_del(msgID)
+		#log("se errore in sms reset ")
+		reset_sms(modem)	
 		if conn:
 			conn.close()
 		return False
@@ -650,14 +666,18 @@ def answer_call(modem, message):
 modem = humod.Modem(cfg.dongleDataPort,cfg.dongleAudioPort,cfg.dongleCtrlPort,cfg)
 # Init Dongle
 if cfg.usedongle :
-
-	modem.enable_textmode(True)
-	modem.enable_clip(True)	
-	modem.enable_nmi(True)
+	#reset_sms(modem)
+	#modem.enable_textmode(True)
+	#modem.enable_clip(True)	
+	#modem.enable_nmi(True)
 	sms_action = (humod.actions.PATTERN['new sms'], new_sms)
 	call_action = (humod.actions.PATTERN['incoming callclip'], answer_call)
 	actions = [sms_action , call_action]
 	modem.prober.start(actions) # Starts the prober.
+	#modem.enable_nmi(True)
+	reset_sms(modem)
+
+
 	print ""
 	log( "Modem Model : "  + modem.show_model())
 	log(  "Revision : "  + modem.show_revision())
@@ -676,8 +696,11 @@ def answer_call(modem, message):
 	log( "Trying to connect to internet with 3G dongle ....")
 	time.sleep(1)
 	modem.connectwvdial()
+	#test
+	#modem.enable_nmi(True)
 	time.sleep(2)
 	waitForIP()
+	reset_sms(modem)
 	if ( not cfg.AlwaysOnInternet ) :
 		bConnected = True
 
@@ -748,9 +771,10 @@ def answer_call(modem, message):
 if bConnected:
 	log("Try to disconnect")
 	modem.disconnectwvdial()
-	modem.enable_textmode(True)
-	modem.enable_clip(True)	
-	modem.enable_nmi(True)
+	reset_sms(modem)
+	#modem.enable_textmode(True)
+	#modem.enable_clip(True)	
+	#modem.enable_nmi(True)
 
 # Wait for valid data
 maxwait = 0
@@ -933,9 +957,10 @@ def answer_call(modem, message):
 				if bConnected:
 					log("Try to disconnect")
 					modem.disconnectwvdial()
-					modem.enable_textmode(True)
-					modem.enable_clip(True)	
-					modem.enable_nmi(True)
+					reset_sms(modem)
+					#modem.enable_textmode(True)
+					#modem.enable_clip(True)	
+					#modem.enable_nmi(True)
 			else:
 				log("Error. Non internet connection available")
 
@@ -951,6 +976,11 @@ def answer_call(modem, message):
 
 		#Check disk space
 		disk_space = disk_free()
+		if cfg.usedongle :
+			#log("alla fine")
+			reset_sms(modem)
+		#modem.enable_nmi(True)
+		#log("reset sms")
 		if ( disk_space < 500000000L ):
 			log("Clearing /var/log/")
 			os.system( "sudo rm -r /var/log/*" )
@@ -959,7 +989,6 @@ def answer_call(modem, message):
 
 		globalvars.WatchDogTime = datetime.datetime.now()
 
-
 		if ( plugin_sync != None ):
 			plugin_sync.run_after()