Apple-2-SW
/
ProDOS-Utils
mirror of https://github.com/bobbimanners/ProDOS-Utils.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #18 from rharke/renee-serial-no-ip 

Don't use IP on serial connections
This commit is contained in:
Bobbi Webber-Manners 2023-02-02 17:31:51 -05:00 committed by GitHub
parent 37e05b8508 65af2b99f9
commit 373eab52c9
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
veserver.py
View File

@ -122,9 +122,11 @@ def augment_filename(filename, ip):
# See if augmented filename exists, if so return that name # See if augmented filename exists, if so return that name
# otherwise return the unaugmented name # otherwise return the unaugmented name
# #
def select_filename(filename, ip): def select_filename(filename, addr):
if serial_port: if serial_port:
return filename return filename
ip = addr[0]
ip = ip[ip.rfind(":")+1:]
filename_with_ip = augment_filename(filename, ip) filename_with_ip = augment_filename(filename, ip)
try: try:
with open(filename_with_ip, 'r+b'): with open(filename_with_ip, 'r+b'):
@ -136,7 +138,7 @@ def select_filename(filename, ip):
# #
# Read block with date/time update # Read block with date/time update
# #
def read3(dataport, addr, ip, d): def read3(dataport, addr, d):
global packet global packet
d = dataport.recvmore(d, 3) d = dataport.recvmore(d, 3)
@ -150,7 +152,7 @@ def read3(dataport, addr, ip, d):
drv = 2 drv = 2
skip = skip2 skip = skip2
filename = select_filename(filename, ip) filename = select_filename(filename, addr)
blknum = d[2] + 256 * d[3] blknum = d[2] + 256 * d[3]
@ -192,12 +194,12 @@ def read3(dataport, addr, ip, d):
printinfo(drv, blknum, False, err, cs, filename) printinfo(drv, blknum, False, err, cs, filename)
b = dataport.sendto(bytearray(l), addr) b = dataport.sendto(bytearray(l), addr)
#print('Sent {} bytes to {}'.format(b, ip)) #print('Sent {} bytes to {}'.format(b, addr))
# #
# Write block # Write block
# #
def write(dataport, addr, ip, d): def write(dataport, addr, d):
global packet global packet
d = dataport.recvmore(d, BLKSZ + 4) d = dataport.recvmore(d, BLKSZ + 4)
@ -211,7 +213,7 @@ def write(dataport, addr, ip, d):
drv = 2 drv = 2
skip = skip2 skip = skip2
filename = select_filename(filename, ip) filename = select_filename(filename, addr)
cs = 0 cs = 0
for i in range (0, BLKSZ): for i in range (0, BLKSZ):
@ -250,7 +252,7 @@ def write(dataport, addr, ip, d):
printinfo(drv, blknum, True, err, cs, filename) printinfo(drv, blknum, True, err, cs, filename)
b = dataport.sendto(bytearray(l), addr) b = dataport.sendto(bytearray(l), addr)
#print('Sent {} bytes to {}'.format(b, ip)) #print('Sent {} bytes to {}'.format(b, addr))
# #
# See if file is a 2MG and, if so, that it contains .PO image # See if file is a 2MG and, if so, that it contains .PO image
@ -377,14 +379,12 @@ with DataPort(serial_port, baud_rate) as dataport:
while True: while True:
try: try:
data, address = dataport.recvfrom(2) data, address = dataport.recvfrom(2)
ip = address[0] #print('Received {} bytes from {}'.format(len(data), address))
ip = ip[ip.rfind(":")+1:]
#print('Received {} bytes from {}'.format(len(data), ip))
if (data[0] == 0xc5): if (data[0] == 0xc5):
if (data[1] == 0x03) or (data[1] == 0x05): if (data[1] == 0x03) or (data[1] == 0x05):
read3(dataport, address, ip, data) read3(dataport, address, data)
elif (data[1] == 0x02) or (data[1] == 0x04): elif (data[1] == 0x02) or (data[1] == 0x04):
write(dataport, address, ip, data) write(dataport, address, data)
except DataPort.Timeout: except DataPort.Timeout:
pass pass