diff --git a/bed.img b/bed.img index 952aaf7..978bcd2 100644 Binary files a/bed.img and b/bed.img differ diff --git a/bedlevel b/bedlevel index 2837247..bcd4fc7 100644 --- a/bedlevel +++ b/bedlevel @@ -4,5 +4,5 @@ button R35 C75 T"2" A"M98 P#0" L"0:/macros/Bed/Point-B" button R2 C75 T"3" A"M98 P#0" L"0:/macros/Bed/Point-C" button R2 C40 T"4" A"M98 P#0" L"0:/macros/Bed/Point-D" button R20 C57 T"*" A"M98 P#0" L"0:/macros/Bed/Center" -image R49 C0 L"hline.img" +image R50 C0 L"hline.img" button R51 C5 F0 T"<" A"return" \ No newline at end of file diff --git a/blower.img b/blower.img new file mode 100644 index 0000000..52cae39 Binary files /dev/null and b/blower.img differ diff --git a/fan.img b/fan.img deleted file mode 100644 index 2accc58..0000000 Binary files a/fan.img and /dev/null differ diff --git a/heat b/heat index a9c89fd..52d2826 100644 --- a/heat +++ b/heat @@ -1,30 +1,30 @@ -image R2 C2 L"nozzle.img" -value N079 F1 R0 C15 W25 H0 -alter N179 F0 R13 C14 W25 H0 +image R3 C0 L"nozzle.img" +value N079 F1 R0 C17 W19 H0 +alter N179 F0 R12 C16 W19 H0 -image R2 C47 L"bed.img" -value N080 F1 R0 C60 W25 H0 -alter N180 F0 R13 C59 W25 H0 +image R3 C45 L"bed.img" +value N080 F1 R0 C64 W19 H0 +alter N180 F0 R12 C63 W19 H0 -image R2 C94 L"fan.img" -alter N300 F0 R3 C107 H0 W26 +image R3 C90 L"blower.img" +alter N300 F0 R5 C108 H0 W26 image R25 C0 L"hline.img" -image R27 C4 L"bed.img" -button C19 T"Off" A"M140 S0" -button C45 T"50" A"M140 S50" -button C68 T"80" A"M140 S80" -button C87 T"90" A"M140 S90" -button C108 T"110" V3 A"M140 S110" +text R27 C0 T"Bed" +button " Off" A"M140 S0" +button " 50" A"M140 S50" +button " 80" A"M140 S80" +button " 90" A"M140 S90" +button " 110" A"M140 S110" -image R37 C4 L"nozzle.img" -button C19 T"Off" A"M104 S0" -button C41 T"180" A"M104 S180" -button C62 T"200" A"M104 S200" -button C83 T"210" A"M104 S210" -button C104 T"235" A"M104 S235" +text R37 C0 T"Head" +button " Off" A"M104 S0" +button " 180" A"M104 S180" +button " 200" A"M104 S200" +button " 210" A"M104 S210" +button " 235" A"M104 S235" -image R49 C0 L"hline.img" +image R50 C0 L"hline.img" button R51 C0 F0 T"<" A"return" button T" Cool Down " A"M98 P#0" L"/menu/cooldown" \ No newline at end of file diff --git a/listFiles b/listFiles index 6bef202..992e928 100644 --- a/listFiles +++ b/listFiles @@ -1,3 +1,3 @@ files R0 F0 N4 I"/gcodes" A"M32 #0|return" -image R49 C0 L"hline.img" +image R50 C0 L"hline.img" button R51 C0 F0 T"<" A"return" \ No newline at end of file diff --git a/main b/main index 9f89934..cb05712 100644 --- a/main +++ b/main @@ -1,5 +1,4 @@ -; "Not printing" Menu -image R49 C0 L"hline.img" +;"Not printing" Menu button R51 C0 F0 V5 T" Heat " A"menu heat" button V5 T" Move " A"menu move" button V5 " Admin " A"menu admin" @@ -15,24 +14,25 @@ button R51 C0 F0 V6 T" Resume " A"M24" button V6 T" Abort " A"M0 H1" ; Main -image R2 C2 L"nozzle.img" -value N079 F1 R0 C15 W25 H0 -alter N179 F0 R13 C14 W25 H0 +image R3 C0 L"nozzle.img" +value N079 F1 R0 C17 W19 H0 +alter N179 F0 R12 C16 W19 H0 -image R2 C47 L"bed.img" -value N080 F1 R0 C60 W25 H0 -alter N180 F0 R13 C59 W25 H0 +image R3 C45 L"bed.img" +value N080 F1 R0 C64 W19 H0 +alter N180 F0 R12 C63 W19 H0 -image R1 C94 L"mms.img" V2 -value N539 F1 R0 C107 W25 H0 V2 ; speed actual -value N538 F0 R13 C107 W25 H0 V2 ; speed requested +image R3 C90 L"mms.img" ;V2 +value N539 F1 R0 C108 W19; V2 ; speed actual +value N538 F0 R12 C108 W19; V2 ; speed requested -image R25 C0 L"hline.img" +image R23 C0 L"hline.img" -image R27 C2 L"fan.img" -alter N300 F0 R27 C14 H0 W26 +image R24 C0 L"blower.img" +alter N300 F0 R26 C16 H0 W26 -value N535 F0 R27 C49 W25 H2 V2 ; % done -value N537 F0 R27 C89 W39 H2 V2 ; time left +value N535 F0 C49 W25 H2 ;V2 ; % done +value N537 F0 C89 W39 H2 ;V2 ; time left -value N501 F0 R37 C2 V2 \ No newline at end of file +value N501 F0 R39 C0 W128 H1 ; V2 ; M117 messages +image R50 C0 L"hline.img" \ No newline at end of file diff --git a/mms.img b/mms.img index 6874cfb..8185986 100644 Binary files a/mms.img and b/mms.img differ diff --git a/move b/move index edd0a20..63b44f4 100644 --- a/move +++ b/move @@ -31,6 +31,6 @@ button C69 T"+1 " A"G91 G1 Z1 F6000" button C87 T"+5 " A"G91 G1 Z5 F6000" button C108 T"+25 " A"G91 G1 Z25 F6000" -image R49 C0 L"hline.img" +image R50 C0 L"hline.img" button R51 C0 F0 T"<" A"return" button T" Home All " A"M98 P/sys/homeall.g" \ No newline at end of file diff --git a/nozzle.img b/nozzle.img index 100d438..0c23641 100644 Binary files a/nozzle.img and b/nozzle.img differ diff --git a/speed.img b/speed.img deleted file mode 100644 index 52c5aad..0000000 --- a/speed.img +++ /dev/null @@ -1 +0,0 @@ -`€l*î \ No newline at end of file diff --git a/tune b/tune index 19a92b7..b57d95c 100644 --- a/tune +++ b/tune @@ -8,4 +8,4 @@ text "Speed: " R30 C0 alter N500 button R51 C0 F0 T"<" A"return" -image R49 C0 L"hline.img" \ No newline at end of file +image R50 C0 L"hline.img" \ No newline at end of file