Remove Flash as Macro source for Marlin embedded because [ESP700] doe…

…s nothing on Marlin FW Fix `//` in path of SD macro if any
luc-github · Dec 21, 2023 · 7b1a520 · 7b1a520
1 parent 67f886c
commit 7b1a520
Show file tree

Hide file tree

Showing 13 changed files with 11 additions and 4 deletions.
diff --git a/dist/CNC/GRBL/index.html.gz b/dist/CNC/GRBL/index.html.gz
diff --git a/dist/CNC/GRBLHal/index.html.gz b/dist/CNC/GRBLHal/index.html.gz
diff --git a/dist/Plotter/HP-GL/index.html.gz b/dist/Plotter/HP-GL/index.html.gz
diff --git a/dist/Printer3D/Marlin-embedded/index.html.gz b/dist/Printer3D/Marlin-embedded/index.html.gz
diff --git a/dist/Printer3D/Marlin/index.html.gz b/dist/Printer3D/Marlin/index.html.gz
diff --git a/dist/Printer3D/Repetier/index.html.gz b/dist/Printer3D/Repetier/index.html.gz
diff --git a/dist/Printer3D/Smoothieware/index.html.gz b/dist/Printer3D/Smoothieware/index.html.gz
diff --git a/dist/SandTable/GRBL/index.html.gz b/dist/SandTable/GRBL/index.html.gz
diff --git a/src/components/App/version.js b/src/components/App/version.js
@@ -17,7 +17,7 @@
 */
 import { h } from 'preact'
 import { webUIbuild } from '../../targets'
-export const webUIversion = '3.0.0-a45'
+export const webUIversion = '3.0.0-a46'
 export const Esp3dVersion = () => (
     <span>
         {webUIversion}.{webUIbuild}

diff --git a/src/tabs/interface/importHelper.js b/src/tabs/interface/importHelper.js
@@ -78,6 +78,10 @@ function formatItem(itemData, index = -1, origineId = "extrapanels") {
                                         connection_id: "FlashFileSystem",
                                         value: "!='none'",
                                     },
+                                    {
+                                        connection_id: "FWTargetID",
+                                        value: "!='30'",
+                                    },
                                 ],
                             },
                             {

diff --git a/src/targets/Printer3D/Marlin-embedded/SD-source.js b/src/targets/Printer3D/Marlin-embedded/SD-source.js
@@ -102,9 +102,10 @@ const commands = {
         return res
     },
     play: (path, filename) => {
+        let cmdstr = 'M23 ' + path + (path == '/' ? '' : '/') + filename + '\nM24'
         return {
             type: 'cmd',
-            cmd: 'M23 ' + path + (path == '/' ? '' : '/') + filename + '\nM24',
+            cmd: cmdstr.replace("//", "/"),
         }
     },
     delete: (path, filename) => {

diff --git a/src/targets/Printer3D/Marlin/SD-source.js b/src/targets/Printer3D/Marlin/SD-source.js
@@ -126,9 +126,10 @@ const commands = {
         return res
     },
     play: (path, filename) => {
+        let cmdstr = 'M23 ' + path + (path == '/' ? '' : '/') + filename + '\nM24'
         return {
             type: 'cmd',
-            cmd: 'M23 ' + path + (path == '/' ? '' : '/') + filename + '\nM24',
+            cmd: cmdstr.replace("//", "/"),
         }
     },
     delete: (path, filename) => {

diff --git a/src/targets/Printer3D/Marlin/SDEXT-source.js b/src/targets/Printer3D/Marlin/SDEXT-source.js
@@ -125,9 +125,10 @@ const commands = {
         return res
     },
     play: (path, filename) => {
+        let cmdstr = 'M23 ' + path + (path == '/' ? '' : '/') + filename + '\nM24'
         return {
             type: 'cmd',
-            cmd: 'M23 ' + path + (path == '/' ? '' : '/') + filename + '\nM24',
+            cmd: cmdstr.replace("//", "/"),
         }
     },
     delete: (path, filename) => {