From adc09d52ae005bcd232e8c1e6f050f5fab7eb158 Mon Sep 17 00:00:00 2001 From: "Daniele Verducci (ZenPenguin)" Date: Thu, 10 Dec 2020 23:47:19 +0100 Subject: [PATCH 1/4] WIP python terminal emulator --- python/terminal_emulator.py | 60 ++++++++++++++++++++----------------- 1 file changed, 33 insertions(+), 27 deletions(-) diff --git a/python/terminal_emulator.py b/python/terminal_emulator.py index b544796..957e4d3 100755 --- a/python/terminal_emulator.py +++ b/python/terminal_emulator.py @@ -24,37 +24,29 @@ along with this program. If not, see . """ import serial +import curses import time class TerminalEmulator: - def __init__(self, port, baudRate, fileName): - ser = serial.Serial(port, baudRate) - print "Serial port {} opened with baudrate {}".format(port, str(baudRate)) - - ser.write(73) + def __init__(self, port, baudRate, w): + w.clear() + ser = serial.Serial(port, baudRate, timeout=0) + i = 20 while True: - x = ser.read() - print(x) - time.sleep(1) - ser.write(b'v') + '''try: + # read key and write to serial port + key = w.getkey() + ser.write(key) + except Exception as e: + # No input + pass''' + # read serial port and write to curses + if ser.inWaiting(): + b = ser.read() + w.addch(chr(b)) + #print(chr(b), end="") - # Open z80 bin file - ''' - with open(fileName, "rb") as f: - print "Sending command IMMEDIATE" - ser.write(b'I') - time.sleep(1) - print "Sending file {}".format(fileName) - byte = f.read(1) - while byte: - print(byte) - ser.write(byte) - byte = f.read(1) - f.close() - - ser.close() - print "Completed" - ''' + if __name__ == '__main__': import argparse @@ -64,4 +56,18 @@ if __name__ == '__main__': parser.add_argument('baudrate', help="arduino parallel monitor USB baudrate") args = parser.parse_args() - td = TerminalEmulator(args.port, args.baudrate, args.file) + # Init curses + stdscr = curses.initscr() + curses.noecho() + curses.cbreak() + + try: + td = TerminalEmulator(args.port, args.baudrate, stdscr) + except Exception as e: + print(e) + finally: + # Stop curses + curses.nocbreak() + curses.echo() + curses.endwin() + From 3c6f54862dcbb3d3d8b8848d31eb371bd0f9bad6 Mon Sep 17 00:00:00 2001 From: "Daniele Verducci (ZenPenguin)" Date: Fri, 11 Dec 2020 08:48:30 +0100 Subject: [PATCH 2/4] Working terminal read --- python/terminal_emulator.py | 23 +++++++++++++++-------- 1 file changed, 15 insertions(+), 8 deletions(-) diff --git a/python/terminal_emulator.py b/python/terminal_emulator.py index 957e4d3..6a0399d 100755 --- a/python/terminal_emulator.py +++ b/python/terminal_emulator.py @@ -28,10 +28,9 @@ import curses import time class TerminalEmulator: - def __init__(self, port, baudRate, w): + def __init__(self, w, ser): w.clear() - ser = serial.Serial(port, baudRate, timeout=0) - i = 20 + w.move(0,0) while True: '''try: # read key and write to serial port @@ -39,12 +38,15 @@ class TerminalEmulator: ser.write(key) except Exception as e: # No input - pass''' + pass''' + # read serial port and write to curses if ser.inWaiting(): - b = ser.read() - w.addch(chr(b)) - #print(chr(b), end="") + b = ser.read(1) + if ord(b) > 31: + w.addch(b) + + stdscr.refresh() @@ -60,12 +62,17 @@ if __name__ == '__main__': stdscr = curses.initscr() curses.noecho() curses.cbreak() + stdscr.idlok(True) + stdscr.scrollok(True) try: - td = TerminalEmulator(args.port, args.baudrate, stdscr) + ser = serial.Serial(args.port, args.baudrate, timeout=0) + td = TerminalEmulator(stdscr, ser) except Exception as e: print(e) finally: + # Close serial + ser.close() # Stop curses curses.nocbreak() curses.echo() From f5972c72f8378480d43dcede10decfd44112cac6 Mon Sep 17 00:00:00 2001 From: "Daniele Verducci (ZenPenguin)" Date: Fri, 11 Dec 2020 08:52:16 +0100 Subject: [PATCH 3/4] Fixed line feed --- python/terminal_emulator.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/python/terminal_emulator.py b/python/terminal_emulator.py index 6a0399d..93ca88f 100755 --- a/python/terminal_emulator.py +++ b/python/terminal_emulator.py @@ -43,7 +43,7 @@ class TerminalEmulator: # read serial port and write to curses if ser.inWaiting(): b = ser.read(1) - if ord(b) > 31: + if ord(b) > 31 or ord(b) == 10: w.addch(b) stdscr.refresh() From 3c27a72bdf7cb9739dd60cf7c88101a62cd0453c Mon Sep 17 00:00:00 2001 From: "Daniele Verducci (ZenPenguin)" Date: Fri, 11 Dec 2020 08:58:21 +0100 Subject: [PATCH 4/4] WIP reading from terminal --- python/terminal_emulator.py | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/python/terminal_emulator.py b/python/terminal_emulator.py index 93ca88f..92297ce 100755 --- a/python/terminal_emulator.py +++ b/python/terminal_emulator.py @@ -32,13 +32,15 @@ class TerminalEmulator: w.clear() w.move(0,0) while True: - '''try: + try: # read key and write to serial port - key = w.getkey() - ser.write(key) + key = w.get_wch() # TODO: Mettere no delay mode + if key == 10 or (key > 31 and key < 256): + # Is a character + ser.write(key) except Exception as e: # No input - pass''' + pass # read serial port and write to curses if ser.inWaiting():