add filamentSource. tweak speed tower css

This commit is contained in:
Stewart Allen 2021-11-09 20:46:10 -05:00
commit 9c6e218104
6 changed files with 14 additions and 4 deletions

View file

@ -282,6 +282,7 @@
bedRound: false,
bedBelt: false,
fwRetract: false,
filamentSource: "direct",
originCenter: false,
deviceZMax: 0,
maxHeight: 150,

View file

@ -1619,6 +1619,7 @@
spindleMax: UC.newInput(LANG.dv_spmx_s, {title:LANG.dv_spmx_l, convert:UC.toInt, size: 6, modes:CAM}),
deviceZMax: UC.newInput(LANG.dv_zmax_s, {title:LANG.dv_zmax_l, convert:UC.toInt, size: 6, modes:FDM}),
fdmSep: UC.newBlank({class:"pop-sep", modes:FDM}),
filamentSource: UC.newSelect(LANG.dv_fsrc_s, {title: LANG.dv_fsrc_l, action: lineTypeSave, modes:FDM}, "filasrc"),
fwRetract: UC.newBoolean(LANG.dv_retr_s, onBooleanClick, {title:LANG.dv_retr_l, modes:FDM}),
deviceOrigin: UC.newBoolean(LANG.dv_orgc_s, onBooleanClick, {title:LANG.dv_orgc_l, modes:FDM_LASER, show:() => !UI.deviceRound.checked}),
deviceRound: UC.newBoolean(LANG.dv_bedc_s, onBooleanClick, {title:LANG.dv_bedc_l, modes:FDM, trigger:true, show:isNotBelt}),

View file

@ -186,6 +186,10 @@
{ name: "flat" },
{ name: "line" }
],
filasrc: [
{ name: "direct" },
{ name: "palette3" }
],
animesh: [
{ name: "100" },
{ name: "200" },

View file

@ -1580,9 +1580,7 @@ th, tr, td, label {
top: 3px;
right: 0;
bottom: 3px;
border-radius: 5px;
border: 3px solid rgba(200,200,200,0.5);
background-color: #888;
background-color: transparent;
}
#speedbar label {
flex-grow: 1;
@ -1595,6 +1593,8 @@ th, tr, td, label {
font-size: 12px;
padding: 0 5px 0 5px;
color: #fff;
margin: 0.5px;
border-radius: 3px;
}
#settings {
@ -1625,6 +1625,7 @@ th, tr, td, label {
padding: 0 !important;
height: 1px;
margin-top: 2px;
margin-bottom: 2px;
background-color: #bbb;
}
.set-sep {

View file

@ -448,7 +448,7 @@
</div>
<div id="mid-rcol" class="f-col j-center noshow">
<div id="set-menu" class="f-col">
<div id="speeds"><div id="speedbar" class="f-col a-stretch j-center"></div></div>
<div id="speeds"><div id="speedbar" class="f-col a-stretch j-center" lkt="sb_info"></div></div>
<div id="set-top" class="set-group"></div>
<div id="settings" class="f-col"></div>
<div id="set-end" class="set-group"></div>

View file

@ -60,6 +60,7 @@ kiri.lang['en-us'] = {
rc_swap: "replace vertices",
rc_xobj: "export OBJ",
rc_xstl: "export STL",
sb_info: ["print speed","in mm/s"],
// DEVICE MENU and related dialogs
dm_sldt: "select a device type",
@ -116,6 +117,8 @@ kiri.lang['en-us'] = {
dv_bedc_l: "device bed is circular",
dv_belt_s: "belt bed",
dv_belt_l: "continuous printing bed",
dv_fsrc_s: "filament source",
dv_fsrc_l: ["how filament is fed\ninto the extruder"],
dv_retr_s: "firmware retract",
dv_retr_l: ["device fimware supports G10/G11"],
dv_fanp_s: "fan power",