Skip to content

Commit

Permalink
Update 3D printer conditions for displaying settings
Browse files Browse the repository at this point in the history
  • Loading branch information
@luc-github
luc-github committed Dec 8, 2024
1 parent 4add780 commit c8debd7
Show file tree
Hide file tree
Showing 5 changed files with 54 additions and 32 deletions.
16 changes: 10 additions & 6 deletions src/targets/Printer3D/Marlin-embedded/preferences.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,8 @@
"id": "ismixedextruder",
"type": "boolean",
"label": "P49",
"value": false
"value": false,
"depend": [{ "id": "showextruderspanel", "value": true }]
},
{
"id": "enumber",
Expand All @@ -180,7 +181,8 @@
{
"id": "ismixedextruder",
"value": true
}
},
{ "id": "showextruderspanel", "value": true }
]
},
{
Expand All @@ -193,7 +195,8 @@
{
"id": "ismixedextruder",
"value": true
}
},
{ "id": "showextruderspanel", "value": true }
]
}
],
Expand All @@ -206,7 +209,8 @@
{
"id": "sd",
"value": true
}
},
{ "id": "showstatuspanel", "value": true }
],
"value": [
{
Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -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",
Expand Down
18 changes: 12 additions & 6 deletions src/targets/Printer3D/Marlin/preferences.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,8 @@
"id": "ismixedextruder",
"type": "boolean",
"label": "P49",
"value": false
"value": false,
"depend": [{ "id": "showextruderspanel", "value": true }]
},
{
"id": "enumber",
Expand All @@ -346,7 +347,8 @@
{
"id": "ismixedextruder",
"value": true
}
},
{ "id": "showextruderspanel", "value": true }
]
},
{
Expand All @@ -359,7 +361,8 @@
{
"id": "ismixedextruder",
"value": true
}
},
{ "id": "showextruderspanel", "value": true }
]
}
],
Expand Down Expand Up @@ -393,7 +396,8 @@
]
]

}
},
{ "id": "showstatuspanel", "value": true }
],
"value": [
{
Expand Down Expand Up @@ -431,7 +435,8 @@
{
"id": "tftsd",
"value": true
}
},
{ "id": "showstatuspanel", "value": true }
],
"value": [
{
Expand Down Expand Up @@ -463,7 +468,8 @@
"label": "P103",
"depend": [
{ "id": "tftfs", "notvalue": "none" },
{ "id": "tftusb", "value": true }
{ "id": "tftusb", "value": true },
{ "id": "showstatuspanel", "value": true }
],
"value": [
{
Expand Down
19 changes: 12 additions & 7 deletions src/targets/Printer3D/Repetier/preferences.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -211,7 +211,8 @@
"id": "ismixedextruder",
"type": "boolean",
"label": "P49",
"value": false
"value": false,
"depend": [{ "id": "showextruderspanel", "value": true }]
},
{
"id": "enumber",
Expand All @@ -230,7 +231,8 @@
{
"id": "ismixedextruder",
"value": true
}
},
{ "id": "showextruderspanel", "value": true }
]
},
{
Expand All @@ -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",
Expand All @@ -268,7 +270,8 @@
{
"id": "sd",
"value": true
}
},
{ "id": "showstatuspanel", "value": true }
],
"value": [
{
Expand Down Expand Up @@ -306,7 +309,8 @@
{
"id": "tftsd",
"value": true
}
},
{ "id": "showstatuspanel", "value": true }
],
"value": [
{
Expand Down Expand Up @@ -338,7 +342,8 @@
"label": "P103",
"depend": [
{ "id": "tftfs", "notvalue": "none" },
{ "id": "tftusb", "value": true }
{ "id": "tftusb", "value": true },
{ "id": "showstatuspanel", "value": true }
],
"value": [
{
Expand Down
12 changes: 7 additions & 5 deletions src/targets/Printer3D/Smoothieware/preferences.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand Down Expand Up @@ -361,7 +361,8 @@
{
"id": "tftsd",
"value": true
}
},
{ "id": "showstatuspanel", "value": true }
],
"value": [
{
Expand Down Expand Up @@ -393,7 +394,8 @@
"label": "P103",
"depend": [
{ "id": "tftfs", "notvalue": "none" },
{ "id": "tftusb", "value": true }
{ "id": "tftusb", "value": true },
{ "id": "showstatuspanel", "value": true }
],
"value": [
{
Expand Down
21 changes: 13 additions & 8 deletions src/targets/Printer3D/preferences.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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",
Expand All @@ -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",
Expand All @@ -891,7 +895,8 @@
"id": "showsensorctrls",
"type": "boolean",
"label": "P88",
"value": true
"value": true,
"depend": [{ "id": "showextracontrolspanel", "value": true }]
}
]
}
Expand Down

0 comments on commit c8debd7

Please sign in to comment.