Skip to content

Commit e092996

Browse files
committed
v2 tested working
1 parent b4a7469 commit e092996

File tree

4 files changed

+48
-139
lines changed

4 files changed

+48
-139
lines changed

connector_send_rcv.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ def listener():
101101
# print("test")
102102
# time.sleep(1)
103103
packet = udp.recvfrom(1024)
104-
time.sleep(float((random.randint(0, 6)))/1000) #simulate network jitter
104+
# time.sleep(float((random.randint(0, 6)))/1000) #simulate network jitter
105105
message = packet[0]
106106
payload = message.split(b'sequenceno')[0]
107107
raw_sequence = message.split(b'sequenceno')[1]
@@ -122,11 +122,12 @@ def printer():
122122
# print("printing")
123123
try:
124124
read = data.pop(0)
125+
time.sleep(0.01)
125126
ts = read['ts']
126127
toSend = read['data']
127-
if first_run == True:
128-
# time.sleep(jitterBuff)
129-
first_run = False
128+
# if first_run == True:
129+
# # time.sleep(jitterBuff)
130+
# first_run = False
130131
#print(toSend)
131132
latency = round(((time.time() - ts)*1000),0)
132133
print('latency: %sms' % latency)

functionality_tests/tunnel_v2.py

Lines changed: 20 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,10 @@
1818
from modemClass import Modem
1919

2020
side = ""
21-
com_port = sys.argv[1]
21+
try:
22+
com_port = sys.argv[1]
23+
except:
24+
com_port = raw_input("Enter a com port e.g. COM4 >> ")
2225
device_and_speed = [com_port,57600]
2326
opponent = socket.gethostbyname(socket.gethostname())
2427
data = []
@@ -27,7 +30,12 @@
2730

2831
#PORT = 65432 # Port to listen on (non-privileged ports are > 1023)
2932
state = "disconnected"
30-
jitterBuff = 0.0
33+
try:
34+
if sys.argv[3] == "jitterBuff":
35+
jitterBuff = True
36+
except:
37+
jitterBuff = False
38+
3139
poll_rate = 0.01
3240
sync_delay = 0
3341
start = 0
@@ -43,8 +51,9 @@ def initConnection(ms):
4351

4452
global opponent
4553
global start
46-
ip = requests.get('https://api.ipify.org').content.decode('utf8')
54+
# ip = requests.get('https://api.ipify.org').content.decode('utf8')
4755
#print(f'My IP address is: {ip}')
56+
ip = str(3)
4857
if ms == "slave":
4958
print("I'm slave")
5059
PORT = tcpPort
@@ -103,8 +112,8 @@ def listener():
103112
raw_sequence = message.split(b'sequenceno')[1]
104113
sequence = struct.unpack('d',raw_sequence)[0]
105114
data.append({'ts':sequence,'data':payload})
106-
if len(payload) > 0:
107-
print(payload)
115+
# if len(payload) > 0:
116+
# print(payload)
108117
except KeyboardInterrupt:
109118
print("Error thread 1")
110119
sys.exit()
@@ -117,6 +126,8 @@ def printer():
117126
while(state == "connected"):
118127
try:
119128
read = data.pop(0)
129+
if jitterBuff == True:
130+
time.sleep(0.01)
120131
ts = read['ts']
121132
toSend = read['data']
122133
if first_run == True:
@@ -147,6 +158,9 @@ def sender():
147158
ser.read(1024)
148159
first_run = False
149160
raw_input = ser.read(1024)
161+
if len(raw_input) == 0:
162+
# print("empty")
163+
continue
150164
if "NO CARRIER" in raw_input:
151165
state = "disconnected"
152166
break
@@ -305,7 +319,7 @@ def process():
305319
state = initConnection(side)
306320
print(state)
307321
sync_delay = start-time.time()
308-
time.sleep(sync_delay)
322+
time.sleep(0.2)
309323

310324
if state == "connected":
311325
t1.start()

versions/tunnel_v2/tunnel_v2.py

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
from ports_def import tcp_ports
1010
from ports_def import udp_ports
1111
import sys
12-
import requests
12+
# import requests
1313
import struct
1414
import time
1515
import threading
@@ -43,7 +43,8 @@ def initConnection(ms):
4343

4444
global opponent
4545
global start
46-
ip = requests.get('https://api.ipify.org').content.decode('utf8')
46+
# ip = requests.get('https://api.ipify.org').content.decode('utf8')
47+
ip = str(3)
4748
#print(f'My IP address is: {ip}')
4849
if ms == "slave":
4950
print("I'm slave")
@@ -299,15 +300,16 @@ def process():
299300
# t2.setDaemon(True)
300301
t3 = threading.Thread(target=sender)
301302
# t3.setDaemon(True)
302-
udp = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
303-
udp.bind((HOST, udp_ports[side]))
303+
304304
ser = serial.Serial(com_port, device_and_speed[1], timeout=poll_rate)
305305
state = initConnection(side)
306306
print(state)
307307
sync_delay = start-time.time()
308-
time.sleep(sync_delay)
308+
time.sleep(0.2)
309309

310310
if state == "connected":
311+
udp = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
312+
udp.bind((HOST, udp_ports[side]))
311313
t1.start()
312314
t2.start()
313315
t3.start()

0 commit comments

Comments
 (0)