New wifi_finance vresion and SDIO SD card support

Author: RetiredWizard

PyDOS.py

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

README.md

@@ -159,7 +159,8 @@ PyDOS.
 
 **fileview.py [[path]filename]** - scrollable text file viewer
 
-**sdmount.py [[mount path][,pydos spi bus#]]** - mounts an sd card to the file system  
+**sdmount.py [[mount path][,pydos spi bus#]]** - mounts an sd card to the file system. If no SD card CS pins are defined or -1 is passed as the spi bus# the sd
+card will be mounted using an SDIO bus rather than an SPI bus.    
 **sdumount.py [mount path]** - dismounts an sd card from the file system
 
 **setdate.py [mm-dd-yy]** - initalizes the real time clock to an entered date  
@@ -208,7 +209,7 @@ and then power cycled or hard reset.
 **setenv.py** - Helper program for adding the WiFi SSID and Password to settings.toml (used by setup.bat).
 
 *WiFi enabled boards only*  
-**wifi_finance** - Displays the current Nasdaq prices by connecting to a financial website and scraping the information.  
+**wifi_finance [symbol]** - Displays the current Nasdaq prices by connecting to a financial website and scraping the information. If an optional symbol is supplied, the program will attempt to identify the symbol and scrap the corresponding price information.  
 **wifi_weather** - Displays the 7 day forcast from api.weather.gov
 
 ## Hardware (Pin) customization file (pydos_bcfg.py)
@@ -235,6 +236,9 @@ example: `'led' : (25, "GP25")`
 **I2C_NUM** - MicroPython hardware I2C number  
 **SCL**  
 **SDA**  
+**SDIO_CLK**  
+**SDIO_CMD**  
+**SDIO_DPINS** - the "pin number" element for SDIO_DPINS is a list of pins  
 
 **LIST OF TUPLES**  
 *First tuple in list used for machine/board SD dedicated SPI (board.SD_SPI)*  

cpython/boardconfigs/pydos_bcfg_makerfabs_tft7.py

@@ -3,6 +3,9 @@
 import board
 
 Pydos_pins = {
-    'SCL' : (board.SCL,"GPIO18 board.SCL"),
-    'SDA' : (board.SDA,"GPIO17 board.SDA")
+    'SCL'        : (board.SCL,"GPIO18 board.SCL"),
+    'SDA'        : (board.SDA,"GPIO17 board.SDA"),
+    'SDIO_CLK'   : (board.SDIO_CLK,"GPIO12 board.SDIO_CLK"),
+    'SDIO_CMD'   : (board.SDIO_CMD,"GPIO11 board.SDIO_CMD"),
+    'SDIO_DPINS' : ([board.SDIO_D0],"[GPIO13] [board.SDIO_D0]")
 }

cpython/kbdFeatherWing/keys.bat

@@ -13,6 +13,7 @@ echo              -)               >
 echo              _#               ^
 echo              _/               \
 echo              -/               %%
+echo              _!               &
 echo Speaker Key (left of enter)   $
 echo Track ball up                 up arrow
 echo Track ball down               down arrow

cpython/lib/optional/pydos_ui_lilygokbd.py

@@ -112,9 +112,9 @@ def input(disp_text=None):
     if disp_text != None:
         print(disp_text,end="")
 
-    bld_chr1 = '_(+(-__-'
-    bld_chr2 = '-+)-)/#/'
-    bld_chr =  '=[]<>\^%'
+    bld_chr1 = '_(+(-__-_'
+    bld_chr2 = '-+)-)/#/!'
+    bld_chr =  '=[]<>\^%&'
     bld_started = False
 
     histPntr = len(Pydos_ui.commandHistory)

lib/pydos_bcfg.py

@@ -151,3 +151,10 @@
         else:
             Pydos_pins["CS"].append((None,"None"))
 
+    if 'SDIO_CLK' in dir(board) and 'SDIO_CMD' in dir(board):
+        Pydos_pins['SDIO_CLK'] = (board.SDIO_CLK,"board.SDIO_CLK")
+        Pydos_pins['SDIO_CMD'] = (board.SDIO_CMD,"board.SDIO_CMD")
+        datapins = [getattr(board,attr) for attr in dir(board) if 'SDIO_D' in attr]
+        if len(datapins) > 0:
+            Pydos_pins['SDIO_DPINS'] = (datapins,"[board.SDIO_D*]")
+

lib/pydos_hw.py

@@ -116,6 +116,13 @@ def __init__(self):
             self.SD.append(None)
             self._SPI.append(None)
 
+        self.SDIO_CLK=Pydos_pins.get('SDIO_CLK',(None,None))[0]
+        self.SDIO_CMD=Pydos_pins.get('SDIO_CMD',(None,None))[0]
+        self.SDIO_DPINS=Pydos_pins.get('SDIO_DPINS',([None],None))[0]
+        if self.SDIO_CLK:
+            self.SDdrive.append(None)
+            self.SD.append(None)        
+
             if implementation.name.upper() == 'CIRCUITPYTHON':
                 try:
                     if i == 0:

lib/pydos_wifi.py

@@ -1,4 +1,4 @@
-PyDOS_wifi_VER = "1.37"
+PyDOS_wifi_VER = "1.40"
 
 import os
 import time
@@ -217,10 +217,16 @@ def get(self,text_url,headers=None,getJSON=False):
     def json(self):
         retVal = None
         if implementation.name.upper() == 'CIRCUITPYTHON':
-            retVal = self.response.json()
+            try:
+                retVal = self.response.json()
+            except ValueError:
+                retVal = {'ValueError':'Possibly caused by syntax error in JSON'}
         elif implementation.name.upper() == 'MICROPYTHON':
             if 'json' in dir(self.response):
-                retVal = self.response.json()
+                try:
+                    retVal = self.response.json()
+                except ValueError:
+                    retVal = {'ValueError':'Possibly caused by syntax error in JSON'}
             else:
                 foundStart = False
                 retVal = ''

pydospins.py

@@ -57,7 +57,8 @@ def printPinAssignments():
             print("PyDOS Sound Pin:         ",Pydos_pins['sndPin'][1],end="")
         elif entry in ['led','SCL','SDA','neoPixel','neoPixel_Pow','dotStar_Clock', \
             'dotStar_Data','dotStar_Extra','dotStar_Pow','LED_RED','LED_GREEN', \
-            'LED_BLUE','i2s_BitClock','i2s_WordSelect','i2s_Data']:
+            'LED_BLUE','i2s_BitClock','i2s_WordSelect','i2s_Data','SDIO_CLK', \
+            'SDIO_CMD','SDIO_DPINS']:
 
             print(entry+" Pin:"+(20-len(entry))*" ",Pydos_pins[entry][1],end="")
         elif entry in ['I2C_NUM']:

sdmount.py

@@ -17,9 +17,12 @@
         import adafruit_sdcard
     except:
         import sdcardio as adafruit_sdcard
+    try:
+        import sdioio
+    except:
+        pass
     import storage
 
-
 def sdMount(drive,spiNo):
 
     def chkPath(tstPath):
@@ -129,7 +132,25 @@ def do_mount(drive,spiNo):
 
         elif implementation.name.upper() == "CIRCUITPYTHON":
 
-            if spiNo+1 > len(Pydos_hw.CS):
+            if Pydos_hw.SDIO_CLK and (spiNo == -1 or len(Pydos_hw.CS) == 0):
+                sdioNo = len(Pydos_hw.CS)
+                if Pydos_hw.SDdrive[sdioNo] != None:
+                    print("SD card on SDIO interface already mounted as",Pydos_hw.SDdrive[sdioNo])
+                else:
+                    try:
+                        if not Pydos_hw.SD[sdioNo]:
+                            Pydos_hw.SD[sdioNo] = sdioio.SDCard(
+                                clock=Pydos_hw.SDIO_CLK,
+                                command=Pydos_hw.SDIO_CMD,
+                                data=Pydos_hw.SDIO_DPINS,
+                                frequency=25000000)
+                        vfs = storage.VfsFat(Pydos_hw.SD[sdioNo])
+                        storage.mount(vfs, drive)
+                        Pydos_hw.SDdrive[sdioNo] = drive
+                        sdMounted = True
+                    except Exception as e:
+                        print('SD-Card: Fail,', e)
+            elif spiNo+1 > len(Pydos_hw.CS):
                 print("CS Pin not allocated for Pydos_bcfg SPI interface #",spiNo)
             elif Pydos_hw.SDdrive[spiNo] != None:
                 print("SD card on Pydos_bcfg SPI interface #",spiNo,"already mounted as",Pydos_hw.SDdrive[spiNo])

wifi_finance.py

@@ -5,12 +5,19 @@
 from os import uname
 from pydos_wifi import Pydos_wifi
 
-def wifi_finance():
+def wifi_finance(symbol):
     try:
         _scrWidth = int(envVars.get('_scrWidth',80))
     except:
         _scrWidth = 80
 
+    if not symbol:
+        symbol = "IXIC"
+    else:
+        symbol = symbol.upper()
+    prt_sym = symbol
+    srch_sym = symbol
+
     # Get wifi details and more from a .env file
     if Pydos_wifi.getenv('CIRCUITPY_WIFI_SSID') is None:
         raise Exception("WiFi secrets are kept in settings.toml, please add them there by using setenv.py!")
@@ -30,18 +37,17 @@ def wifi_finance():
     #TEXT_URL = "https://www.moneycontrol.com/us-markets"
     #search_string = '<!-- -->Nasdaq<!-- -->'
 
-    TEXT_URL = "https://www.google.com/search?q=%3Cspan%20class="x x-first x-last">nasdaq+index+price"
-    search_string = 'Nasdaq Composite'
+    TEXT_URL = f"https://www.google.com/search?q=%3Cspan%20class="pl-s1">{symbol.replace('&','%26')}+stock+price"
+    search_string = symbol
 
     #headers = {"user-agent": "RetiredWizard@"+implementation.name.lower()+uname()[2]}
 
     print("Fetching text from %s" % TEXT_URL)
     response = Pydos_wifi.get(TEXT_URL)
     response_window = []
     for _ in range(4):
-        tmp = Pydos_wifi.next(256)
-        response_window.append(tmp)
-        if len(tmp) != 256:
+        response_window.append(Pydos_wifi.next(256))
+        if len(response_window[-1]) != 256:
             break
 
     try:
@@ -55,44 +61,119 @@ def wifi_finance():
         print(pline)
     print("-" * _scrWidth)
 
-    nasdaq = str(b''.join(response_window)).find(search_string)
+    print("Identifying symbol",end="")
+    name_loc = -1
     iKount = 0
-    while nasdaq == -1 and iKount<800:
+    while name_loc == -1 and iKount<800:
         iKount +=1
         if iKount % 10 == 0:
             print(".",end="")
-        for i in range(3):
-            response_window[i] = response_window[i+1]
-        try:
-            response_window[3] = Pydos_wifi.next(256)
-        except:
-            iKount=800
 
-        nasdaq = str(b''.join(response_window)).find(search_string)
-    print("*")
+        found_window = str(b''.join(response_window))
+
+        name_loc = found_window.find(' Inc. is')
+        if name_loc == -1:
+            name_loc = found_window.find(' Inc., commonly')
+        if name_loc == -1:
+            name_loc = found_window.find(' is a stock market ')
+        if name_loc != -1:
+            if found_window[:name_loc].rfind('or simply the ') != -1:
+                srch_sym = found_window[found_window[:name_loc].rfind('or simply the ')+14:name_loc]
+            elif found_window[:name_loc].rfind('>') != -1:
+                srch_sym = found_window[found_window[:name_loc].rfind('>')+1:name_loc]
+            srch_sym = srch_sym.replace(',','')
+            prt_sym = srch_sym.replace('&amp;','&')
+            prt_sym = prt_sym.replace('amp;','')
+            if srch_sym[0:4].upper() == 'THE ':
+                srch_sym = srch_sym[4:]
+            print(f'* {search_string} * {srch_sym} * {prt_sym}',end="")
+
+        if iKount<800:
+            for i in range(3):
+                response_window[i] = response_window[i+1]
+            try:
+                response_window[3] = Pydos_wifi.next(256)
+                if len(response_window[3]) != 256:
+                    print('X',end="")
+                    iKount=800
+            except:
+                iKount=800
+    print()
+
+    print("Locating price data",end="")
+    response.close()
+    response = Pydos_wifi.get(TEXT_URL)
+    response_window = []
+    iKount = 0
+    for _ in range(4):
+        response_window.append(Pydos_wifi.next(256))
+        if len(response_window[-1]) != 256:
+            iKount = 799
+            break
 
-    if iKount < 800:
-        for _ in range(2):
-            response_window.append(Pydos_wifi.next(256))
+    nasdaq = -1
+    while nasdaq == -1 and iKount<800:
+        iKount +=1
+        if iKount % 10 == 0:
+            print(".",end="")
 
+        found_window = str(b''.join(response_window))
+        nasdaq = found_window.upper().find(search_string)
+        if nasdaq == -1:
+            nasdaq = found_window.upper().find(srch_sym.upper())
+        if nasdaq == -1:
+            for i in range(3):
+                response_window[i] = response_window[i+1]
+            try:
+                response_window[3] = Pydos_wifi.next(256)
+                if len(response_window[3]) != 256:
+                    print('X',end="")
+                    iKount=800
+            except:
+                print('X',end="")
+                iKount=800
+        else:
+            if iKount < 800:
+                for _ in range(2):
+                    response_window.append(Pydos_wifi.next(256))
+                    if len(response_window[-1]) != 256:
+                        print('X',end="")
+                        iKount = 800
+                        break
+
+                found_window = str(b''.join(response_window))
+                pct = found_window[nasdaq:].find('%)')
+                if pct == -1 and iKount<800:
+                    response_window[0] = response_window[2]
+                    response_window[1] = response_window[3]
+                    response_window[3] = response_window.pop()
+                    response_window[2] = response_window.pop()
+                    nasdaq = -1
+
+    print("*\n")
     found_window = str(b''.join(response_window))
-    nasdaq = found_window.find(search_string)
+    nasdaq = found_window.upper().find(search_string)
+    if nasdaq == -1:
+        nasdaq = str(b''.join(response_window)).upper().find(srch_sym.upper())
 
-    pct = found_window[nasdaq:].find('%)')
-    pctst = found_window[nasdaq+pct-17:].find('">')+2
-    pctend = found_window[nasdaq+pct:].find('<')
-    #print("Debug: %s\n" % found_window[nasdaq:nasdaq+pct+pctend])
+    pct = found_window.find('%)')
+    pctst = found_window[:pct].rfind('>')+1
+    pctend = pct + found_window[pct:].find('<')
+    #print("Debug: %s\n" % found_window[nasdaq:pctend])
+    pricest = found_window[:pctst-2].rfind('>')+1
+    priceend = pricest + found_window[pricest:].find('<')
 
     if nasdaq != -1:
-        print(f'Nasdaq: {found_window[nasdaq+pct-17+pctst:nasdaq+pct+pctend].replace("<","")}\n')
+        print(f'{prt_sym}: {found_window[pricest:priceend]} {found_window[pctst:pctend].replace("<","")}\n')
     else:
-        print("Nasdaq symbol not found\n")
+        print(f"{prt_sym} symbol not found\n")
 
     Pydos_wifi.close()
     del response_window
     del found_window
 
 if __name__ == "PyDOS":
-    wifi_finance()
+    wifi_finance(passedIn)
 else:
-    print("Enter 'wifi_finance.wifi_finance()' in the REPL or PEXEC command to run.")
+    print('Enter "wifi_finance.wifi_finance("symbol")" in the REPL or PEXEC command to run.')
+    print('    A null symbol ("") will default to the Nasdaq Index')