Bladeren bron

Revert "Draw content in display loop only when needed"

This reverts commit bf04a92cc0.
AnHardt 10 jaren geleden
bovenliggende
commit
d521693641
1 gewijzigde bestanden met toevoegingen van 13 en 20 verwijderingen
  1. 13
    20
      Marlin/dogm_lcd_implementation.h

+ 13
- 20
Marlin/dogm_lcd_implementation.h Bestand weergeven

186
   return n;
186
   return n;
187
 }
187
 }
188
 
188
 
189
-int8_t show_splashscreen = 2;
189
+static int8_t show_splashscreed = 2;
190
 
190
 
191
 static void lcd_implementation_init()
191
 static void lcd_implementation_init()
192
 {
192
 {
221
 
221
 
222
 	u8g.firstPage();
222
 	u8g.firstPage();
223
 	do {
223
 	do {
224
-    switch (show_splashscreen) {
224
+    if (show_splashscreed) {
225
-      case 2 : {
225
+      u8g.drawBitmapP(offx, offy, START_BMPBYTEWIDTH, START_BMPHEIGHT, start_bmp);
226
-        u8g.drawBitmapP(offx, offy, START_BMPBYTEWIDTH, START_BMPHEIGHT, start_bmp);
226
+      lcd_setFont(FONT_MENU);
227
-        break;
227
+      #ifndef STRING_SPLASH_LINE2
228
-      }
228
+        u8g.drawStr(txt1X, u8g.getHeight() - DOG_CHAR_HEIGHT, STRING_SPLASH_LINE1);
229
-      case 1 : {
229
+      #else
230
-        lcd_setFont(FONT_MENU);
230
+        int txt2X = (u8g.getWidth() - (sizeof(STRING_SPLASH_LINE2) - 1)*DOG_CHAR_WIDTH) / 2;
231
-        #ifndef STRING_SPLASH_LINE2
231
+        u8g.drawStr(txt1X, u8g.getHeight() - DOG_CHAR_HEIGHT*3/2, STRING_SPLASH_LINE1);
232
-          u8g.drawStr(txt1X, u8g.getHeight() - DOG_CHAR_HEIGHT, STRING_SPLASH_LINE1);
232
+        u8g.drawStr(txt2X, u8g.getHeight() - DOG_CHAR_HEIGHT*1/2, STRING_SPLASH_LINE2);
233
-        #else
233
+      #endif
234
-          int txt2X = (u8g.getWidth() - (sizeof(STRING_SPLASH_LINE2) - 1)*DOG_CHAR_WIDTH) / 2;
234
+      show_splashscreed--;
235
-          u8g.drawStr(txt1X, u8g.getHeight() - DOG_CHAR_HEIGHT*3/2, STRING_SPLASH_LINE1);
235
+    }
236
-          u8g.drawStr(txt2X, u8g.getHeight() - DOG_CHAR_HEIGHT*1/2, STRING_SPLASH_LINE2);
237
-        #endif
238
-        break;
239
-      }
240
-      break;  
241
-    }  
242
-    if (show_splashscreen) show_splashscreen--;
243
 	} while (u8g.nextPage());
236
 	} while (u8g.nextPage());
244
 }
237
 }
245
 
238
 

Laden…
Annuleren
Opslaan