Merge pull request #173 from Open-STEM/FranksDev

Fixes for Run and Stop

Author: fgrossman

src/components/navbar.tsx

@@ -864,6 +864,10 @@ function NavBar({ layoutref }: NavBarProps) {
                         } catch (err) {
                             console.log(err);
                         }
+                        // When returning from the execute switch back to RUN mode. This happens when the program ends
+                        // naturaly.
+                        setRunning(false);
+                        broadcastRunningState(false);
                     }
 
                     const handlePowerSwitchOK = async () => {

src/connections/connection.ts

@@ -238,7 +238,12 @@ abstract class Connection {
                 }
             }
             await new Promise((resolve) => setTimeout(resolve, 85));
-            if (waitTime != -1) {
+            
+            if (waitTime === -2 && this.isRunBusy === false) {
+                return tempLines;
+            }
+
+            if (waitTime != -1 && waitTime != -2 ) {
                 numTimes--;
             }
         }
@@ -359,7 +364,7 @@ abstract class Connection {
         this.specialForceOutputFlag = true;  //you see the OK, but also get any fast output
         this.catchOk = true;
         //await this.waitUntilOK();
-        const result = await this.haltUntilRead(1);
+        const result = await this.haltUntilRead(1, -2);
 
         /*
                 This is where errors can be checked for that were returned incase we want to give a better explanation
@@ -488,6 +493,18 @@ abstract class Connection {
         }
         return gotToPrompt;
     }
+    async prepareForStop() {
+
+        if(this.isBusy() && this.isRunBusy === false){    //don't try and STOP if the code is BUSY but not from Running a user program.
+            return;
+        }
+        if(this.isRunBusy){  //if the program is running do ctrl-c until we know it has stopped
+            this.STOP = true;  //let the executeLines code know when it stops, it stopped because the STOP button was pushed
+            this.specialForceOutputFlag = false; //turn off showing output so they don't see the keyboardInterrupt and stack trace.
+            this.isRunBusy = false;
+            return
+        }
+    }
 
 }
 

src/managers/commandstoxrpmgr.ts

@@ -920,21 +920,21 @@ export class CommandToXRPMgr {
             "         file.seek(0)\n" +
             "         file.write(b'\\x00')\n" +
             "         doNothing = True\n" +
-            "      else:\n" +
-            "         file.seek(0)\n" +
-            "         file.write(b'\\x01')\n" +
+            //"      else:\n" +
+            //"         file.seek(0)\n" +
+            //"         file.write(b'\\x01')\n" +
             "   if(not doNothing):\n" +
             "       with open('" + fileToEx + "', mode='r') as exfile:\n" +
             "           code = exfile.read()\n" +
             "       execCode = compile(code, '" + fileToEx2 + "', 'exec')\n" +
             "       exec(execCode)\n" +
-            "       with open(FILE_PATH, 'r+b') as file:\n" +
-            "           file.write(b'\\x00')\n" +
+            //"       with open(FILE_PATH, 'r+b') as file:\n" +
+            //"           file.write(b'\\x00')\n" +
             "except Exception as e:\n" +
             "   import sys\n" +
             "   sys.print_exception(e)\n" +
-            "   with open(FILE_PATH, 'r+b') as file:\n" +
-            "      file.write(b'\\x00')\n" +
+           // "   with open(FILE_PATH, 'r+b') as file:\n" +
+           // "      file.write(b'\\x00')\n" +
             "finally:\n" +
             "   import gc\n" +
             "   gc.collect()\n" +
@@ -988,11 +988,13 @@ export class CommandToXRPMgr {
     }
 
     /**
-     * stopProgram - stop program execution on the XRP
+     * stopProgram - stop program execution on the XRP because they pushed the STOP button
      */
     stopProgram() {
         if (this.connection) {
+            this.connection.prepareForStop();
             this.connection.getToREPL();
+            this.BUSY = false;
         }
     }