Fix python3 search, add ntoe about serial monitor

earlephilhower · Mar 31, 2021 · a650b8f · a650b8f
1 parent 97c1b1a
commit a650b8f
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/bin/com/efp3/pico/mklittlefs/PicoLittleFS$2.class b/bin/com/efp3/pico/mklittlefs/PicoLittleFS$2.class
diff --git a/bin/com/efp3/pico/mklittlefs/PicoLittleFS.class b/bin/com/efp3/pico/mklittlefs/PicoLittleFS.class
diff --git a/src/PicoLittleFS.java b/src/PicoLittleFS.java
@@ -99,12 +99,12 @@ private void sysExec(final String[] arguments){
       public void run() {
         try {
           if(listenOnProcess(arguments) != 0){
-            editor.statusError("LittleFS Upload failed!");
+            editor.statusError("LittleFS Upload failed! Did you close the Serial Monitor?");
           } else {
             editor.statusNotice("LittleFS Image Uploaded");
           }
         } catch (Exception e){
-          editor.statusError("LittleFS Upload failed!");
+          editor.statusError("LittleFS Upload failed! Did you close the Serial Monitor?");
         }
       }
     };
@@ -220,7 +220,7 @@ private void createAndUpload(){
       uploadCmd = uploadPyFile.getAbsolutePath();
     }
     // Find python.exe if present, don't fail if not found for backwards compat
-    String[] paths = { platform.getFolder()+"/tools", platform.getFolder()+"/tools/python3", PreferencesData.get("runtime.tools.python3.path") };
+    String[] paths = { platform.getFolder()+"/system", platform.getFolder()+"/system/python3", PreferencesData.get("runtime.tools.pqt-python3.path") };
     for (String s: paths) {
       File toolPyFile = new File(s, pythonCmd);
       if (toolPyFile.exists() && toolPyFile.isFile() && toolPyFile.canExecute()) {