Merge pull request #57 from arduino/bugfix/run-twice

Bugfix/run twice

Author: murilopolese

package-lock.json

@@ -7,7 +7,7 @@
 	"scripts": {
 		"post-set-shell": "npm config set script-shell bash",
 		"rebuild": "electron-rebuild",
-		"dev": "electron ./",
+		"dev": "electron  --inspect ./",
 		"build": "npm run post-set-shell && electron-builder $(if [ $(uname -m) =  arm64 ]; then echo --mac --x64; fi)",
 		"postinstall": "npm run post-set-shell && npm run rebuild"
 	},
@@ -38,7 +38,7 @@
 	"license": "MIT",
 	"dependencies": {
 		"about-window": "^1.15.2",
-		"micropython.js": "github:arduino/micropython.js#v1.4.0"
+		"micropython.js": "github:arduino/micropython.js#v1.4.1"
 	},
 	"engines": {
 		"node": "18"

package.json

@@ -21,12 +21,11 @@ const Serial = {
   run: async (code) => {
     return board.run(code)
   },
-  stop: async () => {
-    await board.stop()
-    return Promise.resolve()
+  get_prompt: async () => {
+    return board.get_prompt()
   },
-  exit_raw_repl: async () => {
-    await board.exit_raw_repl()
+  keyboard_interrupt: async () => {
+    await board.stop()
     return Promise.resolve()
   },
   reset: async () => {

preload.js

@@ -1,6 +1,6 @@
 {
   "name": "micropython-lab-arduino-ui",
-  "version": "1.0.0",
+  "version": "0.8.0",
   "description": "Interface for Arduino's MicroPython Lab IDE",
   "main": "index.js",
   "scripts": {

ui/arduino/package-lock.json

@@ -92,9 +92,8 @@ function store(state, emitter) {
     await serial.connect(path)
 
     // Stop whatever is going on
-    await serial.stop()
     // Recover from getting stuck in raw repl
-    await serial.exit_raw_repl()
+    await serial.get_prompt()
 
     state.isConnected = true
     emitter.emit('close-port-dialog')
@@ -135,14 +134,13 @@ function store(state, emitter) {
     if (!state.isTerminalOpen) emitter.emit('show-terminal')
     let editor = state.cache(AceEditor, 'editor').editor
     let code = editor.getValue()
-    await serial.stop()
-    await serial.run(code)
+    await serial.get_prompt()
+    serial.run(code)
     emitter.emit('render')
   })
   emitter.on('stop', async () => {
     log('stop')
-    await serial.stop()
-    await serial.exit_raw_repl()
+    await serial.get_prompt()
     emitter.emit('render')
   })
   emitter.on('reset', async () => {
@@ -175,7 +173,7 @@ function store(state, emitter) {
     emitter.emit('message', `Saving ${filename} on ${deviceName}.`)
 
     if (state.selectedDevice === 'serial') {
-      await serial.stop()
+      await serial.get_prompt()
       await serial.saveFileContent(
         serial.getFullPath(
           state.serialPath,
@@ -216,7 +214,7 @@ function store(state, emitter) {
 
     if (confirm(`Do you want to remove ${state.selectedFile} from ${deviceName}?`)) {
       if (state.selectedDevice === 'serial') {
-        await serial.stop()
+        await serial.get_prompt()
         await serial.removeFile(state.serialNavigation + '/' + state.selectedFile)
         emitter.emit('new-file', 'serial')
       }
@@ -257,7 +255,7 @@ function store(state, emitter) {
 
     let content = ''
     if (state.selectedDevice === 'serial') {
-      await serial.stop()
+      await serial.get_prompt()
       content = await serial.loadFile(
         serial.getFullPath(
           state.serialPath,
@@ -308,7 +306,7 @@ function store(state, emitter) {
       return folders.concat(files)
     }
     if (state.isConnected) {
-      await serial.stop()
+      await serial.get_prompt()
       try {
         const files = await serial.ilistFiles(
           serial.getFullPath(
@@ -422,7 +420,7 @@ function store(state, emitter) {
       let contents = cleanCharacters(editor.getValue())
       editor.setValue(contents)
       if (state.unsavedChanges) {
-        await serial.stop()
+        await serial.get_prompt()
         await serial.saveFileContent(
           serial.getFullPath(
             state.serialPath,
@@ -533,7 +531,7 @@ function store(state, emitter) {
     editor.setValue(contents)
 
     if (state.isConnected && state.selectedDevice === 'serial') {
-      await serial.stop()
+      await serial.get_prompt()
       // Ask for confirmation to overwrite existing file
       let confirmation = true
       if (state.serialFiles.find(f => f.path === filename)) {