misc fixes for terminalio display support & running external progams w/o PyDOS

Author: RetiredWizard

PyDOS.py

@@ -73,7 +73,7 @@ def PyDOS():
     global envVars
     if "envVars" not in globals().keys():
         envVars = {}
-    _VER = "1.48"
+    _VER = "1.49"
     prmpVals = ['>','(',')','&','|','\x1b','\b','<','=',' ',_VER,'\n','$','']
 
     print("Starting Py-DOS...")

bounce.py

@@ -8,7 +8,8 @@
     Pydos_ui = None
 
 x = 10; y = 10; d = 1; e = 1
-m='⬤'
+#m='⬤'
+m='O'
 try:
     width = int(envVars.get('_scrWidth',80))
     height = int(envVars.get('_scrHeight',24))

cpython/matrix.py

@@ -6,9 +6,14 @@
 import framebufferio
 import rgbmatrix
 import supervisor
+from os import getenv
 
 try:
     type(passedIn)
+except:
+    passedIn = getenv('PYDOS_MATRIX_CONFIG')
+
+try:    
     args = passedIn.split(',')
     [base_width,base_height,bit_depth,chain_across,tile_down] = [int(p) for p in args]
 except:

cpython/playimage.py

@@ -11,6 +11,14 @@
 from supervisor import runtime
 try:
     from pydos_ui import Pydos_ui
+    readkbd = Pydos_ui.read_keyboard
+    sba = Pydos_ui.serial_bytes_available
+except:
+    Pydos_ui = []
+    from sys import stdin
+    readkbd = stdin.read
+    sba = lambda : runtime.serial_bytes_available
+try:
     from pydos_ui import input
     Pydos_display = ('display' in dir(Pydos_ui))
 except:
@@ -171,8 +179,8 @@ def playimage(passedIn=""):
                 cmnd = ""
                 stop = adafruit_ticks.ticks_add(adafruit_ticks.ticks_ms(),int(dispseconds*1000))
                 while adafruit_ticks.ticks_less(adafruit_ticks.ticks_ms(),stop):
-                    if Pydos_ui.serial_bytes_available():
-                        cmnd = Pydos_ui.read_keyboard(1)
+                    if sba():
+                        cmnd = readkbd(1)
                         print(cmnd, end="", sep="")
                         if cmnd.upper() == "Q":
                             break
@@ -233,8 +241,8 @@ def playimage(passedIn=""):
                 stop = adafruit_ticks.ticks_add(adafruit_ticks.ticks_ms(),int(dispseconds*1000))
                 while adafruit_ticks.ticks_less(adafruit_ticks.ticks_ms(),stop) or singleimage:
 
-                    if Pydos_ui.serial_bytes_available():
-                        cmnd = Pydos_ui.read_keyboard(1)
+                    if sba():
+                        cmnd = readkbd(1)
                         print(cmnd, end="", sep="")
                         if cmnd.upper() == "Q":
                             break

fileview.py

@@ -1,12 +1,21 @@
 import os
-from pydos_ui import Pydos_ui
+import supervisor
+from sys import implementation
+try:
+    from pydos_ui import Pydos_ui
+except:
+    Pydos_ui = None
+    from sys import stdin
 try:
     from pydos_ui import input
 except:
     pass
 #import uselect
 
-def viewFile(args):
+def viewFile(args,scrsiz=()):
+    # scrsiz can be used if running program from REPL to specify the screen dimensions
+    # first import launches with defaults but subsequent launches can use:
+    # fileview.viewFile("filename.txt",(height,width))
 
     def chkPath(tstPath):
         validPath = True
@@ -60,19 +69,34 @@ def absolutePath(argPath,currDir):
 
         scrLines = int(envVars["_scrHeight"])
         scrWidth = int(envVars["_scrWidth"])
+    elif scrsiz:
+        (scrLines,scrWidth) = scrsiz
     elif 'get_screensize' in dir(Pydos_ui):
         (scrLines,scrWidth) = Pydos_ui.get_screensize()
     else:
-        scrLines = 24
-        scrWidth = 80
+        if 'height' in dir(supervisor.runtime.display):
+            scrLines = supervisor.runtime.display.height
+            scrWidth = supervisor.runtime.display.width
+        else:
+            scrLines = 24
+            scrWidth = 80
+
+    try:
+        type(envVars)
+    except:
+        envVars={}
 
     if "_scrollable" in envVars.keys():
         scrollable = (envVars["_scrollable"] == True) or (envVars["_scrollable"] == "True")
     else:
         try:
             scrollable = Pydos_ui.scrollable
         except:
-            scrollable = False
+            if implementation.name.upper() == 'CIRCUITPYTHON':
+                # Once CircuitPython 9.2.4 is stable this can be change to True
+                scrollable = False
+            else:
+                scrollable = False
 
     savDir = os.getcwd()
     args = absolutePath(args,savDir)
@@ -108,7 +132,10 @@ def absolutePath(argPath,currDir):
         strtCol = 0
         while cmnd.upper() != "Q":
             #cmnd = kbdInterrupt()
-            cmnd = Pydos_ui.read_keyboard(1)
+            if Pydos_ui:
+                cmnd = Pydos_ui.read_keyboard(1)
+            else:
+                cmnd = stdin.read(1)
 
             if ord(cmnd) == 27 and seqCnt == 0:
                 seqCnt = 1

lib/pydos_ui.py

@@ -24,7 +24,7 @@ def __init__(self):
             elif bool(getattr(runtime,'display',False)):
                 self.display = runtime.display
             else:
-                self.scrollable = True                
+                self.scrollable = True
         else:
             self.scrollable = True