Better Tft support and command extraction

languages/printerpack/en.json

@@ -436,9 +436,9 @@
     "P98": "Pause command",
     "P99": "Resume command",
     "P100": "Stop command",
-    "P101": "SD print commands",
-    "P102": "TFT SD print commands",
-    "P103": "TFT USB print commands",
+    "P101": "SD play commands",
+    "P102": "TFT SD play commands",
+    "P103": "TFT USB play commands",
     "P104": "Preset values",
     "P105": "Elapsed",
     "P106": "Command",

src/components/Controls/Fields/Select.js

@@ -20,6 +20,7 @@
 import { Fragment, h } from "preact"
 import { useEffect } from "preact/hooks"
 import { useSettingsContext, useUiContextFn } from "../../../contexts"
+import { T } from "../../Translations"
 import {
     generateDependIds,
     connectionDepend,
@@ -46,7 +47,7 @@ const Option = ({ label, depend, ...props }) => {
             )
         } else return null
     }
-    return <option {...props}>{label}</option>
+    return <option {...props}>{T(label)}</option>
 }
 
 const Select = ({

src/components/Helpers/components.js

@@ -125,11 +125,16 @@ const connectionDepend = (depend, settings) => {
 }
 
 //this is dynamic as it is depending on the preferences settings
-const settingsDepend = (depend, settings, isOr) => {
+const settingsDepend = (depend, settings, isOr=false) => {
+    if (typeof depend!="undefined"){
+        //console.log("settingsDepend", depend, settings, isOr)
+        //console.log("settingsDepend", depend[0])    
+    }
     if (Array.isArray(depend)) {
         return depend.reduce(
             (acc, d) => {
                 if (d.id) {
+                    if (typeof d.value != "undefined"){
                     const element = useUiContextFn.getElement(d.id, settings)
                     if (isOr) {
                         if (element) return acc || element.value === d.value
@@ -138,6 +143,16 @@ const settingsDepend = (depend, settings, isOr) => {
                         if (element) return acc && element.value === d.value
                         else return acc && false === d.value
                     }
+                } else if (typeof d.notvalue != "undefined"){
+                    const element = useUiContextFn.getElement(d.id, settings)
+                    if (isOr) {
+                        if (element) return acc || element.value != d.notvalue
+                        return acc || false != d.notvalue
+                    } else {
+                        if (element) return acc && element.value != d.notvalue
+                        else return acc && false != d.notvalue
+                    }
+                }
                 }
                 if (d.ids) {
                     return acc && settingsDepend(d.ids, settings, true)

src/hooks/useSettings.js

@@ -194,9 +194,12 @@ const useSettings = () => {
                         })
                         return
                     }
-                    connectionSettings.current = jsonResult.data
+                    connectionSettings.current = jsonResult.data 
+                    if (typeof connectionSettings.current.Screen == "undefined" ){
+                        connectionSettings.current.Screen = "none"
+                    }
                     processData('core', 'ESP800', true)
-
+                    console.log(connectionSettings.current)
                     document.title = connectionSettings.current.Hostname
                     if (
                         !connectionSettings.current.HostPath ||

src/tabs/interface/index.js

@@ -40,19 +40,7 @@ import { importPreferences, formatPreferences } from "./importHelper"
 
 const isDependenciesMet = (depend) => {
     const { interfaceSettings } = useSettingsContext()
-    let met = false
-    depend.forEach((d) => {
-        if (d.id) {
-            const element = useUiContextFn.getElement(
-                d.id,
-                interfaceSettings.current.settings
-            )
-            if (element.value == d.value) {
-                met = true
-            }
-        }
-    })
-    return met
+    return  settingsDepend(depend, interfaceSettings.current.settings)
 }
 
 const InterfaceTab = () => {
@@ -388,8 +376,6 @@ const InterfaceTab = () => {
                                                             section[
                                                                 subsectionId
                                                             ]
-                                                        // console.log(fieldData);
-
                                                         if (
                                                             fieldData.type ==
                                                             "group"

src/targets/CNC/grblHAL/DIRECTSD-source.js

@@ -20,6 +20,7 @@
 import { h } from "preact"
 import { sortedFilesList, formatStatus } from "../../../components/Helpers"
 import { canProcessFile } from "../../helpers"
+import { useUiContextFn, useSettingsContextFn } from '../../../contexts'
 
 const capabilities = {
     Process: (path, filename) => {
@@ -101,14 +102,11 @@ const commands = {
         }
     },
     play: (path, filename) => {
+        const spath = (path + (path == '/' ? '' : '/') + filename).replaceAll('//', '/')
+        const cmd =  useUiContextFn.getValue('sdplaycmd').replace("#",spath).replaceAll('//', '/')
         return {
             type: "cmd",
-            cmd:
-                "$F=" +
-                path +
-                (path.endsWith("/") ? "" : "/") +
-                filename +
-                "\n",
+            cmd,
         }
     },
 }