Add files via upload

Author: NardJ

PyInterpreter.py

@@ -316,6 +316,7 @@ def strIsNumber(strEval):
 '''
 def evalArgument(varis,calcToken,linenr):
     try:
+        #print (f"{calcToken} -> {eval(calcToken,None,varis)}")
         return eval(calcToken,None,varis)
     except Exception as e:
         #print (f"Error evalStrArgument: {calcToken} is not a valid calculation.")   
@@ -341,6 +342,7 @@ def typeToken(arg):
     if isinstance(arg,bool): return bool
     if isinstance(arg,int): return int
     if isinstance(arg,float): return float
+    if isinstance(arg,bytes): return bytes
     return None    
 
 def checkArgs(lineNr,statement,tokens,tAllowedTypes):
@@ -402,7 +404,7 @@ def stopScript():
     global linenr
     linenr=len(orgscriptlines)
 
-def runScript(scriptpath=None,delaytime=0):
+def runScript(scriptpath=None,delaytime=0, skipVarDelay=True):
     global orgscriptlines
     global errorStack
     global linenr
@@ -468,7 +470,7 @@ def runScript(scriptpath=None,delaytime=0):
                             errors+=1
                     # handle command
                     if not errors:
-                        if cmd=="var"      and checkArgs(linenr,statement,args,[[str],[str,float,bool,int],]):
+                        if cmd=="var"      and checkArgs(linenr,statement,args,[[str],[str,float,bool,int,bytes],]):
                             varis[args[0]]=args[1]                             # add variable to variable list
                             #print (f"cmd==var:{args}")                        
                             #print (f"  varis:{varis}")                        
@@ -506,11 +508,13 @@ def runScript(scriptpath=None,delaytime=0):
                         else:
                             logError(linenr,statement,arg,f"CmdError: Command '{cmd}'not valid.")
                             linenr=len(scriptlines)
+                    #if we have no remark line we wait for delay so user can keep up.      
+                    if not (cmd=="var" and skipVarDelay):
+                        time.sleep(delaytime)
                 # if tokens 
             # for statement in statements
         # if statements           
         linenr+=1
-        time.sleep(delaytime)
     # while linenr<len(scriptlines)  
     if errorStack:
         printErrorStack()

SerialMonitor++.py

@@ -560,7 +560,7 @@ def tokenIsString(token):
 
 def received():
     if len(histReceived)>0:
-        msg=histReceived[len(histReceived)-1][1].decode('utf-8').strip()
+        msg=histReceived[len(histReceived)-1][1]
         #print (f"msg:{msg}'")
         return msg # histReceived contains tuples (timestamp, message,'right')
     else:

bytes2String.py

@@ -10,7 +10,7 @@ def ascii(data_bytes):
         data_str=data_str.replace('\r', "\\r") 
     except UnicodeDecodeError as e:
         print (e)
-        data_str=bytes2RawStr(data_bytes)
+        data_str=raw(data_bytes)
     return data_str
 def hex(data_bytes):
     data_str=' '.join(format(x, '02X') for x in data_bytes)

scriptWindow.py

@@ -17,7 +17,10 @@ def close():
     win.popupWait.destroy()
 
 def received():
-    return receive()
+    rec = receive()
+    print (f"Rec: {rec} of type {type(rec)}")
+    if rec==None: rec==['']
+    return rec
 
 def show(rootWin,scriptpath,rmtSend,rmtReceive):
     global win,send,receive
@@ -60,8 +63,8 @@ def show(rootWin,scriptpath,rmtSend,rmtReceive):
     lb.pack(side=tk.LEFT)
 
     popupWait.varDelay=tk.StringVar()
-    popupWait.delayList=("No delay","0.1 sec","0.5 sec","1 sec","2 sec","5 sec")
-    popupWait.delayTimes=(0,0.1,0.5,1.0,2.0,5.0)
+    popupWait.delayList=("No delay","0.01 sec","0.1 sec","0.5 sec","1 sec","2 sec","5 sec")
+    popupWait.delayTimes=(0,0.01,0.1,0.5,1.0,2.0,5.0)
     popupWait.varDelay.set('0.5 sec')
     ddDelay=tk.OptionMenu(footerframe,popupWait.varDelay,*popupWait.delayList)
     ddDelay.pack(side=tk.LEFT,padx=(3,0))
@@ -77,6 +80,12 @@ def show(rootWin,scriptpath,rmtSend,rmtReceive):
     ddDelay.configure(bd='0p')
     ddDelay.configure(highlightthickness=0)
 
+    popupWait.varSkipVars=tk.BooleanVar(value=True)
+    cbSkipVars=tk.Checkbutton(footerframe,text="Skip Vars:",variable=popupWait.varSkipVars)
+    cbSkipVars.configure(background=footerbgcolor,activebackground=footersgcolor,fg=footerfgcolor,activeforeground=footerfgcolor,highlightbackground=footerbgcolor,selectcolor=footerbgcolor)
+    cbSkipVars.pack(side=tk.LEFT)
+    cbSkipVars.configure(relief=tk.FLAT)
+
     popupWait.cmdRun = tk.Button(footerframe, text="Run",command= process)
     popupWait.cmdRun.pack(side=tk.RIGHT)
     popupWait.cmdRun.configure(relief=tk.FLAT)
@@ -217,25 +226,34 @@ def errhndlr(errStack):
     pyi.setErrorHandler(errhndlr)
     #  reroute print to infobos
     def print2InfoBox(msg):
-        popupWait.varInfo.set(bytes2String.ascii(msg.encode('utf-8')))
-    pyi.addSystemFunction('print',print2InfoBox,[[str,int,bool,float],])
+        print (f"msg type {type(msg)}")
+        if isinstance(msg,bytes): 
+            popupWait.varInfo.set(bytes2String.raw(msg).strip())
+        elif isinstance(msg,str):    
+            popupWait.varInfo.set(msg.strip())
+        else:    
+            popupWait.varInfo.set(msg)
+    pyi.addSystemFunction('print',print2InfoBox,[[str,int,bool,float,bytes],])
+    def printAscii2InfoBox(msg):
+        popupWait.varInfo.set(bytes2String.ascii(msg).strip())
+    pyi.addSystemFunction('printa',printAscii2InfoBox,[[bytes],])
     def printHex2InfoBox(msg):        
-        popupWait.varInfo.set(bytes2String.hex(msg.encode('utf-8')))
-    pyi.addSystemFunction('printh',printHex2InfoBox,[[str,int,bool,float],])
+        popupWait.varInfo.set(bytes2String.hex(msg).strip())
+    pyi.addSystemFunction('printh',printHex2InfoBox,[[bytes],])
     def printDec2InfoBox(msg):
-        popupWait.varInfo.set(bytes2String.dec(msg.encode('utf-8')))
-    pyi.addSystemFunction('printd',printDec2InfoBox,[[str,int,bool,float],])
+        popupWait.varInfo.set(bytes2String.dec(msg).strip())
+    pyi.addSystemFunction('printd',printDec2InfoBox,[[bytes],])
     def printRaw2InfoBox(msg):
-        popupWait.varInfo.set(bytes2String.raw(msg.encode('utf-8')))
-    pyi.addSystemFunction('printr',printRaw2InfoBox,[[str,int,bool,float],])
+        popupWait.varInfo.set(f"{msg}")
+    pyi.addSystemFunction('printr',printRaw2InfoBox,[[bytes],])
     #  add send (over serial) command
     pyi.addSystemFunction('send',send,[[str,],])
     #  add received var (to be updated each x msecs)
     pyi.importSystemFunction(pyi,__name__,"received")
 
     #run script
     scriptStart=time.time()
-    runSuccess=pyi.runScript(delaytime=delayTime)
+    runSuccess=pyi.runScript(delaytime=delayTime,skipVarDelay=popupWait.varSkipVars.get())
     scriptDuration=time.time()-scriptStart
     if runSuccess and isProcessingScript:
         msgbox=messagePopup.show(win,type="info",title="Script finished", message=f"Script '{popupWait.scriptname}' finished in {scriptDuration:.4f} seconds!")