Add enable shortcut as setting

Allow 3 digits for probe thickness Use probe thickness setting step for probe panel probe thickness step Improve real modulo issue workaround
luc-github · Jan 18, 2024 · 958d468 · 958d468
1 parent 82b6355
commit 958d468
Show file tree

Hide file tree

Showing 15 changed files with 34 additions and 8 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/server/CNC/GRBL/Flash/preferences.json b/server/CNC/GRBL/Flash/preferences.json
@@ -10,6 +10,7 @@
   "showinformationpage": true,
   "showmachinesettings": true,
   "enableautorepeat": false,
+  "enableshortcuts": true,
   "autorepeatdelay": "500",
   "emergencystop": "#SAFETYDOOR#",
   "fixedpanels": false,

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-a49'
+export const webUIversion = '3.0.0-a50'
 export const Esp3dVersion = () => (
     <span>
         {webUIversion}.{webUIbuild}

diff --git a/src/components/Panels/ProbeCNC.js b/src/components/Panels/ProbeCNC.js
@@ -308,7 +308,7 @@ const ProbePanel = () => {
                             label: 'CN94',
                             tooltip: 'CN94',
                             min: 0,
-                            step: "0.1",
+                            step: useUiContextFn.getElement('probethickness').step,
                             value: probethickness,
                             append: 'CN96',
                             variableName: '#probe_thickness#',
@@ -488,9 +488,11 @@ const ProbePanel = () => {
                                                         }
                                                         if (typeof element.step!=="undefined") {  
                                                                 //hack to avoid float precision issue
-                                                                const mult=1/element.step
-                                                                console.log(element.value.current,element.step,mult, (element.value.current * mult ) % (element.step* mult))
-                                                                if ((element.value.current * mult ) % (element.step* mult) != 0) {
+                                                                const mult=(1/element.step).toFixed(0)
+                                                                const valueMult = Math.round(element.value.current * mult )
+                                                                const stepMult = Math.round(element.step* mult)
+                                                                console.log("Element:",element.value.current, "Step:",element.step,"Mult",mult, "Modal:", "Value mult", valueMult, "Step mult", stepMult, "Modulo", valueMult % stepMult)
+                                                                if (valueMult % stepMult != 0) {
                                                                     console.log("not valid", )
                                                                     validation.valid = false
                                                                 }

diff --git a/src/pages/dashboard/index.js b/src/pages/dashboard/index.js
@@ -107,6 +107,7 @@ const keyboardEventHandlerDown = (e) => {
         document.getElementById(cmdMatch).click()
     }
 }
+let intialisationDone = false
 
 const Dashboard = () => {
     console.log("Dashboard")
@@ -182,6 +183,19 @@ const Dashboard = () => {
         }
     }
 
+
+    useEffect(() => {
+        if (!intialisationDone) {
+            console.log("Init")
+            intialisationDone = true
+            console.log(uisettings.getValue("enableshortcuts"))
+            setIsKeyboardEnabled(uisettings.getValue("enableshortcuts"))
+            shortcuts.enable(uisettings.getValue("enableshortcuts"))
+        } else {
+            console.log("Init Done")
+        }
+        }, [])
+
     useEffect(() => {
         if (shortcuts.enabled) {
             AddKeyboardListener()

diff --git a/src/tabs/interface/index.js b/src/tabs/interface/index.js
@@ -121,8 +121,11 @@ const InterfaceTab = () => {
         } else {
             if (typeof fieldData.step!=="undefined") {  
                 //hack to avoid float precision issue
-                const mult=1/fieldData.step
-                if ((fieldData.value * mult ) % (fieldData.step* mult) != 0) {
+                const mult=(1/fieldData.step).toFixed(0)
+                const valueMult = Math.round(fieldData * mult )
+                const stepMult = Math.round(fieldData.step* mult)
+
+                if ((valueMult  % stepMult ) != 0) {
                     validation.message = <Flag size="1rem" color="red" />
                     validation.valid = false
                 }

diff --git a/src/targets/CNC/preferences.json b/src/targets/CNC/preferences.json
@@ -48,7 +48,7 @@
                 "type": "number",
                 "label": "CN94",
                 "value": "1",
-                "step": "0.1",
+                "step": "0.001",
                 "append": "CN96",
                 "min": 0
             },

diff --git a/src/targets/preferences.json b/src/targets/preferences.json
@@ -72,6 +72,12 @@
                         "label": "S217",
                         "value": false
                     },
+                    {
+                        "id": "enableshortcuts",
+                        "type": "boolean",
+                        "label": "S215",
+                        "value": false
+                    },
                     {
                         "id": "autorepeatdelay",
                         "type": "number",