Quellcode durchsuchen

TFT: No timeout on Move Screen (#19426)

Victor Oliveira vor 3 Jahren
Ursprung
Commit
178a1da165
Es ist kein Account mit der E-Mail-Adresse des Committers verbunden
1 geänderte Dateien mit 2 neuen und 8 gelöschten Zeilen
  1. 2
    8
      Marlin/src/lcd/tft/ui_480x320.cpp

+ 2
- 8
Marlin/src/lcd/tft/ui_480x320.cpp Datei anzeigen

956
   uint16_t width = Images[imgBtn52Rounded].width;
956
   uint16_t width = Images[imgBtn52Rounded].width;
957
   uint16_t height = Images[imgBtn52Rounded].height;
957
   uint16_t height = Images[imgBtn52Rounded].height;
958
 
958
 
959
-  tft.queue.sync(); //need sync to change font
960
-
961
   if (!enabled) bgColor = COLOR_CONTROL_DISABLED;
959
   if (!enabled) bgColor = COLOR_CONTROL_DISABLED;
962
 
960
 
963
   tft.canvas(x, y, width, height);
961
   tft.canvas(x, y, width, height);
964
   tft.set_background(COLOR_BACKGROUND);
962
   tft.set_background(COLOR_BACKGROUND);
965
   tft.add_image(0, 0, imgBtn52Rounded, bgColor, COLOR_BACKGROUND, COLOR_DARKGREY);
963
   tft.add_image(0, 0, imgBtn52Rounded, bgColor, COLOR_BACKGROUND, COLOR_DARKGREY);
966
 
964
 
965
+  // TODO: Make an add_text() taking a font arg
967
   if (label != NULL) {
966
   if (label != NULL) {
968
-    tft.set_font(Helvetica12Bold);
969
-    tft_string.set_font(Helvetica12Bold);
970
     tft_string.set(label);
967
     tft_string.set(label);
971
     tft_string.trim();
968
     tft_string.trim();
972
     tft.add_text(tft_string.center(width), height / 2 - tft_string.font_height() / 2, bgColor, tft_string);
969
     tft.add_text(tft_string.center(width), height / 2 - tft_string.font_height() / 2, bgColor, tft_string);
973
-
974
-    tft.queue.sync();
975
-    tft_string.set_font(Helvetica18);
976
-    tft.set_font(Helvetica18);
977
   }
970
   }
978
   else {
971
   else {
979
     tft.add_image(0, 0, img, bgColor, COLOR_BACKGROUND, COLOR_DARKGREY);
972
     tft.add_image(0, 0, img, bgColor, COLOR_BACKGROUND, COLOR_DARKGREY);
984
 
977
 
985
 void MarlinUI::move_axis_screen() {
978
 void MarlinUI::move_axis_screen() {
986
   // Reset
979
   // Reset
980
+  defer_status_screen(true);
987
   motionAxisState.blocked = false;
981
   motionAxisState.blocked = false;
988
   touch.enable();
982
   touch.enable();
989
 
983
 

Laden…
Abbrechen
Speichern