Skip to content

Commit b7d9b05

Browse files
rhapsodyvthinkyhead
authored andcommitted
TFT followup fixes (MarlinFirmware#19710)
1 parent f7f1224 commit b7d9b05

File tree

4 files changed

+12
-11
lines changed

4 files changed

+12
-11
lines changed

Marlin/src/lcd/extui/lib/mks_ui/tft_lvgl_configuration.cpp

+2-1
Original file line numberDiff line numberDiff line change
@@ -476,7 +476,8 @@ void lv_encoder_pin_init() {
476476

477477
#endif
478478

479-
static uint8_t buttons = newbutton;
479+
static uint8_t buttons = 0;
480+
buttons = newbutton;
480481
static uint8_t lastEncoderBits;
481482

482483
#define encrot0 0

Marlin/src/lcd/tft/touch.cpp

-4
Original file line numberDiff line numberDiff line change
@@ -295,10 +295,6 @@ bool Touch::get_point(int16_t *x, int16_t *y) {
295295
if (is_touched && calibration.orientation != TOUCH_ORIENTATION_NONE) {
296296
*x = int16_t((int32_t(*x) * calibration.x) >> 16) + calibration.offset_x;
297297
*y = int16_t((int32_t(*y) * calibration.y) >> 16) + calibration.offset_y;
298-
#if (TFT_ROTATION & TFT_ROTATE_180)
299-
*x = TFT_WIDTH - *x;
300-
*y = TFT_HEIGHT - *y;
301-
#endif
302298
}
303299
return is_touched;
304300
}

Marlin/src/lcd/tft_io/ili9328.h

+5-3
Original file line numberDiff line numberDiff line change
@@ -49,9 +49,11 @@
4949
#define ILI9328_GATE_SCANCTL1_DATA 0x2700
5050
#endif
5151

52-
// #define ILI9328_ETMOD_ORIENTATION IF_0((TFT_ORIENTATION) & TFT_EXCHANGE_XY, ILI9328_ETMOD_AM) | \
53-
// IF_0((TFT_ORIENTATION) & TFT_INVERT_X, ILI9328_ETMOD_ID1) | \
54-
// IF_0((TFT_ORIENTATION) & TFT_INVERT_Y, ILI9328_ETMOD_ID0)
52+
/*
53+
#define ILI9328_ETMOD_ORIENTATION IF_0((TFT_ORIENTATION) & TFT_EXCHANGE_XY, ILI9328_ETMOD_AM) | \
54+
IF_0((TFT_ORIENTATION) & TFT_INVERT_X, ILI9328_ETMOD_ID1) | \
55+
IF_0((TFT_ORIENTATION) & TFT_INVERT_Y, ILI9328_ETMOD_ID0)
56+
*/
5557

5658
#define ILI9328_ETMOD_ORIENTATION (ILI9328_ETMOD_AM | ILI9328_ETMOD_ID1 | ILI9328_ETMOD_ID0)
5759

Marlin/src/lcd/tft_io/r65105.h

+5-3
Original file line numberDiff line numberDiff line change
@@ -51,9 +51,11 @@
5151
#define R61505_DRVCTRL_DATA 0x2700
5252
#endif
5353

54-
// #define R61505_ETMOD_ORIENTATION IF_0((TFT_ORIENTATION) & TFT_EXCHANGE_XY, R61505_ETMOD_AM) | \
55-
// IF_0((TFT_ORIENTATION) & TFT_INVERT_X, R61505_ETMOD_ID0) | \
56-
// IF_0((TFT_ORIENTATION) & TFT_INVERT_Y, R61505_ETMOD_ID1)
54+
/*
55+
#define R61505_ETMOD_ORIENTATION IF_0((TFT_ORIENTATION) & TFT_EXCHANGE_XY, R61505_ETMOD_AM) | \
56+
IF_0((TFT_ORIENTATION) & TFT_INVERT_X, R61505_ETMOD_ID0) | \
57+
IF_0((TFT_ORIENTATION) & TFT_INVERT_Y, R61505_ETMOD_ID1)
58+
*/
5759

5860
#define R61505_ETMOD_ORIENTATION (R61505_ETMOD_AM | R61505_ETMOD_ID0 | R61505_ETMOD_ID1)
5961

0 commit comments

Comments
 (0)