SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

TFT 2x-3x scale, Anycubic, TronXY TFT support (#18224)

Browse source
This commit is contained in:
Victor 2020-06-08 22:02:01 -03:00 committed by GitHub
parent bcf7ac7483
commit 265ab19ed2
Signed by: GitHub
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 60 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

72
Marlin/src/lcd/dogm/u8g_dev_tft_320x240_upscale_from_128x64.cpp
View file

@ -73,14 +73,18 @@
extern void LCD_IO_WriteMultiple(uint16_t color, uint32_t count); extern void LCD_IO_WriteMultiple(uint16_t color, uint32_t count);
#endif #endif
#ifndef FSMC_UPSCALE
#define FSMC_UPSCALE 2
#endif
#define WIDTH LCD_PIXEL_WIDTH #define WIDTH LCD_PIXEL_WIDTH
#define HEIGHT LCD_PIXEL_HEIGHT #define HEIGHT LCD_PIXEL_HEIGHT
#define PAGE_HEIGHT 8 #define PAGE_HEIGHT 8
#define X_LO LCD_PIXEL_OFFSET_X #define X_LO LCD_PIXEL_OFFSET_X
#define Y_LO LCD_PIXEL_OFFSET_Y #define Y_LO LCD_PIXEL_OFFSET_Y
#define X_HI (X_LO + 2 * WIDTH - 1) #define X_HI (X_LO + (FSMC_UPSCALE) * WIDTH - 1)
#define Y_HI (Y_LO + 2 * HEIGHT - 1) #define Y_HI (Y_LO + (FSMC_UPSCALE) * HEIGHT - 1)
// see https://ee-programming-notepad.blogspot.com/2016/10/16-bit-color-generator-picker.html // see https://ee-programming-notepad.blogspot.com/2016/10/16-bit-color-generator-picker.html
@ -526,8 +530,27 @@ static const uint16_t ili9341_init[] = {
B01111111,B11111111,B11111111,B11111110, B01111111,B11111111,B11111111,B11111110,
}; };
#define BUTTON_SIZE_X 32
#define BUTTON_SIZE_Y 20
// 14, 90, 166, 242, 185 are the original values upscaled 2x.
#define BUTTOND_X_LO (14 / 2) * (FSMC_UPSCALE)
#define BUTTOND_X_HI (BUTTOND_X_LO + (FSMC_UPSCALE) * BUTTON_SIZE_X - 1)
#define BUTTONA_X_LO (90 / 2) * (FSMC_UPSCALE)
#define BUTTONA_X_HI (BUTTONA_X_LO + (FSMC_UPSCALE) * BUTTON_SIZE_X - 1)
#define BUTTONB_X_LO (166 / 2) * (FSMC_UPSCALE)
#define BUTTONB_X_HI (BUTTONB_X_LO + (FSMC_UPSCALE) * BUTTON_SIZE_X - 1)
#define BUTTONC_X_LO (242 / 2) * (FSMC_UPSCALE)
#define BUTTONC_X_HI (BUTTONC_X_LO + (FSMC_UPSCALE) * BUTTON_SIZE_X - 1)
#define BUTTON_Y_LO (170 / 2) * (FSMC_UPSCALE)
#define BUTTON_Y_HI (BUTTON_Y_LO + (FSMC_UPSCALE) * BUTTON_SIZE_Y - 1)
void drawImage(const uint8_t *data, u8g_t *u8g, u8g_dev_t *dev, uint16_t length, uint16_t height, uint16_t color) { void drawImage(const uint8_t *data, u8g_t *u8g, u8g_dev_t *dev, uint16_t length, uint16_t height, uint16_t color) {
uint16_t buffer[128]; uint16_t buffer[BUTTON_SIZE_X * sq(FSMC_UPSCALE)];
for (uint16_t i = 0; i < height; i++) { for (uint16_t i = 0; i < height; i++) {
uint16_t k = 0; uint16_t k = 0;
@ -537,20 +560,17 @@ static const uint16_t ili9341_init[] = {
v = color; v = color;
else else
v = TFT_MARLINBG_COLOR; v = TFT_MARLINBG_COLOR;
buffer[k++] = v; buffer[k++] = v; LOOP_L_N(n, FSMC_UPSCALE) buffer[k++] = v;
} }
#ifdef LCD_USE_DMA_FSMC #ifdef LCD_USE_DMA_FSMC
if (k <= 80) { // generally is... for our buttons LOOP_S_L_N(n, 1, FSMC_UPSCALE)
memcpy(&buffer[k], &buffer[0], k * sizeof(uint16_t)); for (uint16_t l = 0; l < length * (FSMC_UPSCALE); l++)
LCD_IO_WriteSequence(buffer, k * sizeof(uint16_t)); buffer[l + (length * (FSMC_UPSCALE) * n)] = buffer[l];
}
else { LCD_IO_WriteSequence(buffer, COUNT(buffer));
LCD_IO_WriteSequence(buffer, k);
LCD_IO_WriteSequence(buffer, k);
}
#else #else
u8g_WriteSequence(u8g, dev, k << 1, (uint8_t *)buffer); u8g_WriteSequence(u8g, dev, k << 1, (uint8_t*)buffer);
u8g_WriteSequence(u8g, dev, k << 1, (uint8_t *)buffer); u8g_WriteSequence(u8g, dev, k << 1, (uint8_t*)buffer);
#endif #endif
} }
} }
@ -569,7 +589,7 @@ static uint8_t page;
uint8_t u8g_dev_tft_320x240_upscale_from_128x64_fn(u8g_t *u8g, u8g_dev_t *dev, uint8_t msg, void *arg) { uint8_t u8g_dev_tft_320x240_upscale_from_128x64_fn(u8g_t *u8g, u8g_dev_t *dev, uint8_t msg, void *arg) {
u8g_pb_t *pb = (u8g_pb_t *)(dev->dev_mem); u8g_pb_t *pb = (u8g_pb_t *)(dev->dev_mem);
#ifdef LCD_USE_DMA_FSMC #ifdef LCD_USE_DMA_FSMC
static uint16_t bufferA[512], bufferB[512]; static uint16_t bufferA[WIDTH * sq(FSMC_UPSCALE)], bufferB[WIDTH * sq(FSMC_UPSCALE)];
uint16_t* buffer = &bufferA[0]; uint16_t* buffer = &bufferA[0];
bool allow_async = true; bool allow_async = true;
#else #else
@ -597,6 +617,7 @@ uint8_t u8g_dev_tft_320x240_upscale_from_128x64_fn(u8g_t *u8g, u8g_dev_t *dev, u
setWindow = setWindow_ili9328; setWindow = setWindow_ili9328;
break; break;
case 0x9341: // ILI9341 case 0x9341: // ILI9341
case 0x8066: // ILI9341 Anycubic / TronXY TFTs
#ifdef LCD_USE_DMA_FSMC #ifdef LCD_USE_DMA_FSMC
writeEscSequence(ili9341_init); writeEscSequence(ili9341_init);
#else #else
@ -645,16 +666,16 @@ uint8_t u8g_dev_tft_320x240_upscale_from_128x64_fn(u8g_t *u8g, u8g_dev_t *dev, u
u8g_WriteSequence(u8g, dev, 150, (uint8_t *)buffer); u8g_WriteSequence(u8g, dev, 150, (uint8_t *)buffer);
#endif #endif
setWindow(u8g, dev, 14, 185, 77, 224); setWindow(u8g, dev, BUTTOND_X_LO, BUTTON_Y_LO, BUTTOND_X_HI, BUTTON_Y_HI);
drawImage(buttonD, u8g, dev, 32, 20, TFT_BTCANCEL_COLOR); drawImage(buttonD, u8g, dev, 32, 20, TFT_BTCANCEL_COLOR);
setWindow(u8g, dev, 90, 185, 153, 224); setWindow(u8g, dev, BUTTONA_X_LO, BUTTON_Y_LO, BUTTONA_X_HI, BUTTON_Y_HI);
drawImage(buttonA, u8g, dev, 32, 20, TFT_BTARROWS_COLOR); drawImage(buttonA, u8g, dev, 32, 20, TFT_BTARROWS_COLOR);
setWindow(u8g, dev, 166, 185, 229, 224); setWindow(u8g, dev, BUTTONB_X_LO, BUTTON_Y_LO, BUTTONB_X_HI, BUTTON_Y_HI);
drawImage(buttonB, u8g, dev, 32, 20, TFT_BTARROWS_COLOR); drawImage(buttonB, u8g, dev, 32, 20, TFT_BTARROWS_COLOR);
setWindow(u8g, dev, 242, 185, 305, 224); setWindow(u8g, dev, BUTTONC_X_LO, BUTTON_Y_LO, BUTTONC_X_HI, BUTTON_Y_HI);
drawImage(buttonC, u8g, dev, 32, 20, TFT_BTOKMENU_COLOR); drawImage(buttonC, u8g, dev, 32, 20, TFT_BTOKMENU_COLOR);
#endif // TOUCH_BUTTONS #endif // TOUCH_BUTTONS
@ -678,19 +699,22 @@ uint8_t u8g_dev_tft_320x240_upscale_from_128x64_fn(u8g_t *u8g, u8g_dev_t *dev, u
for (uint16_t i = 0; i < (uint32_t)pb->width; i++) { for (uint16_t i = 0; i < (uint32_t)pb->width; i++) {
const uint8_t b = *(((uint8_t *)pb->buf) + i); const uint8_t b = *(((uint8_t *)pb->buf) + i);
const uint16_t c = TEST(b, y) ? TFT_MARLINUI_COLOR : TFT_MARLINBG_COLOR; const uint16_t c = TEST(b, y) ? TFT_MARLINUI_COLOR : TFT_MARLINBG_COLOR;
buffer[k++] = c; buffer[k++] = c; LOOP_L_N(n, FSMC_UPSCALE) buffer[k++] = c;
} }
#ifdef LCD_USE_DMA_FSMC #ifdef LCD_USE_DMA_FSMC
memcpy(&buffer[256], &buffer[0], 512); LOOP_S_L_N(n, 1, FSMC_UPSCALE)
for (uint16_t l = 0; l < WIDTH * (FSMC_UPSCALE); l++)
buffer[l + WIDTH * (FSMC_UPSCALE) * n] = buffer[l];
if (allow_async) { if (allow_async) {
if (y > 0 || page > 1) LCD_IO_WaitSequence_Async(); if (y > 0 || page > 1) LCD_IO_WaitSequence_Async();
if (y == 7 && page == 8) if (y == 7 && page == 8)
LCD_IO_WriteSequence(buffer, 512); // last line of last page LCD_IO_WriteSequence(buffer, COUNT(bufferA)); // last line of last page
else else
LCD_IO_WriteSequence_Async(buffer, 512); LCD_IO_WriteSequence_Async(buffer, COUNT(bufferA));
} }
else else
LCD_IO_WriteSequence(buffer, 512); LCD_IO_WriteSequence(buffer, COUNT(bufferA));
#else #else
uint8_t* bufptr = (uint8_t*) buffer; uint8_t* bufptr = (uint8_t*) buffer;
for (uint8_t i = 2; i--;) { for (uint8_t i = 2; i--;) {

16
Marlin/src/lcd/dogm/ultralcd_DOGM.h
View file

@ -199,10 +199,18 @@
// LCD_FULL_PIXEL_WIDTH = // LCD_FULL_PIXEL_WIDTH =
// LCD_PIXEL_OFFSET_X + (LCD_PIXEL_WIDTH * 2) + LCD_PIXEL_OFFSET_X // LCD_PIXEL_OFFSET_X + (LCD_PIXEL_WIDTH * 2) + LCD_PIXEL_OFFSET_X
#if ENABLED(FSMC_GRAPHICAL_TFT) #if ENABLED(FSMC_GRAPHICAL_TFT)
#define LCD_FULL_PIXEL_WIDTH 320 #ifndef LCD_FULL_PIXEL_WIDTH
#define LCD_PIXEL_OFFSET_X 32 #define LCD_FULL_PIXEL_WIDTH 320
#define LCD_FULL_PIXEL_HEIGHT 240 #endif
#define LCD_PIXEL_OFFSET_Y 32 #ifndef LCD_PIXEL_OFFSET_X
#define LCD_PIXEL_OFFSET_X 32
#endif
#ifndef LCD_FULL_PIXEL_HEIGHT
#define LCD_FULL_PIXEL_HEIGHT 240
#endif
#ifndef LCD_PIXEL_OFFSET_Y
#define LCD_PIXEL_OFFSET_Y 32
#endif
#endif #endif
// For selective rendering within a Y range // For selective rendering within a Y range