Skip to content

Commit 24fcc02

Browse files
committed
better formatting of raw send, receive
1 parent e6ca6fb commit 24fcc02

8 files changed

Lines changed: 16 additions & 16 deletions

example_datagram_transfer.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ def usage():
6868

6969

7070
def sendToSocket(string):
71-
print(" SR: "+string)
71+
print(" SR: "+string.strip())
7272
s.send(string)
7373

7474

@@ -143,6 +143,6 @@ def datagramWrite():
143143
# process resulting activity
144144
while True:
145145
received = s.receive()
146-
print(" RR: {}".format(received))
146+
print(" RR: {}".format(received.strip()))
147147
# pass to link processor
148148
canPhysicalLayerGridConnect.receiveString(received)

example_frame_interface.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@ def usage():
6161

6262

6363
def sendToSocket(string):
64-
print(" SR: {}".format(string))
64+
print(" SR: {}".format(string.strip()))
6565
s.send(string)
6666

6767

@@ -80,6 +80,6 @@ def printFrame(frame):
8080
# display response - should be RID from nodes
8181
while True:
8282
received = s.receive()
83-
print(" RR: {}".format(received))
83+
print(" RR: {}".format(received.strip()))
8484
# pass to link processor
8585
canPhysicalLayerGridConnect.receiveString(received)

example_memory_transfer.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,7 @@ def usage():
7474

7575

7676
def sendToSocket(string):
77-
print(" SR: {}".format(string))
77+
print(" SR: {}".format(string.strip()))
7878
s.send(string)
7979

8080

@@ -159,6 +159,6 @@ def memoryRead():
159159
# process resulting activity
160160
while True:
161161
received = s.receive()
162-
print(" RR: {}".format(received))
162+
print(" RR: {}".format(received.strip()))
163163
# pass to link processor
164164
canPhysicalLayerGridConnect.receiveString(received)

example_message_interface.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ def usage():
6565

6666

6767
def sendToSocket(string):
68-
print(" SR: {}".format(string))
68+
print(" SR: {}".format(string.strip()))
6969
s.send(string)
7070

7171

@@ -99,6 +99,6 @@ def printMessage(msg):
9999
# process resulting activity
100100
while True:
101101
received = s.receive()
102-
print(" RR: {}".format(received))
102+
print(" RR: {}".format(received.strip()))
103103
# pass to link processor
104104
canPhysicalLayerGridConnect.receiveString(received)

example_node_implementation.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ def usage():
6969

7070

7171
def sendToSocket(string):
72-
print(" SR: {}".format(string))
72+
print(" SR: {}".format(string.strip()))
7373
s.send(string)
7474

7575

@@ -143,6 +143,6 @@ def memoryReadFail(memo):
143143
# process resulting activity
144144
while True:
145145
input = s.receive()
146-
print(" RR: "+input)
146+
print(" RR: "+input.strip())
147147
# pass to link processor
148148
canPhysicalLayerGridConnect.receiveString(input)

example_remote_nodes.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ def usage():
7676
print("RR, SR are raw socket interface receive and send; RL, SL are link (frame) interface")
7777

7878
def sendToSocket(string) :
79-
if trace : print(" SR: "+string)
79+
if trace : print(" SR: "+string.strip())
8080
s.send(string)
8181

8282
def receiveFrame(frame) :
@@ -122,7 +122,7 @@ def receiveLoop() :
122122
canPhysicalLayerGridConnect.physicalLayerUp()
123123
while True:
124124
input = s.receive()
125-
if trace : print(" RR: "+input)
125+
if trace : print(" RR: "+input.strip())
126126
# pass to link processor
127127
canPhysicalLayerGridConnect.receiveString(input)
128128
import threading

example_string_interface.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,8 @@ def usage():
5959
# elicit response
6060
AME = ":X10702001N;"
6161
s.send(AME)
62-
print("SR: {}".format(AME))
62+
print("SR: {}".format(AME.strip()))
6363

6464
# display response - should be RID from node(s)
6565
while True: # have to kill this manually
66-
print("RR: {}".format(s.receive()))
66+
print("RR: {}".format(s.receive().strip()))

example_tcp_message_interface.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def usage():
6464

6565

6666
def sendToSocket(data):
67-
print(" SR: {}".format(data))
67+
print(" SR: {}".format(data.strip()))
6868
s.send(data)
6969

7070
def printMessage(msg):
@@ -88,6 +88,6 @@ def printMessage(msg):
8888
# process resulting activity
8989
while True:
9090
received = s.receive()
91-
print(" RR: {}".format(received))
91+
print(" RR: {}".format(received.strip()))
9292
# pass to link processor
9393
tcpLinklayer.receiveListener(received)

0 commit comments

Comments
 (0)