summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--notFinishedCode/gsmController.py16
-rw-r--r--notFinishedCode/gsmHandler.py41
2 files changed, 45 insertions, 12 deletions
diff --git a/notFinishedCode/gsmController.py b/notFinishedCode/gsmController.py
index b9e6353..04ecef3 100644
--- a/notFinishedCode/gsmController.py
+++ b/notFinishedCode/gsmController.py
@@ -5,7 +5,7 @@ variable = 0
while 1:
variable += 1
device1 = ClientClass.Connection('132.230.4.60',50008)
- device2 = ClientClass.Connection('localhost', 50009)
+ device2 = ClientClass.Connection('localhost', 50008)
tryConDev1 = device1.connect()
tryConDev2 = device2.connect()
@@ -16,6 +16,9 @@ while 1:
recMessage1 = device1.receiveData(0)
recMessage2 = device2.receiveData(0)
+
+ print 'DEVICE 1: ', recMessage1
+ print 'device 2: ', recMessage2
if (recMessage1 == 'HELLO CONTROLLER' and recMessage2 == 'HELLO CONTROLLER'):
sendMessage1 = device1.sendData('RECEIV')
@@ -25,13 +28,20 @@ while 1:
sendMessage2 = device2.sendData('CALLER|447')
recMessage2 = device2.receiveData(0)
+
+ print 'DEVICE 1: ', recMessage1
+ print 'device 2: ', recMessage2
+
if recMessage2 == 'CALLER|READY':
#test started
- pass
+ print 'TEST STARTED'
recMessage1 = device1.receiveData(0)
recMessage2 = device2.receiveData(0)
+ print 'DEVICE 1: ', recMessage1
+ print 'device 2: ', recMessage2
+
if (recMessage1 == 'CALLOK' and recMessage2 == 'CALLOK'):
print 'call was really OK'
@@ -44,4 +54,4 @@ while 1:
del device1
del device2
- sleep(2)
+ sleep(10)
diff --git a/notFinishedCode/gsmHandler.py b/notFinishedCode/gsmHandler.py
index 31b39ee..f5bb11a 100644
--- a/notFinishedCode/gsmHandler.py
+++ b/notFinishedCode/gsmHandler.py
@@ -16,10 +16,10 @@ whileCounter =0
while 1:
whileCounter += 1 #increment the counter for 1
-
+ logger.logEvent('--------------------------------------------------------------------')
#create the two objects, one for serial port other for socket
- cellPhone = GSMClass.serialPort('/dev/ttyUSB0', 19200, 10)
- handler = ServerClass.ServerHandler(50009) #define the handler port
+ cellPhone = GSMClass.serialPort('/dev/ttyUSB0', 19200, 20)
+ handler = ServerClass.ServerHandler(50008) #define the handler port
logger.logEvent('Created the cellPhone and handler object')
#initialize the cellPhone
@@ -44,6 +44,8 @@ while 1:
recMessage = handler.receiveData(0)
logger.logEvent('Received: ' + str(recMessage))
+ print recMessage
+
if recMessage == 'HELLO HANDLER':
sendMessage = handler.sendData('HELLO CONTROLLER')
logger.logEvent('Sent was successful: ' + str(sendMessage))
@@ -53,9 +55,11 @@ while 1:
logger.logEvent('Received: ' + str(recMessage))
else:
#we have a problem
+ logger.logEvent('Message sent error: ' + str(sendMessage))
pass
+ print recMessage
if recMessage[0:6] == 'CALLER':
numToCall = recMessage[7:]
@@ -63,42 +67,60 @@ while 1:
triedToCall = cellPhone.callNumber([numToCall])
logger.logEvent('Tried to call: ' + str(numToCall) + '; Cell phone responded: ' + str(triedToCall))
+
sleep(1)
+
response = cellPhone.currentCall()
- while(response != 1):
+ testCounter = 0
+ while(response != 1 and testCounter!=10):
+ sleep(1)
+ testCounter += 1
response = cellPhone.currentCall()
#reufe add here an timer for 5 seconds if other side doesn't respond
if response == 1:
- cellPhone.getSignalQuality()
- signalQuality = cellPhone.signalStrength
+ if cellPhone.getSignalQuality() == 1:
+ signalQuality = cellPhone.signalStrength
+ print signalQuality
if response == 1:
handler.sendData('CALLOK')
+ print 'CALL OK'
else:
handler.sendData('CALLNO')
+ print 'CALL NOT OK'
triedHangUp = cellPhone.hangUp()
- #do here rest for caller
+ logger.logEvent('Tried to hang up call: ' + str(triedHangUp))
+ #do here rest for caller
+
+
elif recMessage[0:6] == 'RECEIV':
handler.sendData('RECEIV|READY')
+
triedToRec = cellPhone.receiveCall()
logger.logEvent('Received call was successful: ' + str(triedToRec))
+ print recMessage
+
if triedToRec == 1:
#I received the call successfully
+ sleep(1)
+
triedSignal = cellPhone.getSignalQuality()
if triedSignal == 1:
signalQuality = handler.signalStrength
logger.logEvent('Signal quality in dBm: ' + str(signalQuality))
-
+ print signalQuality, 'dBm'
+
triedHangUp = cellPhone.hangUp()
logger.logEvent('Receiver call tried to hang up: ' + str(triedHangUp))
sendMessage = handler.sendData('CALLOK')
+ print 'CALL OK'
else:
sendMessage = handler.sendData('CALLNO')
-
+ print 'CALL NOT OK'
#do here rest receiver
else:
@@ -107,6 +129,7 @@ while 1:
recMessage = handler.receiveData(0)
+ print recMessage
if recMessage == 'TERMINATE':
close = handler.closeConnection()