Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add 'Back' Button for Touch TFT 320x240 #15060

Merged
merged 12 commits into from
Aug 29, 2019
Merged

Add 'Back' Button for Touch TFT 320x240 #15060

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
80453c8
Touch 'Back' Button
robbycandra Aug 25, 2019
b29cf64
X button for cancel/back
robbycandra Aug 26, 2019
45461ea
invert the +/down arrow
robbycandra Aug 26, 2019
2734971
Change Touch Button Color Name
robbycandra Aug 26, 2019
e4f20c7
Change Button Position, to overcome metal shield edge problem.
robbycandra Aug 26, 2019
bcee5a0
Make the "X" bit smaller
robbycandra Aug 26, 2019
2130931
buttons: restore config color defines
tpruvot Aug 27, 2019
f33967d
Move TFT Color Config Position, add to config example
robbycandra Aug 26, 2019
f679c88
Remove TFT_TOPICONS_COLOR
robbycandra Aug 26, 2019
d03cc6b
Fix A20 Config Example
robbycandra Aug 27, 2019
b4ba0c5
Move FSMC_GRAPHICAL_TFT options to config-adv
thinkyhead Aug 28, 2019
61e43a0
Comment out color overrides by default
thinkyhead Aug 29, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Change Button Position, to overcome metal shield edge problem.
  • Loading branch information
@robbycandra
robbycandra committed Aug 26, 2019
commit e4f20c74fd56ea3f1a38a83cda9c5e6d072ce973
8 changes: 4 additions & 4 deletions Marlin/src/feature/touch/xpt2046.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,10 +80,10 @@ uint8_t XPT2046::read_buttons() {

if (y < 175 || y > 234) return 0;

return WITHIN(x, 8, 71) ? EN_D
: WITHIN(x, 88, 151) ? EN_A
: WITHIN(x, 168, 231) ? EN_B
: WITHIN(x, 248, 311) ? EN_C
return WITHIN(x, 14, 77) ? EN_D
: WITHIN(x, 90, 153) ? EN_A
: WITHIN(x, 166, 229) ? EN_B
: WITHIN(x, 242, 305) ? EN_C
: 0;
}

Expand Down
12 changes: 6 additions & 6 deletions Marlin/src/lcd/dogm/u8g_dev_tft_320x240_upscale_from_128x64.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,28 +140,28 @@ static const uint8_t clear_screen_sequence[] = {
};

static const uint8_t buttonD_sequence[] = {
U8G_ESC_ADR(0), LCD_COLUMN, U8G_ESC_ADR(1), U8G_ESC_DATA(8), U8G_ESC_DATA(71),
U8G_ESC_ADR(0), LCD_COLUMN, U8G_ESC_ADR(1), U8G_ESC_DATA(14), U8G_ESC_DATA(77),
U8G_ESC_ADR(0), LCD_ROW, U8G_ESC_ADR(1), U8G_ESC_DATA(185), U8G_ESC_DATA(224),
U8G_ESC_ADR(0), LCD_WRITE_RAM, U8G_ESC_ADR(1),
U8G_ESC_END
};

static const uint8_t buttonA_sequence[] = {
U8G_ESC_ADR(0), LCD_COLUMN, U8G_ESC_ADR(1), U8G_ESC_DATA(88), U8G_ESC_DATA(151),
U8G_ESC_ADR(0), LCD_COLUMN, U8G_ESC_ADR(1), U8G_ESC_DATA(90), U8G_ESC_DATA(153),
U8G_ESC_ADR(0), LCD_ROW, U8G_ESC_ADR(1), U8G_ESC_DATA(185), U8G_ESC_DATA(224),
U8G_ESC_ADR(0), LCD_WRITE_RAM, U8G_ESC_ADR(1),
U8G_ESC_END
};

static const uint8_t buttonB_sequence[] = {
U8G_ESC_ADR(0), LCD_COLUMN, U8G_ESC_ADR(1), U8G_ESC_DATA(168), U8G_ESC_DATA(231),
U8G_ESC_ADR(0), LCD_COLUMN, U8G_ESC_ADR(1), U8G_ESC_DATA(166), U8G_ESC_DATA(229),
U8G_ESC_ADR(0), LCD_ROW, U8G_ESC_ADR(1), U8G_ESC_DATA(185), U8G_ESC_DATA(224),
U8G_ESC_ADR(0), LCD_WRITE_RAM, U8G_ESC_ADR(1),
U8G_ESC_END
};

static const uint8_t buttonC_sequence[] = {
U8G_ESC_ADR(0), LCD_COLUMN, U8G_ESC_ADR(1), U8G_ESC_DATA(248), U8G_ESC_DATA(311),
U8G_ESC_ADR(0), LCD_COLUMN, U8G_ESC_ADR(1), U8G_ESC_DATA(242), U8G_ESC_DATA(305),
U8G_ESC_ADR(0), LCD_ROW, U8G_ESC_ADR(1), U8G_ESC_DATA(185), U8G_ESC_DATA(224),
U8G_ESC_ADR(0), LCD_WRITE_RAM, U8G_ESC_ADR(1),
U8G_ESC_END
Expand Down Expand Up @@ -219,7 +219,7 @@ static const uint8_t ili9341_init_sequence[] = { // 0x9341 - ILI9341
#if ENABLED(TOUCH_BUTTONS)

static const uint8_t buttonD[] = {
B01111111,B11111111,B11111110,B11111110,
B01111111,B11111111,B11111111,B11111110,
B10000000,B00000000,B00000000,B00000001,
B10000000,B00000000,B00000000,B00000001,
B10000000,B00000000,B00000000,B00000001,
Expand All @@ -238,7 +238,7 @@ static const uint8_t ili9341_init_sequence[] = { // 0x9341 - ILI9341
B10000000,B00000000,B00000000,B00000001,
B10000000,B00000000,B00000000,B00000001,
B10000000,B00000000,B00000000,B00000001,
B01111111,B11111111,B11111110,B11111110,
B01111111,B11111111,B11111111,B11111110,
};

static const uint8_t buttonA[] = {
Expand Down