summaryrefslogtreecommitdiffstats
path: root/notFinishedCode
diff options
context:
space:
mode:
authoraa1112011-07-14 18:15:26 +0200
committeraa1112011-07-14 18:15:26 +0200
commitc7bc539783863f59f032af2f310839ff7ca55b5b (patch)
tree89a8bbb90d0351fee2708648d5132b04a3741c92 /notFinishedCode
parentFinally and finally landlineCall is working and can catch the situation that ... (diff)
parentModiefied a return message in currentCall() (diff)
downloadgsm-selftest-c7bc539783863f59f032af2f310839ff7ca55b5b.tar.gz
gsm-selftest-c7bc539783863f59f032af2f310839ff7ca55b5b.tar.xz
gsm-selftest-c7bc539783863f59f032af2f310839ff7ca55b5b.zip
Merge branch 'master' of lab.ks.uni-freiburg.de:lsfks/projekte/gsm-selftest
Diffstat (limited to 'notFinishedCode')
-rw-r--r--notFinishedCode/GSMClass.py15
1 files changed, 13 insertions, 2 deletions
diff --git a/notFinishedCode/GSMClass.py b/notFinishedCode/GSMClass.py
index 105c868..e994814 100644
--- a/notFinishedCode/GSMClass.py
+++ b/notFinishedCode/GSMClass.py
@@ -14,7 +14,7 @@ class serialPort():
self.ser = 0
self.baudRate = baudRate
self.signalStrength = 0
- self.callerConnected = -1
+ #self.callerConnected = -1
self.timer = timeout
self.debugMode = 0
@@ -132,7 +132,7 @@ class serialPort():
else:
return 4
else:
- return 0
+ return 2
except Exception, e:
import traceback
if self.debugMode == 1:
@@ -175,6 +175,17 @@ class serialPort():
return 2 #not yet in a call
elif received == 'ACTIVE':
return 1 #in a call
+ elif received == 'HELD':
+ return 5 #held call
+ elif received == 'DIALING':
+ return 6 #dialing
+ elif received == 'ALERTING':
+ return 7 #alerting the call
+ elif received == 'INCOMING':
+ return 8 #incoming call
+ elif received == 'WAITING':
+ return 9 #waiting for a call
+
else:
return received #in some other state
except Exception, e: