Merge branch 'master' of ssh://ichibi.ddns.net:222/home/git/Repositories/pato-z80-home-computer

python/terminal_emulator.py

@@ -24,37 +24,33 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
 """
 
 import serial
+import curses
 import time
 
 class TerminalEmulator:
-    def __init__(self, port, baudRate, fileName):
+    def __init__(self, w, ser):
-        ser = serial.Serial(port, baudRate)
+        w.clear()
-        print "Serial port {} opened with baudrate {}".format(port, str(baudRate))
+        w.move(0,0)
-
-        ser.write(73)
         while True:
-            x = ser.read()
+            try:
-            print(x)
+                # read key and write to serial port
-        time.sleep(1)
+                key = w.get_wch()   # TODO: Mettere no delay mode
-        ser.write(b'v')
+                if key == 10 or (key > 31 and key < 256):
+                    # Is a character
+                    ser.write(key)
+            except Exception as e:
+                # No input   
+                pass         
 
-        # Open z80 bin file
+            # read serial port and write to curses
-        '''
+            if ser.inWaiting():
-        with open(fileName, "rb") as f:
+                b = ser.read(1)
-            print "Sending command IMMEDIATE"
+                if ord(b) > 31 or ord(b) == 10:
-            ser.write(b'I')
+                    w.addch(b)
-            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()
+            stdscr.refresh()
-        print "Completed"
+
-        '''
+        
 
 if __name__ == '__main__':
     import argparse
@@ -64,4 +60,23 @@ 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()
+    stdscr.idlok(True)
+    stdscr.scrollok(True)
+
+    try:
+        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()
+        curses.endwin()
+