r238 - trunk/software/pyneod/pygsm

[smartphones-commits at lists.linuxtogo.org]

Author: emdete
Date: 2008-04-21 11:13:29 +0200 (Mon, 21 Apr 2008)
New Revision: 238

Modified:
   trunk/software/pyneod/pygsm/ficmodem.py
   trunk/software/pyneod/pygsm/genericmodem.py
Log:
due to missing docs on AT+CPI just issue a AT+CPAS


Modified: trunk/software/pyneod/pygsm/ficmodem.py
===================================================================
--- trunk/software/pyneod/pygsm/ficmodem.py	2008-04-21 08:30:43 UTC (rev 237)
+++ trunk/software/pyneod/pygsm/ficmodem.py	2008-04-21 09:13:29 UTC (rev 238)
@@ -105,4 +105,11 @@
 
 	def unsolCGEV(self, _name, *values): # reports GPRS network events
 		LOG(LOG_WARNING, 'unsolCGEV', values)
+
+	def unsolCPI(self, _name, cId, msgType, ibt, tch, dir, mode=Empty, number=Empty, type=Empty, alpha=Empty, cause=Empty, line=Empty):
+		# incoming starts %CPI: 1,4,1,1,1,0,"+4917xxxxxxxx",145,"emdete",,0'
+		# incoming ends__ %CPI: 1,1,0,1,1,0,"+4917xxxxxxxx",145,"emdete",16,0'
+		LOG(LOG_DEBUG, __name__, 'calling progress indicator', cId, msgType, ibt, tch, dir, mode, number, type, alpha, cause, line, )
+		self.request('+CPAS', self.responseCPAS) # request phone activity status
+
 # vim:tw=0:nowrap

Modified: trunk/software/pyneod/pygsm/genericmodem.py
===================================================================
--- trunk/software/pyneod/pygsm/genericmodem.py	2008-04-21 08:30:43 UTC (rev 237)
+++ trunk/software/pyneod/pygsm/genericmodem.py	2008-04-21 09:13:29 UTC (rev 238)
@@ -71,40 +71,34 @@
 			revision=Empty,
 			imei=Empty,
 			)
+		self._sim_auth_status = dict(
+			imsi=Empty,
+			pin_state=Empty,
+			subscriber_number=Empty,
+			)
 		self._network_status = dict(
+			alpha=Empty,
 			ber=Empty,
 			ci=Empty,
-			cipher_state_gsm=Empty,
 			cipher_state_gprs=Empty,
-			#cli_alpha=Empty,
-			#cli_number=Empty,
-			#cli_satype=Empty,
-			#cli_subaddr=Empty,
-			#cli_type=Empty,
-			#cli_validity=Empty, 
-			#col_alpha=Empty,
-			#col_number=Empty,
-			#col_satype=Empty,
-			#col_subaddr=Empty,
-			#col_type=Empty,
-			#col_validity=Empty, 
+			cipher_state_gsm=Empty,
 			function=Empty,
 			lac=Empty,
+			mcc=Empty,
+			mnc=Empty,
+			number=Empty,
 			operator_selection_format=Empty,
 			operator_selection_mode=Empty,
 			oper=Empty,
 			phone_activity_status=Empty,
 			rssi=Empty,
+			satype=Empty,
 			stat=Empty,
+			subaddr=Empty,
+			type=Empty,
+			validity=Empty, 
 			wireless_selected_46=Empty,
-			mnc=Empty,
-			mcc=Empty,
 			)
-		self._sim_auth_status = dict(
-			imsi=Empty,
-			subscriber_number=Empty,
-			pin_state=Empty,
-			)
 	
 	def open(self):
 		MuxedLines.open(self)
@@ -248,12 +242,12 @@
 	def unsolCLIP(self, _name, number, type, subaddr=Empty, satype=Empty, alpha=Empty, cli_validity=Empty, ):
 		LOG(LOG_DEBUG, __name__, 'calling line identification presentation', number, type, subaddr, satype, alpha, cli_validity)
 		_network_status = dict(self._network_status, 
-			cli_number=number,
-			cli_type=type,
-			cli_subaddr=subaddr,
-			cli_satype=satype,
-			cli_alpha=alpha,
-			cli_validity=cli_validity, 
+			number=number,
+			type=type,
+			subaddr=subaddr,
+			satype=satype,
+			alpha=alpha,
+			validity=cli_validity, 
 			)
 		#if _network_status != self._network_status:
 		self.NetworkStatus(_network_status)
@@ -264,17 +258,15 @@
 			)
 		#if _network_status != self._network_status:
 		self.NetworkStatus(_network_status)
-	def unsolCPI(self, _name, *values):
-		LOG(LOG_DEBUG, __name__, 'calling progress indicator', *values)
 	def responseCOLP(self, _name, number, type, subaddr=Empty, satype=Empty, alpha=Empty, cli_validity=Empty, ):
 		LOG(LOG_DEBUG, __name__, 'connected line identification presentation', number, type, subaddr, satype, alpha, cli_validity)
 		_network_status = dict(self._network_status, 
-			col_number=number,
-			col_type=type,
-			col_subaddr=subaddr,
-			col_satype=satype,
-			col_alpha=alpha,
-			col_validity=cli_validity, 
+			number=number,
+			type=type,
+			subaddr=subaddr,
+			satype=satype,
+			alpha=alpha,
+			validity=cli_validity, 
 			)
 		#if _network_status != self._network_status:
 		self.NetworkStatus(_network_status)