|
@@ -215,11 +215,11 @@ void HMI_SetAndSaveLanguageChinese(void) {
|
215
|
215
|
|
216
|
216
|
void show_plus_or_minus(uint8_t size, uint16_t bColor, uint8_t iNum, uint8_t fNum, uint16_t x, uint16_t y, long value) {
|
217
|
217
|
if (value < 0) {
|
218
|
|
- DWIN_Draw_String(false, true, size, White, bColor, x - 6, y, (char*)"-");
|
|
218
|
+ DWIN_Draw_String(false, true, size, White, bColor, x - 6, y, F("-"));
|
219
|
219
|
DWIN_Draw_FloatValue(true, true, 0, size, White, bColor, iNum, fNum, x, y, -value);
|
220
|
220
|
}
|
221
|
221
|
else {
|
222
|
|
- DWIN_Draw_String(false, true, size, White, bColor, x - 6, y, (char*)" ");
|
|
222
|
+ DWIN_Draw_String(false, true, size, White, bColor, x - 6, y, F(" "));
|
223
|
223
|
DWIN_Draw_FloatValue(true, true, 0, size, White, bColor, iNum, fNum, x, y, value);
|
224
|
224
|
}
|
225
|
225
|
}
|
|
@@ -557,11 +557,11 @@ inline void Prepare_Item_Cool(const uint8_t row) {
|
557
|
557
|
inline void Prepare_Item_Lang(const uint8_t row) {
|
558
|
558
|
if (HMI_flag.language_chinese) {
|
559
|
559
|
DWIN_Frame_AreaCopy(1, 239, 134, 271 - 5, 479 - 333, LBLX, MBASE(row));
|
560
|
|
- DWIN_Draw_String(false, false, font8x16, White, Background_black, 226, MBASE(row), (char*)"CN");
|
|
560
|
+ DWIN_Draw_String(false, false, font8x16, White, Background_black, 226, MBASE(row), F("CN"));
|
561
|
561
|
}
|
562
|
562
|
else {
|
563
|
563
|
DWIN_Frame_AreaCopy(1, 0, 194, 271 - 150, 479 - 272, LBLX, MBASE(row)); // "Language selection"
|
564
|
|
- DWIN_Draw_String(false, false, font8x16, White, Background_black, 226, MBASE(row), (char*)"EN");
|
|
564
|
+ DWIN_Draw_String(false, false, font8x16, White, Background_black, 226, MBASE(row), F("EN"));
|
565
|
565
|
}
|
566
|
566
|
Draw_Menu_Icon(row, ICON_Language);
|
567
|
567
|
}
|
|
@@ -622,13 +622,13 @@ inline void Draw_Control_Menu() {
|
622
|
622
|
else {
|
623
|
623
|
#ifdef USE_STRING_HEADINGS
|
624
|
624
|
Draw_Title(GET_TEXT_F(MSG_CONTROL));
|
625
|
|
- DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 0), (char*)GET_TEXT_F(MSG_TEMPERATURE));
|
626
|
|
- DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 1), (char*)GET_TEXT_F(MSG_MOTION));
|
627
|
|
- DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 2), (char*)GET_TEXT_F(MSG_STORE_EEPROM));
|
628
|
|
- DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 3), (char*)GET_TEXT_F(MSG_LOAD_EEPROM));
|
629
|
|
- DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 4), (char*)GET_TEXT_F(MSG_RESTORE_DEFAULTS));
|
|
625
|
+ DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 0), GET_TEXT_F(MSG_TEMPERATURE));
|
|
626
|
+ DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 1), GET_TEXT_F(MSG_MOTION));
|
|
627
|
+ DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 2), GET_TEXT_F(MSG_STORE_EEPROM));
|
|
628
|
+ DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 3), GET_TEXT_F(MSG_LOAD_EEPROM));
|
|
629
|
+ DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 4), GET_TEXT_F(MSG_RESTORE_DEFAULTS));
|
630
|
630
|
if (CVISI(6))
|
631
|
|
- DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 5), (char*)"Info");
|
|
631
|
+ DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 5), F("Info"));
|
632
|
632
|
#else
|
633
|
633
|
DWIN_Frame_AreaCopy(1, 128, 2, 271 - 95, 479 - 467, 14, 8);
|
634
|
634
|
DWIN_Frame_AreaCopy(1, 1, 89, 271 - 188, 479 - 377 - 1, LBLX, CLINE(1));// Temperature >
|
|
@@ -669,11 +669,11 @@ inline void Draw_Tune_Menu() {
|
669
|
669
|
else {
|
670
|
670
|
#ifdef USE_STRING_HEADINGS
|
671
|
671
|
Draw_Title(GET_TEXT_F(MSG_TUNE));
|
672
|
|
- DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 0), (char*)GET_TEXT_F(MSG_SPEED));
|
673
|
|
- DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 1), (char*)GET_TEXT_F(MSG_UBL_SET_TEMP_HOTEND));
|
674
|
|
- DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 2), (char*)GET_TEXT_F(MSG_UBL_SET_TEMP_BED));
|
675
|
|
- DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 3), (char*)GET_TEXT_F(MSG_FAN_SPEED));
|
676
|
|
- DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 4), (char*)GET_TEXT_F(MSG_ZPROBE_ZOFFSET));
|
|
672
|
+ DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 0), GET_TEXT_F(MSG_SPEED));
|
|
673
|
+ DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 1), GET_TEXT_F(MSG_UBL_SET_TEMP_HOTEND));
|
|
674
|
+ DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 2), GET_TEXT_F(MSG_UBL_SET_TEMP_BED));
|
|
675
|
+ DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 3), GET_TEXT_F(MSG_FAN_SPEED));
|
|
676
|
+ DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 4), GET_TEXT_F(MSG_ZPROBE_ZOFFSET));
|
677
|
677
|
#else
|
678
|
678
|
DWIN_Frame_AreaCopy(1, 94, 2, 271 - 145, 479 - 467, 14, 9);
|
679
|
679
|
DWIN_Frame_AreaCopy(1, 1, 179, 271 - 179, 479 - 287 - 2, LBLX, MBASE(1)); // print speed
|
|
@@ -748,10 +748,10 @@ inline void Draw_Motion_Menu() {
|
748
|
748
|
else {
|
749
|
749
|
#ifdef USE_STRING_HEADINGS
|
750
|
750
|
Draw_Title(GET_TEXT_F(MSG_MOTION));
|
751
|
|
- DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 0), (char*)"Feedrate");
|
752
|
|
- DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 1), (char*)GET_TEXT_F(MSG_ACCELERATION));
|
753
|
|
- DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 2), (char*)GET_TEXT_F(MSG_JERK));
|
754
|
|
- DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 3), (char*)GET_TEXT_F(MSG_STEPS_PER_MM));
|
|
751
|
+ DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 0), F("Feedrate"));
|
|
752
|
+ DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 1), GET_TEXT_F(MSG_ACCELERATION));
|
|
753
|
+ DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 2), GET_TEXT_F(MSG_JERK));
|
|
754
|
+ DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 3), GET_TEXT_F(MSG_STEPS_PER_MM));
|
755
|
755
|
#else
|
756
|
756
|
DWIN_Frame_AreaCopy(1, 144, 16, 271 - 82, 479 - 453, 14, 8);
|
757
|
757
|
draw_max_en(MBASE(1)); draw_speed_en(24 + 3, MBASE(1)); // "Max Speed"
|
|
@@ -787,8 +787,8 @@ void Popup_Window_Temperature(const bool toohigh) {
|
787
|
787
|
DWIN_Frame_AreaCopy(1, 189, 389, 271 - 0, 402, 95, 310);
|
788
|
788
|
}
|
789
|
789
|
else {
|
790
|
|
- DWIN_Draw_String(false, true, font8x16, Font_window, Background_window, 36, 300, (char*)"Nozzle or Bed temperature");
|
791
|
|
- DWIN_Draw_String(false, true, font8x16, Font_window, Background_window, 92, 300, (char*)"is too high");
|
|
790
|
+ DWIN_Draw_String(false, true, font8x16, Font_window, Background_window, 36, 300, F("Nozzle or Bed temperature"));
|
|
791
|
+ DWIN_Draw_String(false, true, font8x16, Font_window, Background_window, 92, 300, F("is too high"));
|
792
|
792
|
}
|
793
|
793
|
}
|
794
|
794
|
else {
|
|
@@ -798,8 +798,8 @@ void Popup_Window_Temperature(const bool toohigh) {
|
798
|
798
|
DWIN_Frame_AreaCopy(1, 189, 389, 271 - 0, 402, 95, 310);
|
799
|
799
|
}
|
800
|
800
|
else {
|
801
|
|
- DWIN_Draw_String(false, true, font8x16, Font_window, Background_window, 36, 300, (char*)"Nozzle or Bed temperature");
|
802
|
|
- DWIN_Draw_String(false, true, font8x16, Font_window, Background_window, 92, 300, (char*)"is too low");
|
|
801
|
+ DWIN_Draw_String(false, true, font8x16, Font_window, Background_window, 36, 300, F("Nozzle or Bed temperature"));
|
|
802
|
+ DWIN_Draw_String(false, true, font8x16, Font_window, Background_window, 92, 300, F("is too low"));
|
803
|
803
|
}
|
804
|
804
|
}
|
805
|
805
|
}
|
|
@@ -820,7 +820,7 @@ inline void Draw_Popup_Bkgd_60() {
|
820
|
820
|
DWIN_ICON_Show(ICON, ICON_Confirm_C, 86, 280);
|
821
|
821
|
}
|
822
|
822
|
else {
|
823
|
|
- DWIN_Draw_String(false, true, font8x16, Font_window, Background_window, 20, 235, (char*)"Nozzle is too cold");
|
|
823
|
+ DWIN_Draw_String(false, true, font8x16, Font_window, Background_window, 20, 235, F("Nozzle is too cold"));
|
824
|
824
|
DWIN_ICON_Show(ICON, ICON_Confirm_E, 86, 280);
|
825
|
825
|
}
|
826
|
826
|
}
|
|
@@ -837,9 +837,9 @@ void Popup_Window_Resume(void) {
|
837
|
837
|
DWIN_ICON_Show(ICON, ICON_Cancel_C, 146, 307);
|
838
|
838
|
}
|
839
|
839
|
else {
|
840
|
|
- DWIN_Draw_String(false, true, font8x16, Font_window, Background_window, 120, 115, (char*)"Tips");
|
841
|
|
- DWIN_Draw_String(false, true, font8x16, Font_window, Background_window, 24, 192, (char*)"I see the file stopped");
|
842
|
|
- DWIN_Draw_String(false, true, font8x16, Font_window, Background_window, 68, 212, (char*)"unexpectedly last time");
|
|
840
|
+ DWIN_Draw_String(false, true, font8x16, Font_window, Background_window, 120, 115, F("Tips"));
|
|
841
|
+ DWIN_Draw_String(false, true, font8x16, Font_window, Background_window, 24, 192, F("I see the file stopped"));
|
|
842
|
+ DWIN_Draw_String(false, true, font8x16, Font_window, Background_window, 68, 212, F("unexpectedly last time"));
|
843
|
843
|
DWIN_ICON_Show(ICON, ICON_Continue_E, 26, 307);
|
844
|
844
|
DWIN_ICON_Show(ICON, ICON_Cancel_E, 146, 307);
|
845
|
845
|
}
|
|
@@ -855,8 +855,8 @@ void Popup_Window_Home(void) {
|
855
|
855
|
DWIN_Frame_AreaCopy(1, 0, 389, 150, 402, 61, 280);
|
856
|
856
|
}
|
857
|
857
|
else {
|
858
|
|
- DWIN_Draw_String(false, true, font8x16, Font_window, Background_window, 80, 230, (char*)GET_TEXT_F(MSG_LEVEL_BED_HOMING));
|
859
|
|
- DWIN_Draw_String(false, true, font8x16, Font_window, Background_window, 24, 260, (char*)"Please wait until completed");
|
|
858
|
+ DWIN_Draw_String(false, true, font8x16, Font_window, Background_window, 80, 230, GET_TEXT_F(MSG_LEVEL_BED_HOMING));
|
|
859
|
+ DWIN_Draw_String(false, true, font8x16, Font_window, Background_window, 24, 260, F("Please wait until completed"));
|
860
|
860
|
}
|
861
|
861
|
}
|
862
|
862
|
|
|
@@ -869,8 +869,8 @@ void Popup_Window_Leveling(void) {
|
869
|
869
|
DWIN_Frame_AreaCopy(1, 0, 389, 150, 402, 61, 280);
|
870
|
870
|
}
|
871
|
871
|
else {
|
872
|
|
- DWIN_Draw_String(false, true, font8x16, Font_window, Background_window, 76, 230, (char*)GET_TEXT_F(MSG_BED_LEVELING));
|
873
|
|
- DWIN_Draw_String(false, true, font8x16, Font_window, Background_window, 24, 260, (char*)"Please wait until completed");
|
|
872
|
+ DWIN_Draw_String(false, true, font8x16, Font_window, Background_window, 76, 230, GET_TEXT_F(MSG_BED_LEVELING));
|
|
873
|
+ DWIN_Draw_String(false, true, font8x16, Font_window, Background_window, 24, 260, F("Please wait until completed"));
|
874
|
874
|
}
|
875
|
875
|
}
|
876
|
876
|
|
|
@@ -895,8 +895,8 @@ void Popup_window_PauseOrStop(void) {
|
895
|
895
|
DWIN_ICON_Show(ICON, ICON_Cancel_C, 146, 280);
|
896
|
896
|
}
|
897
|
897
|
else {
|
898
|
|
- if (select_print.now == 1) DWIN_Draw_String(false, true, font8x16, Font_window, Background_window, 88, 150, (char*)GET_TEXT_F(MSG_PAUSE_PRINT));
|
899
|
|
- else if (select_print.now == 2) DWIN_Draw_String(false, true, font8x16, Font_window, Background_window, 92, 150, (char*)GET_TEXT_F(MSG_STOP_PRINT));
|
|
898
|
+ if (select_print.now == 1) DWIN_Draw_String(false, true, font8x16, Font_window, Background_window, 88, 150, GET_TEXT_F(MSG_PAUSE_PRINT));
|
|
899
|
+ else if (select_print.now == 2) DWIN_Draw_String(false, true, font8x16, Font_window, Background_window, 92, 150, GET_TEXT_F(MSG_STOP_PRINT));
|
900
|
900
|
DWIN_ICON_Show(ICON, ICON_Confirm_E, 26, 280);
|
901
|
901
|
DWIN_ICON_Show(ICON, ICON_Cancel_E, 146, 280);
|
902
|
902
|
}
|
|
@@ -920,19 +920,19 @@ void Draw_Print_ProgressBar() {
|
920
|
920
|
DWIN_ICON_Show(ICON, ICON_Bar, 15, 93);
|
921
|
921
|
DWIN_Draw_Rectangle(1, BarFill_Color, 16 + Percentrecord * 240 / 100, 93, 256, 113);
|
922
|
922
|
DWIN_Draw_IntValue(true, true, 0, font8x16, Percent_Color, Background_black, 2, 117, 133, Percentrecord);
|
923
|
|
- DWIN_Draw_String(false, false, font8x16, Percent_Color, Background_black, 117 + 16, 133, (char*)"%");
|
|
923
|
+ DWIN_Draw_String(false, false, font8x16, Percent_Color, Background_black, 117 + 16, 133, F("%"));
|
924
|
924
|
}
|
925
|
925
|
|
926
|
926
|
void Draw_Print_ProgressElapsed() {
|
927
|
927
|
duration_t elapsed = print_job_timer.duration(); // print timer
|
928
|
928
|
DWIN_Draw_IntValue(true, true, 1, font8x16, White, Background_black, 2, 42, 212, elapsed.value / 3600);
|
929
|
|
- DWIN_Draw_String(false, false, font8x16, White, Background_black, 42 + 16, 212, (char*)":");
|
|
929
|
+ DWIN_Draw_String(false, false, font8x16, White, Background_black, 42 + 16, 212, F(":"));
|
930
|
930
|
DWIN_Draw_IntValue(true, true, 1, font8x16, White, Background_black, 2, 42 + 24, 212, (elapsed.value % 3600) / 60);
|
931
|
931
|
}
|
932
|
932
|
|
933
|
933
|
void Draw_Print_ProgressRemain() {
|
934
|
934
|
DWIN_Draw_IntValue(true, true, 1, font8x16, White, Background_black, 2, 176, 212, remain_time / 3600);
|
935
|
|
- DWIN_Draw_String(false, false, font8x16, White, Background_black, 176 + 16, 212, (char*)":");
|
|
935
|
+ DWIN_Draw_String(false, false, font8x16, White, Background_black, 176 + 16, 212, F(":"));
|
936
|
936
|
DWIN_Draw_IntValue(true, true, 1, font8x16, White, Background_black, 2, 176 + 24, 212, (remain_time % 3600) / 60);
|
937
|
937
|
}
|
938
|
938
|
|
|
@@ -1595,7 +1595,7 @@ inline void Draw_SDItem(const uint16_t item, int16_t row=-1) {
|
1595
|
1595
|
if (row < 0) row = item + 1 + MROWS - index_file;
|
1596
|
1596
|
const bool is_subdir = !card.flag.workDirIsRoot;
|
1597
|
1597
|
if (is_subdir && item == 0) {
|
1598
|
|
- Draw_Menu_Line(row, ICON_Folder, (char*)"..");
|
|
1598
|
+ Draw_Menu_Line(row, ICON_Folder, "..");
|
1599
|
1599
|
return;
|
1600
|
1600
|
}
|
1601
|
1601
|
|
|
@@ -1712,11 +1712,11 @@ void HMI_StartFrame(const bool with_update) {
|
1712
|
1712
|
DWIN_Draw_IntValue(true, true, 0, STAT_FONT, White, Background_black, 3, 178 + 4 * STAT_CHR_W + 6, 382, thermalManager.temp_bed.target);
|
1713
|
1713
|
|
1714
|
1714
|
DWIN_Draw_IntValue(true, true, 0, STAT_FONT, White, Background_black, 3, 33 + 2 * STAT_CHR_W, 429, feedrate_percentage);
|
1715
|
|
- DWIN_Draw_String(false, false, STAT_FONT, White, Background_black, 33 + (2 + 3) * STAT_CHR_W + 2, 429, (char*)"%");
|
|
1715
|
+ DWIN_Draw_String(false, false, STAT_FONT, White, Background_black, 33 + (2 + 3) * STAT_CHR_W + 2, 429, F("%"));
|
1716
|
1716
|
|
1717
|
1717
|
show_plus_or_minus(STAT_FONT, Background_black, 2, 2, 178, 429, BABY_Z_VAR * 100);
|
1718
|
|
- DWIN_Draw_String(false, false, STAT_FONT, White, Background_black, 33 + 3 * STAT_CHR_W + 5, 383, (char*)"/");
|
1719
|
|
- DWIN_Draw_String(false, false, STAT_FONT, White, Background_black, 178 + 3 * STAT_CHR_W + 5, 383, (char*)"/");
|
|
1718
|
+ DWIN_Draw_String(false, false, STAT_FONT, White, Background_black, 33 + 3 * STAT_CHR_W + 5, 383, F("/"));
|
|
1719
|
+ DWIN_Draw_String(false, false, STAT_FONT, White, Background_black, 178 + 3 * STAT_CHR_W + 5, 383, F("/"));
|
1720
|
1720
|
|
1721
|
1721
|
if (with_update) {
|
1722
|
1722
|
DWIN_UpdateLCD();
|
|
@@ -2287,11 +2287,11 @@ void Draw_Temperature_Menu() {
|
2287
|
2287
|
else {
|
2288
|
2288
|
#ifdef USE_STRING_HEADINGS
|
2289
|
2289
|
Draw_Title(GET_TEXT_F(MSG_TEMPERATURE));
|
2290
|
|
- DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 0), (char*)GET_TEXT_F(MSG_UBL_SET_TEMP_HOTEND));
|
2291
|
|
- DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 1), (char*)GET_TEXT_F(MSG_UBL_SET_TEMP_BED));
|
2292
|
|
- DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 2), (char*)GET_TEXT_F(MSG_FAN_SPEED));
|
2293
|
|
- DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 3), (char*)"PLA Preheat Settings");
|
2294
|
|
- DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 4), (char*)"ABS Preheat Settings");
|
|
2290
|
+ DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 0), GET_TEXT_F(MSG_UBL_SET_TEMP_HOTEND));
|
|
2291
|
+ DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 1), GET_TEXT_F(MSG_UBL_SET_TEMP_BED));
|
|
2292
|
+ DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 2), GET_TEXT_F(MSG_FAN_SPEED));
|
|
2293
|
+ DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 3), F("PLA Preheat Settings"));
|
|
2294
|
+ DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 4), F("ABS Preheat Settings"));
|
2295
|
2295
|
#else
|
2296
|
2296
|
DWIN_Frame_AreaCopy(1, 56, 16, 271 - 130, 479 - 450 - 1, 14, 8);
|
2297
|
2297
|
DWIN_Frame_AreaCopy(1, 197, 104, 271 - 33, 479 - 365, LBLX, MBASE(1)); // Nozzle...
|
|
@@ -2561,10 +2561,10 @@ void HMI_Temperature(void) {
|
2561
|
2561
|
else {
|
2562
|
2562
|
#ifdef USE_STRING_HEADINGS
|
2563
|
2563
|
Draw_Title("PLA Settings"); // TODO: GET_TEXT_F
|
2564
|
|
- DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 0), (char*)"Nozzle Temp");
|
2565
|
|
- DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 1), (char*)"Bed Temp");
|
2566
|
|
- DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 2), (char*)GET_TEXT_F(MSG_FAN_SPEED));
|
2567
|
|
- DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 3), (char*)GET_TEXT_F(MSG_STORE_EEPROM));
|
|
2564
|
+ DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 0), F("Nozzle Temp"));
|
|
2565
|
+ DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 1), F("Bed Temp"));
|
|
2566
|
+ DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 2), GET_TEXT_F(MSG_FAN_SPEED));
|
|
2567
|
+ DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 3), GET_TEXT_F(MSG_STORE_EEPROM));
|
2568
|
2568
|
#else
|
2569
|
2569
|
DWIN_Frame_AreaCopy(1, 56, 16, 271 - 130, 479 - 450 - 1, 14, 8);
|
2570
|
2570
|
DWIN_Frame_AreaCopy(1, 157, 76, 181, 479 - 393, LBLX, MBASE(1));
|
|
@@ -2614,10 +2614,10 @@ void HMI_Temperature(void) {
|
2614
|
2614
|
else {
|
2615
|
2615
|
#ifdef USE_STRING_HEADINGS
|
2616
|
2616
|
Draw_Title("ABS Settings"); // TODO: GET_TEXT_F
|
2617
|
|
- DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 0), (char*)"Nozzle Temp");
|
2618
|
|
- DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 1), (char*)"Bed Temp");
|
2619
|
|
- DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 2), (char*)GET_TEXT_F(MSG_FAN_SPEED));
|
2620
|
|
- DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 3), (char*)GET_TEXT_F(MSG_STORE_EEPROM));
|
|
2617
|
+ DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 0), F("Nozzle Temp"));
|
|
2618
|
+ DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 1), F("Bed Temp"));
|
|
2619
|
+ DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 2), GET_TEXT_F(MSG_FAN_SPEED));
|
|
2620
|
+ DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 3), GET_TEXT_F(MSG_STORE_EEPROM));
|
2621
|
2621
|
#else
|
2622
|
2622
|
DWIN_Frame_AreaCopy(1, 56, 16, 271 - 130, 479 - 450 - 1, 14, 8);
|
2623
|
2623
|
DWIN_Frame_AreaCopy(1, 172, 76, 198, 479 - 393, LBLX, MBASE(1));
|
|
@@ -2673,10 +2673,10 @@ inline void Draw_Max_Speed_Menu() {
|
2673
|
2673
|
else {
|
2674
|
2674
|
#ifdef USE_STRING_HEADINGS
|
2675
|
2675
|
Draw_Title("Max Speed (mm/s)"); // TODO: GET_TEXT_F
|
2676
|
|
- DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 0), (char*)"Max Feedrate X");
|
2677
|
|
- DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 1), (char*)"Max Feedrate Y");
|
2678
|
|
- DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 2), (char*)"Max Feedrate Z");
|
2679
|
|
- DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 3), (char*)"Max Feedrate E");
|
|
2676
|
+ DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 0), F("Max Feedrate X"));
|
|
2677
|
+ DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 1), F("Max Feedrate Y"));
|
|
2678
|
+ DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 2), F("Max Feedrate Z"));
|
|
2679
|
+ DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 3), F("Max Feedrate E"));
|
2680
|
2680
|
#else
|
2681
|
2681
|
DWIN_Frame_AreaCopy(1, 144, 16, 271 - 82, 479 - 453, 14, 8);
|
2682
|
2682
|
|
|
@@ -2728,10 +2728,10 @@ inline void Draw_Max_Accel_Menu() {
|
2728
|
2728
|
else {
|
2729
|
2729
|
#ifdef USE_STRING_HEADINGS
|
2730
|
2730
|
Draw_Title(GET_TEXT_F(MSG_ACCELERATION));
|
2731
|
|
- DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 0), (char*)"Max Accel X");
|
2732
|
|
- DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 1), (char*)"Max Accel Y");
|
2733
|
|
- DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 2), (char*)"Max Accel Z");
|
2734
|
|
- DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 3), (char*)"Max Accel E");
|
|
2731
|
+ DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 0), F("Max Accel X"));
|
|
2732
|
+ DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 1), F("Max Accel Y"));
|
|
2733
|
+ DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 2), F("Max Accel Z"));
|
|
2734
|
+ DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 3), F("Max Accel E"));
|
2735
|
2735
|
#else
|
2736
|
2736
|
DWIN_Frame_AreaCopy(1, 144, 16, 271 - 82, 479 - 453, 14, 8);
|
2737
|
2737
|
draw_max_accel_en(MBASE(1)); say_x(24 + 78 + 6, MBASE(1)); // "Max Acceleration X"
|
|
@@ -2776,10 +2776,10 @@ inline void Draw_Max_Jerk_Menu() {
|
2776
|
2776
|
else {
|
2777
|
2777
|
#ifdef USE_STRING_HEADINGS
|
2778
|
2778
|
Draw_Title(GET_TEXT_F(MSG_JERK));
|
2779
|
|
- DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 0), (char*)"Max Jerk X");
|
2780
|
|
- DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 1), (char*)"Max Jerk Y");
|
2781
|
|
- DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 2), (char*)"Max Jerk Z");
|
2782
|
|
- DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 3), (char*)"Max Jerk E");
|
|
2779
|
+ DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 0), F("Max Jerk X"));
|
|
2780
|
+ DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 1), F("Max Jerk Y"));
|
|
2781
|
+ DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 2), F("Max Jerk Z"));
|
|
2782
|
+ DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 3), F("Max Jerk E"));
|
2783
|
2783
|
#else
|
2784
|
2784
|
DWIN_Frame_AreaCopy(1, 144, 16, 271 - 82, 479 - 453, 14, 8);
|
2785
|
2785
|
draw_max_en(MBASE(1)); // "Max"
|
|
@@ -2831,10 +2831,10 @@ inline void Draw_Steps_Menu() {
|
2831
|
2831
|
else {
|
2832
|
2832
|
#ifdef USE_STRING_HEADINGS
|
2833
|
2833
|
Draw_Title(GET_TEXT_F(MSG_STEPS_PER_MM));
|
2834
|
|
- DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 0), (char*)"Steps/mm X");
|
2835
|
|
- DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 1), (char*)"Steps/mm Y");
|
2836
|
|
- DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 2), (char*)"Steps/mm Z");
|
2837
|
|
- DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 3), (char*)"Steps/mm E");
|
|
2834
|
+ DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 0), F("Steps/mm X"));
|
|
2835
|
+ DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 1), F("Steps/mm Y"));
|
|
2836
|
+ DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 2), F("Steps/mm Z"));
|
|
2837
|
+ DWIN_Draw_String(false, true, font8x16, White, Background_black, 60, 102 + (MLINE * 3), F("Steps/mm E"));
|
2838
|
2838
|
#else
|
2839
|
2839
|
DWIN_Frame_AreaCopy(1, 144, 16, 271 - 82, 479 - 453, 14, 8);
|
2840
|
2840
|
draw_steps_per_mm(MBASE(1)); say_x(100 + 3, MBASE(1)); // "Steps-per-mm X"
|