sravan/Marlin-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

🐛 Fix TFT compile, K8400 pins (#26359)

Browse Source
This commit is contained in:
ellensp
2023-10-23 08:25:28 +13:00
committed by GitHub
parent b8b1aa345c
commit 156e7c1c54
3 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/src/lcd/TFTGLCD/marlinui_TFTGLCD.cpp
View File

@@ -975,7 +975,7 @@ void MarlinUI::draw_status_screen() {
uint8_t n = LCD_WIDTH; uint8_t n = LCD_WIDTH;
const bool center = bool(style & SS_CENTER), full = bool(style & SS_FULL); const bool center = bool(style & SS_CENTER), full = bool(style & SS_FULL);
const int8_t plen = fstr ? utf8_strlen(fstr) : 0, const int8_t plen = ftpl ? utf8_strlen(ftpl) : 0,
vlen = vstr ? utf8_strlen(vstr) : 0; vlen = vstr ? utf8_strlen(vstr) : 0;
int8_t pad = (center || full) ? n - plen - vlen : 0; int8_t pad = (center || full) ? n - plen - vlen : 0;
@@ -983,7 +983,7 @@ void MarlinUI::draw_status_screen() {
if (center) for (int8_t lpad = pad / 2; lpad > 0; --lpad) { lcd.write(' '); n--; } if (center) for (int8_t lpad = pad / 2; lpad > 0; --lpad) { lcd.write(' '); n--; }
// Draw as much of the label as fits // Draw as much of the label as fits
if (plen) n -= lcd_put_u8str(fstr, itemIndex, itemStringC, itemStringF, n - vlen); if (plen) n -= lcd_put_u8str(ftpl, itemIndex, itemStringC, itemStringF, n - vlen);
if (vlen && n > 0) { if (vlen && n > 0) {
// SS_FULL: Pad with enough space to justify the value // SS_FULL: Pad with enough space to justify the value

2
Marlin/src/pins/mega/pins_GT2560_V41b.h
View File

@@ -233,7 +233,7 @@
#define BTN_EN2 H2_08_PIN #define BTN_EN2 H2_08_PIN
#define BTN_ENC H2_09_PIN #define BTN_ENC H2_09_PIN
#define BEEPER_PIN H2_12_PIN #define BEEPER_PIN H2_12_PIN
#elif ENABLED(CR10_STOCKDISPLAY) // Firmware compatible with stock GT 128x64 12pin LCD for the V41b #elif ENABLED(CR10_STOCKDISPLAY) // Firmware compatible with stock GT 128x64 12pin LCD for the V41b
#define LCD_PINS_RS H2_04_PIN // DOGLCD_CS #define LCD_PINS_RS H2_04_PIN // DOGLCD_CS
#define LCD_PINS_D4 H2_05_PIN // DOGLCD_SCK #define LCD_PINS_D4 H2_05_PIN // DOGLCD_SCK
#define LCD_PINS_EN H2_03_PIN // DOGLCD_MOSI #define LCD_PINS_EN H2_03_PIN // DOGLCD_MOSI

7
Marlin/src/pins/ramps/pins_K8400.h
View File

@@ -53,6 +53,11 @@
#define X_STOP_PIN 3 #define X_STOP_PIN 3
#define Y_STOP_PIN 14 #define Y_STOP_PIN 14
//
// Fans
//
#define FAN0_PIN 8
#if ANY(BLTOUCH, TOUCH_MI_PROBE) #if ANY(BLTOUCH, TOUCH_MI_PROBE)
#define INVERTED_PROBE_STATE #define INVERTED_PROBE_STATE
#endif #endif
@@ -60,7 +65,7 @@
#include "pins_3DRAG.h" // ... RAMPS #include "pins_3DRAG.h" // ... RAMPS
// //
// Heaters / Fans // Heaters
// //
#undef HEATER_1_PIN #undef HEATER_1_PIN
#define HEATER_1_PIN 11 #define HEATER_1_PIN 11