summaryrefslogtreecommitdiffstats
path: root/notFinishedCode
diff options
context:
space:
mode:
authorRefik Hadzialic2011-07-22 20:45:19 +0200
committerRefik Hadzialic2011-07-22 20:45:19 +0200
commit8bc09347b8ccc1267df0c40ca52865454af484dd (patch)
tree3f5895028d77b5037b85340bcdee571ecde94bb5 /notFinishedCode
parentCreated new clientController and serverHandler! (diff)
downloadgsm-selftest-8bc09347b8ccc1267df0c40ca52865454af484dd.tar.gz
gsm-selftest-8bc09347b8ccc1267df0c40ca52865454af484dd.tar.xz
gsm-selftest-8bc09347b8ccc1267df0c40ca52865454af484dd.zip
old files so I deleted them!
Diffstat (limited to 'notFinishedCode')
-rw-r--r--notFinishedCode/gsmController.py57
-rw-r--r--notFinishedCode/gsmHandler.py141
2 files changed, 0 insertions, 198 deletions
diff --git a/notFinishedCode/gsmController.py b/notFinishedCode/gsmController.py
deleted file mode 100644
index 04ecef3..0000000
--- a/notFinishedCode/gsmController.py
+++ /dev/null
@@ -1,57 +0,0 @@
-import ClientClass
-from time import sleep
-variable = 0
-
-while 1:
- variable += 1
- device1 = ClientClass.Connection('132.230.4.60',50008)
- device2 = ClientClass.Connection('localhost', 50008)
-
- tryConDev1 = device1.connect()
- tryConDev2 = device2.connect()
-
- if (tryConDev1 == 1 and tryConDev2 == 1):
- sendMessage1 = device1.sendData('HELLO HANDLER')
- sendMessage2 = device2.sendData('HELLO HANDLER')
-
- 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')
-
- recMessage1 = device1.receiveData(0)
- if recMessage1 == 'RECEIV|READY':
- sendMessage2 = device2.sendData('CALLER|447')
-
- recMessage2 = device2.receiveData(0)
-
- print 'DEVICE 1: ', recMessage1
- print 'device 2: ', recMessage2
-
- if recMessage2 == 'CALLER|READY':
- #test started
- 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'
-
- sendMessage1 = device1.sendData('TERMINATE')
- sendMessage2 = device2.sendData('TERMINATE')
-
- print device1.closeConnection()
- print device2.closeConnection()
-
- del device1
- del device2
- sleep(10)
diff --git a/notFinishedCode/gsmHandler.py b/notFinishedCode/gsmHandler.py
deleted file mode 100644
index f5bb11a..0000000
--- a/notFinishedCode/gsmHandler.py
+++ /dev/null
@@ -1,141 +0,0 @@
-import ServerClass
-import GSMClass
-import LogFileClass
-from time import sleep
-#create the log file class
-logger = LogFileClass.Logging('handlerOfSystem.log')
-
-#use this variable as the error counter
-errorCount = 0
-
-#start logging all events
-logger.logEvent('')
-
-#counter how many time we were in the while loop
-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, 20)
- handler = ServerClass.ServerHandler(50008) #define the handler port
- logger.logEvent('Created the cellPhone and handler object')
-
- #initialize the cellPhone
- initCell = cellPhone.portInit()
- logger.logEvent('Cellphone initialization was: ' + str(initCell))
-
- if initCell==1:
-
- tried = handler.openSocket()
- if tried == 1:
- logger.logEvent('Received connection from: ' + str(handler.connectedTo()))
- else:
- logger.logEvent('Could not opet socket: ' + str(handler.error))
-
- #if the controller has connected
- if handler.connected == 1:
-
- #init the variables
- recMessage = ''
- sendMessage = ''
-
- 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))
-
- if sendMessage == 1:
- recMessage = handler.receiveData(0)
- 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:]
- triedReady = handler.sendData('CALLER|READY')
-
- triedToCall = cellPhone.callNumber([numToCall])
- logger.logEvent('Tried to call: ' + str(numToCall) + '; Cell phone responded: ' + str(triedToCall))
-
- sleep(1)
-
- response = cellPhone.currentCall()
- 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:
- 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()
- 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:
- #we have a serious problem here
- handler.sendData('SHIT')
-
-
- recMessage = handler.receiveData(0)
- print recMessage
-
- if recMessage == 'TERMINATE':
- close = handler.closeConnection()
- logger.logEvent('Closed connection: ' + str(close))
-
- del cellPhone
- del handler
-
-