summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xFor Weekly Test/tricode/gsmselftest-website2.py6
-rwxr-xr-xFor Weekly Test/tricode/usbDetectClass.py4
2 files changed, 4 insertions, 6 deletions
diff --git a/For Weekly Test/tricode/gsmselftest-website2.py b/For Weekly Test/tricode/gsmselftest-website2.py
index 1366957..ce69cf7 100755
--- a/For Weekly Test/tricode/gsmselftest-website2.py
+++ b/For Weekly Test/tricode/gsmselftest-website2.py
@@ -32,12 +32,6 @@ class TimeoutException(Exception):
global resultsList
resultsList = list()
-GSMListPrefix = [['GSMExt.Tm','0151'],['GSMExt.Tm','0160'],['GSMExt.Tm','0170'],['GSMExt.Tm','0171'],['GSMExt.Tm','0175'],['GSMExt.Voda','0152'],['GSMExt.Voda','0162'],['GSMExt.Voda','0172'],['GSMExt.Voda','0173'],['GSMExt.Voda','0174'],['GSMExt.Eplus','0157'],['GSMExt.Eplus','0177'],['GSMExt.Eplus','0155'],['GSMExt.Eplus','0163'],['GSMExt.Eplus','0178'],['GSMExt.O2','0159'],['GSMExt.O2','0176'],['GSMExt.O2','0179'],['GSMRZ1','0761']]
-
-[['GSMExt.Tm', '0151'], ['GSMExt.Tm', '0160'], ['GSMExt.Tm', '0170'], ['GSMExt.Tm', '0175'], ['GSMExt.Tm', '0171'], ['GSMExt.Voda', '0162'], ['GSMExt.Voda', '0172'], ['GSMExt.Voda', '0173'], ['GSMExt.Voda', '0174'], ['GSMExt.Eplus', '0157'], ['GSMExt.Eplus', '0177'], ['GSMExt.Eplus', '0155'], ['GSMExt.Eplus', '0163'], ['GSMExt.Eplus', '0178'], ['GSMExt.O2', '0159'], ['GSMExt.O2', '0176'], ['GSMExt.O2', '0179'], ['GSMRZ1', '0761']]
-
-
-
def timeout_handler(signum, frame):
raise TimeoutException()
diff --git a/For Weekly Test/tricode/usbDetectClass.py b/For Weekly Test/tricode/usbDetectClass.py
index 74744a5..57f4dd1 100755
--- a/For Weekly Test/tricode/usbDetectClass.py
+++ b/For Weekly Test/tricode/usbDetectClass.py
@@ -82,6 +82,10 @@ class serialPort:
number = cutString[1:secondQuote-1]
if number != '':
+ if number.find('+') == 0:
+ number = '0'+number[3:len(number)]
+ elif int(number[0:1]) == 4:
+ number = '0'+number[2:len(number)]
self.number = number
else:
self.number = 'number not found'