Merge pull request #58 from RetiredWizard/fruitjampydosfix
Some checks failed
Validate Build / validate-build (push) Has been cancelled

Used 'supervisor.runtime' instead of just 'runtime'
This commit is contained in:
foamyguy 2025-08-15 20:53:37 -05:00 committed by GitHub
commit 98838420a9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194

View file

@ -35,10 +35,7 @@ if implementation.name.upper() == "MICROPYTHON":
readonly = False readonly = False
imp = "M" imp = "M"
elif implementation.name.upper() == "CIRCUITPYTHON": elif implementation.name.upper() == "CIRCUITPYTHON":
if not Pydos_ui: from supervisor import runtime, reload
from supervisor import runtime
from supervisor import reload
import storage import storage
import microcontroller import microcontroller
import displayio import displayio
@ -87,7 +84,7 @@ def PyDOS():
global envVars global envVars
if "envVars" not in globals().keys(): if "envVars" not in globals().keys():
envVars = {} envVars = {}
_VER = "1.55-fruitjam" _VER = "1.56-fruitjam"
prmpVals = ['>','(',')','&','|','\x1b','\b','<','=',' ',_VER,'\n','$',''] prmpVals = ['>','(',')','&','|','\x1b','\b','<','=',' ',_VER,'\n','$','']
print("Starting Py-DOS... Type 'help' for help.") print("Starting Py-DOS... Type 'help' for help.")
@ -229,8 +226,8 @@ def PyDOS():
if "_display" not in envVars.keys(): if "_display" not in envVars.keys():
if "display" in dir(Pydos_ui): if "display" in dir(Pydos_ui):
envVars["_display"] = Pydos_ui.display envVars["_display"] = Pydos_ui.display
elif "display" in dir(supervisor.runtime): elif "display" in dir(runtime):
envVars["_display"] = supervisor.runtime.display envVars["_display"] = runtime.display
elif "display" in dir(board): elif "display" in dir(board):
envVars["_display"] = board.display envVars["_display"] = board.display