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

Fix for TFTGLCD #20734

Merged
merged 17 commits into from
Jan 11, 2021
Merged

Fix for TFTGLCD #20734

Changes from all commits
Commits
Show all changes
17 commits
Select commit Hold shift + click to select a range
1de4125
Improve STM32 FastIO
thinkyhead Oct 14, 2020
f8612ef
Use STM_PIN
thinkyhead Oct 15, 2020
804b6f9
Apply for all STM32
thinkyhead Oct 15, 2020
dacfcda
Use digitalPinToPinName in pins debug
thinkyhead Oct 15, 2020
7a647e5
Merge pull request #14 from MarlinFirmware/bugfix-2.0.x
Serhiy-K Oct 17, 2020
723a86f
Merge pull request #15 from MarlinFirmware/bugfix-2.0.x
Serhiy-K Dec 18, 2020
f34960e
Update Russian and Ukranian translations
Serhiy-K Dec 19, 2020
03bb937
Cleanup
thinkyhead Dec 20, 2020
b9096d3
Merge remote-tracking branch 'upstream/bugfix-2.0.x' into pr/20508
thinkyhead Dec 20, 2020
35fc41d
Merge pull request #16 from MarlinFirmware/bugfix-2.0.x
Serhiy-K Dec 20, 2020
763206b
Add STM32F1xx support for TFTGLCD
Serhiy-K Dec 20, 2020
2eb6d0e
Update ubl_G29.cpp
thinkyhead Dec 22, 2020
3cc2ac9
Update marlinui_TFTGLCD.cpp
thinkyhead Dec 22, 2020
71c5bb0
Merge pull request #17 from MarlinFirmware/bugfix-2.0.x
Serhiy-K Jan 10, 2021
c80a0cc
Fix for TFTGLCD
Serhiy-K Jan 10, 2021
74a2232
Merge branch 'bugfix-2.0.x' of https://github.com/Serhiy-K/Marlin int…
Serhiy-K Jan 10, 2021
a75cf22
neaten
thinkyhead Jan 11, 2021
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
9 changes: 5 additions & 4 deletions Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -313,7 +313,7 @@ void MarlinUI::init_lcd() {
t = 0;
#if ENABLED(TFTGLCD_PANEL_SPI)
// SPI speed must be less 10MHz
_SET_OUTPUT(TFTGLCD_CS);
SET_OUTPUT(TFTGLCD_CS);
WRITE(TFTGLCD_CS, HIGH);
spiInit(TERN(__STM32F1__, SPI_QUARTER_SPEED, SPI_FULL_SPEED));
WRITE(TFTGLCD_CS, LOW);
Expand Down Expand Up @@ -855,13 +855,14 @@ void MarlinUI::draw_status_screen() {
void MenuEditItemBase::draw_edit_screen(PGM_P const pstr, const char* const value/*=nullptr*/) {
if (!PanelDetected) return;
ui.encoder_direction_normal();
lcd.setCursor(0, MIDDLE_Y);
const uint8_t y = TERN0(AUTO_BED_LEVELING_UBL, ui.external_control) ? LCD_HEIGHT - 1 : MIDDLE_Y;
lcd.setCursor(0, y);
lcd.write(COLOR_EDIT);
lcd_put_u8str_P(pstr);
if (value) {
lcd.write(':');
lcd.setCursor((LCD_WIDTH - 1) - (utf8_strlen(value) + 1), MIDDLE_Y); // Right-justified, padded by spaces
lcd.write(' '); // Overwrite char if value gets shorter
lcd.setCursor((LCD_WIDTH - 1) - (utf8_strlen(value) + 1), y); // Right-justified, padded by spaces
lcd.write(' '); // Overwrite char if value gets shorter
lcd.print(value);
lcd.write(' ');
lcd.print_line();
Expand Down