Mirrors/ESP3D-WEBUI
2
0
Fork 0
mirror of https://github.com/luc-github/ESP3D-WEBUI.git synced 2026-02-19 17:01:20 +01:00
Code Issues Packages Projects Releases Wiki Activity

Update CNC settings display condition

Browse Source 
remove control-fieldset class from grblHAL dor Mask for consistency
This commit is contained in:
Luc
2024-12-09 09:10:39 +08:00
parent c8debd7374
commit 7266acfe1c
4 changed files with 43 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/Controls/Fields/Mask.js
View File

@@ -96,7 +96,7 @@ const Mask = ({
)
return (
<FieldGroup className="m-1 control-fieldset" id={id} label={label}>
<FieldGroup className="m-1" id={id} label={label}>
{options.map((option, index) => {
const [validation, setvalidation] = useState()
const generateValidation = (fieldData) => {

3
src/targets/CNC/GRBL/preferences.json
View File

@@ -172,6 +172,7 @@
"id": "axis",
"type": "group",
"label": "CN8",
"depend": [{ "id": "showjogpanel", "value": true }],
"value": [
{
"id": "showx",
@@ -215,6 +216,7 @@
"id": "feedrate",
"type": "group",
"label": "CN9",
"depend": [{ "id": "showjogpanel", "value": true }],
"value": [
{
"id": "xyfeedrate",
@@ -304,6 +306,7 @@
"editable": true,
"label": "S212",
"type": "list",
"depend": [{ "id": "showjogpanel", "value": true }],
"value": [
{
"id": "btn+X",

3
src/targets/CNC/grblHAL/preferences.json
View File

@@ -185,6 +185,7 @@
"id": "axis",
"type": "group",
"label": "CN8",
"depend": [{ "id": "showjogpanel", "value": true }],
"value": [
{
"id": "showx",
@@ -300,6 +301,7 @@
"id": "feedrate",
"type": "group",
"label": "CN9",
"depend": [{ "id": "showjogpanel", "value": true }],
"value": [
{
"id": "xyfeedrate",
@@ -463,6 +465,7 @@
"editable": true,
"label": "S212",
"type": "list",
"depend": [{ "id": "showjogpanel", "value": true }],
"value": [
{
"id": "btn+X",

53
src/targets/CNC/preferences.json
View File

@@ -11,7 +11,8 @@
"id": "openstatusonstart",
"type": "boolean",
"label": "S93",
"value": true
"value": true,
"depend": [{ "id": "showstatuspanel", "value": true }]
}
],
"probe": [
@@ -25,7 +26,8 @@
"id": "openprobeonstart",
"type": "boolean",
"label": "S93",
"value": true
"value": true,
"depend": [{ "id": "showprobepanel", "value": true }]
},
{
"id": "probefeedrate",
@@ -33,7 +35,8 @@
"label": "CN9",
"append": "CN1",
"value": 20,
"min": 1
"min": 1,
"depend": [{ "id": "showprobepanel", "value": true }]
},
{
"id": "maxprobe",
@@ -41,7 +44,8 @@
"label": "CN93",
"value": 15,
"append": "CN96",
"min": 0
"min": 0,
"depend": [{ "id": "showprobepanel", "value": true }]
},
{
"id": "probethickness",
@@ -50,14 +54,16 @@
"value": "1",
"step": "0.001",
"append": "CN96",
"min": 0
"min": 0,
"depend": [{ "id": "showprobepanel", "value": true }]
},
{
"id": "probepostcommand",
"type": "text",
"label": "CN95",
"value": "G10 L20 P0 #selected_axis##probe_thickness#",
"help": "S97"
"help": "S97",
"depend": [{ "id": "showprobepanel", "value": true }]
}
],
"laser": [
@@ -71,12 +77,14 @@
"id": "openlaseronstart",
"type": "boolean",
"label": "S93",
"value": true
"value": true,
"depend": [{ "id": "showlaserpanel", "value": true }]
},
{
"id": "laser",
"type": "group",
"label": "CN90",
"depend": [{ "id": "showlaserpanel", "value": true }],
"value": [
{
"id": "lasertest",
@@ -102,7 +110,8 @@
"type": "number",
"label": "CN84",
"value": 1000,
"min": 1
"min": 1,
"depend": [{ "id": "showlaserpanel", "value": true }]
}
],
"spindle": [
@@ -116,26 +125,30 @@
"id": "openspindleonstart",
"type": "boolean",
"label": "S93",
"value": true
"value": true,
"depend": [{ "id": "showspindlepanel", "value": true }]
},
{
"id": "spindlespeed",
"type": "number",
"label": "CN59",
"value": 1000,
"min": 0
"min": 0,
"depend": [{ "id": "showspindlepanel", "value": true }]
},
{
"id": "showM4ctrls",
"type": "boolean",
"label": "CN70",
"value": true
"value": true,
"depend": [{ "id": "showspindlepanel", "value": true }]
},
{
"id": "showCoolantctrls",
"type": "boolean",
"label": "CN72",
"value": true
"value": true,
"depend": [{ "id": "showspindlepanel", "value": true }]
},
{
"id": "showMistctrls",
@@ -146,7 +159,8 @@
{
"id": "showCoolantctrls",
"value": true
}
},
{ "id": "showspindlepanel", "value": true }
]
},
{
@@ -158,7 +172,8 @@
{
"id": "showMistctrls",
"value": true
}
},
{ "id": "showspindlepanel", "value": true }
]
}
],
@@ -173,7 +188,8 @@
"id": "openoverridesonstart",
"type": "boolean",
"label": "S93",
"value": true
"value": true,
"depend": [{ "id": "showoverridespanel", "value": true }]
}
],
"jog": [
@@ -181,6 +197,7 @@
"id": "home",
"type": "group",
"label": "CN17",
"depend": [{ "id": "showjogpanel", "value": true }],
"value": [
{
"id": "homesingleaxis",
@@ -202,14 +219,16 @@
"type": "text",
"label": "CN19",
"value": "G10 L20 P0 #",
"help": "CN11"
"help": "CN11",
"depend": [{ "id": "showjogpanel", "value": true }]
},
{
"id": "jogstopcmd",
"type": "text",
"label": "CN23",
"value": "#JOGCANCEL#",
"help": "S97"
"help": "S97",
"depend": [{ "id": "showjogpanel", "value": true }]
}
]
}