Update 3D printer conditions for displaying settings

luc-github · luc-github · commit c8debd73742e · 2024-12-08T20:40:05.000+08:00
diff --git a/src/targets/Printer3D/Marlin-embedded/preferences.json b/src/targets/Printer3D/Marlin-embedded/preferences.json
@@ -161,7 +161,8 @@
                 "id": "ismixedextruder",
                 "type": "boolean",
                 "label": "P49",
-                "value": false
+                "value": false,
+                "depend": [{ "id": "showextruderspanel", "value": true }]
             },
             {
                 "id": "enumber",
@@ -180,7 +181,8 @@
                     {
                         "id": "ismixedextruder",
                         "value": true
-                    }
+                    },
+                    { "id": "showextruderspanel", "value": true }
                 ]
             },
             {
@@ -193,7 +195,8 @@
                     {
                         "id": "ismixedextruder",
                         "value": true
-                    }
+                    },
+                    { "id": "showextruderspanel", "value": true }
                 ]
             }
         ],
@@ -206,7 +209,8 @@
                     {
                         "id": "sd",
                         "value": true
-                    }
+                    },
+                    { "id": "showstatuspanel", "value": true }
                 ],
                 "value": [
                     {
@@ -236,7 +240,7 @@
                 "id": "tftsdcommands",
                 "type": "group",
                 "label": "P102",
-                "depend": [{ "id": "tftsd", "value": true }],
+                "depend": [{ "id": "tftsd", "value": true }, { "id": "showstatuspanel", "value": true }],
                 "value": [
                     {
                         "id": "tftsdpausecmd",
@@ -265,7 +269,7 @@
                 "id": "tftusbcommands",
                 "type": "group",
                 "label": "P103",
-                "depend": [{ "id": "tftusb", "value": true }],
+                "depend": [{ "id": "tftusb", "value": true }, { "id": "showstatuspanel", "value": true }],
                 "value": [
                     {
                         "id": "tftusbpausecmd",
diff --git a/src/targets/Printer3D/Marlin/preferences.json b/src/targets/Printer3D/Marlin/preferences.json
@@ -327,7 +327,8 @@
                 "id": "ismixedextruder",
                 "type": "boolean",
                 "label": "P49",
-                "value": false
+                "value": false,
+                "depend": [{ "id": "showextruderspanel", "value": true }]
             },
             {
                 "id": "enumber",
@@ -346,7 +347,8 @@
                     {
                         "id": "ismixedextruder",
                         "value": true
-                    }
+                    },
+                    { "id": "showextruderspanel", "value": true }
                 ]
             },
             {
@@ -359,7 +361,8 @@
                     {
                         "id": "ismixedextruder",
                         "value": true
-                    }
+                    },
+                    { "id": "showextruderspanel", "value": true }
                 ]
             }
         ],
@@ -393,7 +396,8 @@
                                         ]
                                     ]
                                     
-                    }
+                    },
+                    { "id": "showstatuspanel", "value": true }
                 ],
                 "value": [
                     {
@@ -431,7 +435,8 @@
                     {
                         "id": "tftsd",
                         "value": true
-                    }
+                    },
+                    { "id": "showstatuspanel", "value": true }
                 ],
                 "value": [
                     {
@@ -463,7 +468,8 @@
                 "label": "P103",
                 "depend": [
                     { "id": "tftfs", "notvalue": "none" },
-                    { "id": "tftusb", "value": true }
+                    { "id": "tftusb", "value": true },
+                    { "id": "showstatuspanel", "value": true }
                 ],
                 "value": [
                     {
diff --git a/src/targets/Printer3D/Repetier/preferences.json b/src/targets/Printer3D/Repetier/preferences.json
@@ -211,7 +211,8 @@
                 "id": "ismixedextruder",
                 "type": "boolean",
                 "label": "P49",
-                "value": false
+                "value": false,
+                "depend": [{ "id": "showextruderspanel", "value": true }]
             },
             {
                 "id": "enumber",
@@ -230,7 +231,8 @@
                     {
                         "id": "ismixedextruder",
                         "value": true
-                    }
+                    },
+                    { "id": "showextruderspanel", "value": true }
                 ]
             },
             {
@@ -239,15 +241,15 @@
                 "label": "P51",
                 "help": "S97",
                 "value": "blue;red;green;#FF00FF;cyan;black",
-                "depend": [{ "id": "ismixedextruder", "value": true }]
+                "depend": [{ "id": "ismixedextruder", "value": true }, { "id": "showextruderspanel", "value": true }]
             }
         ],
         "controls": [
             {
                 "id": "flowcontrolsgroup",
                 "type": "group",
                 "label": "",
-                "depend": [{ "id": "showflowratectrls", "value": true }],
+                "depend": [{ "id": "showflowratectrls", "value": true }, { "id": "showextracontrolspanel", "value": true }],
                 "value": [
                     {
                         "id": "flowratecmd",
@@ -268,7 +270,8 @@
                     {
                         "id": "sd",
                         "value": true
-                    }
+                    },
+                    { "id": "showstatuspanel", "value": true }
                 ],
                 "value": [
                     {
@@ -306,7 +309,8 @@
                     {
                         "id": "tftsd",
                         "value": true
-                    }
+                    },
+                    { "id": "showstatuspanel", "value": true }
                 ],
                 "value": [
                     {
@@ -338,7 +342,8 @@
                 "label": "P103",
                 "depend": [
                     { "id": "tftfs", "notvalue": "none" },
-                    { "id": "tftusb", "value": true }
+                    { "id": "tftusb", "value": true },
+                    { "id": "showstatuspanel", "value": true }
                 ],
                 "value": [
                     {
diff --git a/src/targets/Printer3D/Smoothieware/preferences.json b/src/targets/Printer3D/Smoothieware/preferences.json
@@ -292,7 +292,7 @@
                 "id": "fancontrolsgroup",
                 "type": "group",
                 "label": "",
-                "depend": [{ "id": "showfanctrls", "value": true }],
+                "depend": [{ "id": "showfanctrls", "value": true }, { "id": "showextracontrolspanel", "value": true }],
                 "value": [
                     {
                         "id": "fancmd",
@@ -307,7 +307,7 @@
                 "id": "flowcontrolsgroup",
                 "type": "group",
                 "label": "",
-                "depend": [{ "id": "showflowratectrls", "value": true }],
+                "depend": [{ "id": "showflowratectrls", "value": true }, { "id": "showextracontrolspanel", "value": true }],
                 "value": [
                     {
                         "id": "flowratecmd",
@@ -324,7 +324,7 @@
                 "id": "sdcommands",
                 "type": "group",
                 "label": "P101",
-                "depend": [{ "id": "sd", "value": true }],
+                "depend": [{ "id": "sd", "value": true }, { "id": "showstatuspanel", "value": true }],
                 "value": [
                     {
                         "id": "sdpausecmd",
@@ -361,7 +361,8 @@
                     {
                         "id": "tftsd",
                         "value": true
-                    }
+                    },
+                    { "id": "showstatuspanel", "value": true }
                 ],
                 "value": [
                     {
@@ -393,7 +394,8 @@
                 "label": "P103",
                 "depend": [
                     { "id": "tftfs", "notvalue": "none" },
-                    { "id": "tftusb", "value": true }
+                    { "id": "tftusb", "value": true },
+                    { "id": "showstatuspanel", "value": true }
                 ],
                 "value": [
                     {
diff --git a/src/targets/Printer3D/preferences.json b/src/targets/Printer3D/preferences.json
@@ -791,19 +791,21 @@
                 "id": "openextracontrolsonstart",
                 "type": "boolean",
                 "label": "S93",
-                "value": true
+                "value": true,
+                "depend": [{ "id": "showextracontrolspanel", "value": true }]
             },
             {
                 "id": "showfanctrls",
                 "type": "boolean",
                 "label": "P45",
-                "value": true
+                "value": true,
+                "depend": [{ "id": "showextracontrolspanel", "value": true }]
             },
             {
                 "id": "fancontrolsgroup",
                 "type": "group",
                 "label": "",
-                "depend": [{ "id": "showfanctrls", "value": true }],
+                "depend": [{ "id": "showfanctrls", "value": true }, { "id": "showextracontrolspanel", "value": true }],
                 "value": [
                     {
                         "id": "fanpresets",
@@ -829,13 +831,14 @@
                 "id": "showspeedctrls",
                 "type": "boolean",
                 "label": "P46",
-                "value": true
+                "value": true,
+                "depend": [{ "id": "showextracontrolspanel", "value": true }]
             },
             {
                 "id": "speedcontrolsgroup",
                 "type": "group",
                 "label": "",
-                "depend": [{ "id": "showspeedctrls", "value": true }],
+                "depend": [{ "id": "showspeedctrls", "value": true }, { "id": "showextracontrolspanel", "value": true }],
                 "value": [
                     {
                         "id": "speedpresets",
@@ -860,13 +863,14 @@
                 "id": "showflowratectrls",
                 "type": "boolean",
                 "label": "P47",
-                "value": true
+                "value": true,
+                "depend": [{ "id": "showextracontrolspanel", "value": true }]
             },
             {
                 "id": "flowcontrolsgroup",
                 "type": "group",
                 "label": "",
-                "depend": [{ "id": "showflowratectrls", "value": true }],
+                "depend": [{ "id": "showflowratectrls", "value": true }, { "id": "showextracontrolspanel", "value": true }],
                 "value": [
                     {
                         "id": "flowratepresets",
@@ -891,7 +895,8 @@
                 "id": "showsensorctrls",
                 "type": "boolean",
                 "label": "P88",
-                "value": true
+                "value": true,
+                "depend": [{ "id": "showextracontrolspanel", "value": true }]
             }
         ]
     }

Original file line number	Diff line number	Diff line change
`@@ -161,7 +161,8 @@`
`161`	`161`	`"id": "ismixedextruder",`
`162`	`162`	`"type": "boolean",`
`163`	`163`	`"label": "P49",`
`164`		`- "value": false`
	`164`	`+ "value": false,`
	`165`	`+ "depend": [{ "id": "showextruderspanel", "value": true }]`
`165`	`166`	`},`
`166`	`167`	`{`
`167`	`168`	`"id": "enumber",`
`@@ -180,7 +181,8 @@`
`180`	`181`	`{`
`181`	`182`	`"id": "ismixedextruder",`
`182`	`183`	`"value": true`
`183`		`- }`
	`184`	`+ },`
	`185`	`+ { "id": "showextruderspanel", "value": true }`
`184`	`186`	`]`
`185`	`187`	`},`
`186`	`188`	`{`
`@@ -193,7 +195,8 @@`
`193`	`195`	`{`
`194`	`196`	`"id": "ismixedextruder",`
`195`	`197`	`"value": true`
`196`		`- }`
	`198`	`+ },`
	`199`	`+ { "id": "showextruderspanel", "value": true }`
`197`	`200`	`]`
`198`	`201`	`}`
`199`	`202`	`],`
`@@ -206,7 +209,8 @@`
`206`	`209`	`{`
`207`	`210`	`"id": "sd",`
`208`	`211`	`"value": true`
`209`		`- }`
	`212`	`+ },`
	`213`	`+ { "id": "showstatuspanel", "value": true }`
`210`	`214`	`],`
`211`	`215`	`"value": [`
`212`	`216`	`{`
`@@ -236,7 +240,7 @@`
`236`	`240`	`"id": "tftsdcommands",`
`237`	`241`	`"type": "group",`
`238`	`242`	`"label": "P102",`
`239`		`- "depend": [{ "id": "tftsd", "value": true }],`
	`243`	`+ "depend": [{ "id": "tftsd", "value": true }, { "id": "showstatuspanel", "value": true }],`
`240`	`244`	`"value": [`
`241`	`245`	`{`
`242`	`246`	`"id": "tftsdpausecmd",`
`@@ -265,7 +269,7 @@`
`265`	`269`	`"id": "tftusbcommands",`
`266`	`270`	`"type": "group",`
`267`	`271`	`"label": "P103",`
`268`		`- "depend": [{ "id": "tftusb", "value": true }],`
	`272`	`+ "depend": [{ "id": "tftusb", "value": true }, { "id": "showstatuspanel", "value": true }],`
`269`	`273`	`"value": [`
`270`	`274`	`{`
`271`	`275`	`"id": "tftusbpausecmd",`
Original file line number	Diff line number	Diff line change
`@@ -327,7 +327,8 @@`
`327`	`327`	`"id": "ismixedextruder",`
`328`	`328`	`"type": "boolean",`
`329`	`329`	`"label": "P49",`
`330`		`- "value": false`
	`330`	`+ "value": false,`
	`331`	`+ "depend": [{ "id": "showextruderspanel", "value": true }]`
`331`	`332`	`},`
`332`	`333`	`{`
`333`	`334`	`"id": "enumber",`
`@@ -346,7 +347,8 @@`
`346`	`347`	`{`
`347`	`348`	`"id": "ismixedextruder",`
`348`	`349`	`"value": true`
`349`		`- }`
	`350`	`+ },`
	`351`	`+ { "id": "showextruderspanel", "value": true }`
`350`	`352`	`]`
`351`	`353`	`},`
`352`	`354`	`{`
`@@ -359,7 +361,8 @@`
`359`	`361`	`{`
`360`	`362`	`"id": "ismixedextruder",`
`361`	`363`	`"value": true`
`362`		`- }`
	`364`	`+ },`
	`365`	`+ { "id": "showextruderspanel", "value": true }`
`363`	`366`	`]`
`364`	`367`	`}`
`365`	`368`	`],`
`@@ -393,7 +396,8 @@`
`393`	`396`	`]`
`394`	`397`	`]`
`395`	`398`
`396`		`- }`
	`399`	`+ },`
	`400`	`+ { "id": "showstatuspanel", "value": true }`
`397`	`401`	`],`
`398`	`402`	`"value": [`
`399`	`403`	`{`
`@@ -431,7 +435,8 @@`
`431`	`435`	`{`
`432`	`436`	`"id": "tftsd",`
`433`	`437`	`"value": true`
`434`		`- }`
	`438`	`+ },`
	`439`	`+ { "id": "showstatuspanel", "value": true }`
`435`	`440`	`],`
`436`	`441`	`"value": [`
`437`	`442`	`{`
`@@ -463,7 +468,8 @@`
`463`	`468`	`"label": "P103",`
`464`	`469`	`"depend": [`
`465`	`470`	`{ "id": "tftfs", "notvalue": "none" },`
`466`		`- { "id": "tftusb", "value": true }`
	`471`	`+ { "id": "tftusb", "value": true },`
	`472`	`+ { "id": "showstatuspanel", "value": true }`
`467`	`473`	`],`
`468`	`474`	`"value": [`
`469`	`475`	`{`
Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,8 @@`
`211`	`211`	`"id": "ismixedextruder",`
`212`	`212`	`"type": "boolean",`
`213`	`213`	`"label": "P49",`
`214`		`- "value": false`
	`214`	`+ "value": false,`
	`215`	`+ "depend": [{ "id": "showextruderspanel", "value": true }]`
`215`	`216`	`},`
`216`	`217`	`{`
`217`	`218`	`"id": "enumber",`
`@@ -230,7 +231,8 @@`
`230`	`231`	`{`
`231`	`232`	`"id": "ismixedextruder",`
`232`	`233`	`"value": true`
`233`		`- }`
	`234`	`+ },`
	`235`	`+ { "id": "showextruderspanel", "value": true }`
`234`	`236`	`]`
`235`	`237`	`},`
`236`	`238`	`{`
`@@ -239,15 +241,15 @@`
`239`	`241`	`"label": "P51",`
`240`	`242`	`"help": "S97",`
`241`	`243`	`"value": "blue;red;green;#FF00FF;cyan;black",`
`242`		`- "depend": [{ "id": "ismixedextruder", "value": true }]`
	`244`	`+ "depend": [{ "id": "ismixedextruder", "value": true }, { "id": "showextruderspanel", "value": true }]`
`243`	`245`	`}`
`244`	`246`	`],`
`245`	`247`	`"controls": [`
`246`	`248`	`{`
`247`	`249`	`"id": "flowcontrolsgroup",`
`248`	`250`	`"type": "group",`
`249`	`251`	`"label": "",`
`250`		`- "depend": [{ "id": "showflowratectrls", "value": true }],`
	`252`	`+ "depend": [{ "id": "showflowratectrls", "value": true }, { "id": "showextracontrolspanel", "value": true }],`
`251`	`253`	`"value": [`
`252`	`254`	`{`
`253`	`255`	`"id": "flowratecmd",`
`@@ -268,7 +270,8 @@`
`268`	`270`	`{`
`269`	`271`	`"id": "sd",`
`270`	`272`	`"value": true`
`271`		`- }`
	`273`	`+ },`
	`274`	`+ { "id": "showstatuspanel", "value": true }`
`272`	`275`	`],`
`273`	`276`	`"value": [`
`274`	`277`	`{`
`@@ -306,7 +309,8 @@`
`306`	`309`	`{`
`307`	`310`	`"id": "tftsd",`
`308`	`311`	`"value": true`
`309`		`- }`
	`312`	`+ },`
	`313`	`+ { "id": "showstatuspanel", "value": true }`
`310`	`314`	`],`
`311`	`315`	`"value": [`
`312`	`316`	`{`
`@@ -338,7 +342,8 @@`
`338`	`342`	`"label": "P103",`
`339`	`343`	`"depend": [`
`340`	`344`	`{ "id": "tftfs", "notvalue": "none" },`
`341`		`- { "id": "tftusb", "value": true }`
	`345`	`+ { "id": "tftusb", "value": true },`
	`346`	`+ { "id": "showstatuspanel", "value": true }`
`342`	`347`	`],`
`343`	`348`	`"value": [`
`344`	`349`	`{`