Browse Source

Remove DOGM bottom horizontal line/separator (#18273)

Tanguy Pruvot 5 years ago
parent
commit
7db3391524
No account linked to committer's email address
1 changed files with 2 additions and 13 deletions
  1. 2
    13
      Marlin/src/lcd/dogm/u8g_dev_tft_320x240_upscale_from_128x64.cpp

+ 2
- 13
Marlin/src/lcd/dogm/u8g_dev_tft_320x240_upscale_from_128x64.cpp View File

552
   void drawImage(const uint8_t *data, u8g_t *u8g, u8g_dev_t *dev, uint16_t length, uint16_t height, uint16_t color) {
552
   void drawImage(const uint8_t *data, u8g_t *u8g, u8g_dev_t *dev, uint16_t length, uint16_t height, uint16_t color) {
553
     uint16_t buffer[BUTTON_SIZE_X * sq(FSMC_UPSCALE)];
553
     uint16_t buffer[BUTTON_SIZE_X * sq(FSMC_UPSCALE)];
554
 
554
 
555
-    //NOTE: the buffer are sized for max 32 lenght! If you need draw bigger things with this function, we need increase the buffer
556
     if (length > BUTTON_SIZE_X) return;
555
     if (length > BUTTON_SIZE_X) return;
557
 
556
 
558
     for (uint16_t i = 0; i < height; i++) {
557
     for (uint16_t i = 0; i < height; i++) {
620
           setWindow = setWindow_ili9328;
619
           setWindow = setWindow_ili9328;
621
           break;
620
           break;
622
         case 0x9341:   // ILI9341
621
         case 0x9341:   // ILI9341
623
-        case 0x8066:   // ILI9341 Anycubic / TronXY TFTs      
622
+        case 0x8066:   // Anycubic / TronXY TFTs (480x320)
624
           #ifdef LCD_USE_DMA_FSMC
623
           #ifdef LCD_USE_DMA_FSMC
625
             writeEscSequence(ili9341_init);
624
             writeEscSequence(ili9341_init);
626
           #else
625
           #else
657
           u8g_WriteSequence(u8g, dev, 160, (uint8_t *)buffer);
656
           u8g_WriteSequence(u8g, dev, 160, (uint8_t *)buffer);
658
       #endif
657
       #endif
659
 
658
 
660
-      // bottom line and buttons
659
+      // Bottom buttons
661
       #if ENABLED(TOUCH_BUTTONS)
660
       #if ENABLED(TOUCH_BUTTONS)
662
-
663
-        setWindow(u8g, dev, BUTTOND_X_LO - 4, BUTTON_Y_LO - 5, BUTTONC_X_HI + BUFSIZE + 4, BUTTON_Y_LO - 4);
664
-        #ifdef LCD_USE_DMA_FSMC
665
-          LCD_IO_WriteMultiple(TFT_DISABLED_COLOR, 600 / 2 * FSMC_UPSCALE);
666
-        #else
667
-          memset2(buffer, TFT_DISABLED_COLOR, 150);
668
-          for (uint8_t i = 8; i--;)
669
-            u8g_WriteSequence(u8g, dev, 150, (uint8_t *)buffer);
670
-        #endif
671
-
672
         setWindow(u8g, dev, BUTTOND_X_LO, BUTTON_Y_LO,  BUTTOND_X_HI, BUTTON_Y_HI);
661
         setWindow(u8g, dev, BUTTOND_X_LO, BUTTON_Y_LO,  BUTTOND_X_HI, BUTTON_Y_HI);
673
         drawImage(buttonD, u8g, dev, 32, 20, TFT_BTCANCEL_COLOR);
662
         drawImage(buttonD, u8g, dev, 32, 20, TFT_BTCANCEL_COLOR);
674
 
663
 

Loading…
Cancel
Save