print RX: 0 when channel selection finishes

test that all matches are made before using them.
This commit is contained in:
Mariano Alvira 2012-04-09 10:24:43 -04:00
parent 5ad915b57f
commit 19c3a0efc9

View File

@ -40,12 +40,14 @@ while chan != int(sys.argv[2]) - 11:
while 1: while 1:
chanstr += os.read(serport, 1) chanstr += os.read(serport, 1)
m = re.match(".*channel: (\w+)\s+", chanstr) m = re.match(".*channel: (\w+)\s+", chanstr)
if m != None: if m is not None:
chan = int(m.group(1)) chan = int(m.group(1))
break break
os.close(serport) os.close(serport)
sys.stderr.write("RX: 0")
try: try:
serport = open(sys.argv[1], 'r+') serport = open(sys.argv[1], 'r+')
except IOError: except IOError:
@ -75,7 +77,7 @@ try:
m_rftestline = re.match(".*rftest-rx --- len 0x(\w\w).*", line) m_rftestline = re.match(".*rftest-rx --- len 0x(\w\w).*", line)
if m_rftestline != None: if m_rftestline is not None:
newpacket = 1 newpacket = 1
t = time.time() t = time.time()
sec = int(t) sec = int(t)
@ -102,6 +104,7 @@ try:
for d in line.split(' '): for d in line.split(' '):
# do a match because their might be a \r floating around # do a match because their might be a \r floating around
m = re.match('.*(\w\w).*', d) m = re.match('.*(\w\w).*', d)
if m is not None:
sys.stdout.write(pack('<B', int(m.group(1),16))) sys.stdout.write(pack('<B', int(m.group(1),16)))