update to new fourwire module, proper use of edit shell, PyBasic decimal format fix

Author: RetiredWizard

PyBasic/PyBasic README.txt

@@ -1007,7 +1007,6 @@ control flow changes to the Program object, is used consistently throughout the
 
 * It is not possible to renumber a program. This would require considerable extra functionality.
 * Negative values are printed with a space (e.g. '- 5') in program listings because of tokenization. This does not affect functionality.
-* Decimal values less than one must be expressed with a leading zero (i.e. 0.34 rather than .34)
 * User input values cannot be directly assigned to array variables in an **INPUT** or **READ** statement
 * Strings representing numbers (e.g. "10") can actually be assigned to numeric variables in **INPUT** and **READ** statements without an
 error, Python will silently convert them to integers.

PyBasic/lexer.py

@@ -99,9 +99,13 @@ def tokenize(self, stmt):
                             break
 
             # Process numbers
-            elif c.isdigit():
-                token.category = Token.UNSIGNEDINT
-                found_point = False
+            elif c.isdigit() or c == ".":
+                if c == ".":
+                    token.category = Token.UNSIGNEDFLOAT
+                    found_point = True
+                else:
+                    token.category = Token.UNSIGNEDINT
+                    found_point = False
 
                 # Consume all of the digits, including any decimal point
                 while True:

PyDOS.py

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

cpython/boardconfigs/pydos_bcfg_waveshare_esp32_s3_geek.py

@@ -0,0 +1,14 @@
+import board
+
+Pydos_pins = {
+    'SCL' : (board.SCL,"SCL GP17"),
+    'SDA' : (board.SDA,"SDA GP16"),
+# SDIO is faster
+#    'SCK' : [(board.SD_SCK,"SD_SCK GP36")],
+#    'MOSI' : [(board.SD_MOSI,"SD_MOSI GP36")],
+#    'MISO' : [(board.SD_MISO,"SD_MISO GP37")],
+#    'CS' : [(board.SD_CS,"SD_CS GP34")],
+    'SDIO_CLK'   : (board.GP36,"GP36"),
+    'SDIO_CMD'   : (board.GP35,"GP35"),
+    'SDIO_DPINS' : ([board.GP37, board.GP33, board.GP38, board.GP34],"[GP37, GP33, GP38, GP34]")
+}

cpython/kbdFeatherWing/factory_test.py

@@ -4,6 +4,7 @@
 import adafruit_sdcard
 import digitalio
 import displayio
+import fourwire
 import neopixel
 import storage
 import board
@@ -28,7 +29,7 @@
 sd_cs = board.D5
 neopix_pin = board.D11
 
-display_bus = displayio.FourWire(spi, command=tft_dc, chip_select=tft_cs)
+display_bus = fourwire.FourWire(spi, command=tft_dc, chip_select=tft_cs)
 display = adafruit_ili9341.ILI9341(display_bus, width=320, height=240)
 
 print('Display: Pass? (you tell me)')

cpython/kbdFeatherWing/lib/pydos_ui_kfw.py

@@ -29,6 +29,7 @@
 
 import adafruit_ili9341
 import displayio
+import fourwire
 
 class PyDOS_UI:
 
@@ -42,7 +43,7 @@ def __init__(self):
 
         _tft_cs = board.D9
         _tft_dc = board.D10
-        _display_bus = displayio.FourWire(Pydos_hw.SPI(), command=_tft_dc, chip_select=_tft_cs)
+        _display_bus = fourwire.FourWire(Pydos_hw.SPI(), command=_tft_dc, chip_select=_tft_cs)
         _display = adafruit_ili9341.ILI9341(_display_bus, width=320, height=240)
 
         self.kbd = BBQ10Keyboard(Pydos_hw.I2C(),BBQI2CDevice=Pydos_hw.I2CbbqDevice)

cpython/playimage.py

@@ -7,6 +7,10 @@
 import adafruit_imageload
 import bitmaptools
 import displayio
+try:
+    import fourwire 
+except
+    pass    
 from os import getenv
 from supervisor import runtime
 try:
@@ -79,7 +83,7 @@
                     spi = board.SPI()
                 else:
                     spi = busio.SPI(clock=board.SCK,MOSI=board.MOSI,MISO=board.MISO)
-                disp_bus=displayio.FourWire(spi,command=board.D10,chip_select=board.D9, \
+                disp_bus=fourwire.FourWire(spi,command=board.D10,chip_select=board.D9, \
                     reset=board.D6)
                 display=adafruit_ili9341.ILI9341(disp_bus,width=320,height=240)
             except:

edit.py

@@ -1,4 +1,4 @@
-from pye_gen import pye
+from pye_pydos import pye
 
 if __name__ != "PyDOS":
     passedIn = ""

fileview.py

@@ -3,9 +3,11 @@
 from sys import implementation
 try:
     from pydos_ui import Pydos_ui
+    readkbd = Pydos_ui.read_keyboard
 except:
     Pydos_ui = None
     from sys import stdin
+    readkbd = stdin.read
 try:
     from pydos_ui import input
 except:
@@ -131,11 +133,7 @@ def absolutePath(argPath,currDir):
         seqCnt = 0
         strtCol = 0
         while cmnd.upper() != "Q":
-            #cmnd = kbdInterrupt()
-            if Pydos_ui:
-                cmnd = Pydos_ui.read_keyboard(1)
-            else:
-                cmnd = stdin.read(1)
+            cmnd = readkbd(1)
 
             if ord(cmnd) == 27 and seqCnt == 0:
                 seqCnt = 1

pye_gen.py pye_pydos.pypye_gen.py renamed to pye_pydos.py

@@ -6,6 +6,11 @@
 except:
     import sys
 
+try:
+    from pydos_ui import Pydos_ui
+except:
+    Pydos_ui = False
+
 class IO_DEVICE:
     def __init__(self):
         try:
@@ -22,10 +27,13 @@ def wr(self, s):
         sys.stdout.write(s)
 
     def rd(self):
-        return sys.stdin.read(1)
+        if Pydos_ui:
+            return Pydos_ui.read_keyboard(1)
+        else:
+            return sys.stdin.read(1)
 
     def rd_raw(self):
-        return self.rd_raw_fct(1)
+        return self.rd(1)
 
     def deinit_tty(self):
         try:
@@ -35,13 +43,16 @@ def deinit_tty(self):
             pass
 
     def get_screen_size(self):
-        self.wr('\x1b[999;999H\x1b[6n')
-        pos = ''
-        char = self.rd() ## expect ESC[yyy;xxxR
-        while char != 'R':
-            pos += char
-            char = self.rd()
-        return [int(i, 10) for i in pos.lstrip("\n\x1b[").split(';')]
+        if Pydos_ui:
+            return [i for i in Pydos_ui.get_screensize()]
+        else:
+            self.wr('\x1b[999;999H\x1b[6n')
+            pos = ''
+            char = self.rd() ## expect ESC[yyy;xxxR
+            while char != 'R':
+                pos += char
+                char = self.rd()
+            return [int(i, 10) for i in pos.lstrip("\n\x1b[").split(';')]
 
 ## test, if the Editor class is already present
 if "pye_edit" not in globals().keys():