3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-29 23:07:42 +00:00
Code Issues Releases Wiki Activity

[1.1.x] RAMPS + Viki1 LCD compatibility (#15736)

Browse Source
This commit is contained in:
Axel 2019-10-31 16:04:23 -03:00 committed by Scott Lahteine
parent e068f66c26
commit 8c9318c5a3
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/pins_RAMPS.h
View File

@ -56,7 +56,7 @@
// Servos // Servos
// //
#ifdef IS_RAMPS_13 #ifdef IS_RAMPS_13
#define SERVO0_PIN 7 // RAMPS_13 // Will conflict with BTN_EN2 on LCD_I2C_VIKI #define SERVO0_PIN 7 // RAMPS_13
#else #else
#define SERVO0_PIN 11 #define SERVO0_PIN 11
#endif #endif
@ -448,8 +448,8 @@
#elif ENABLED(LCD_I2C_VIKI) #elif ENABLED(LCD_I2C_VIKI)
#define BTN_EN1 22 // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42. #define BTN_EN1 40 // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
#define BTN_EN2 7 // 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13. #define BTN_EN2 42 // for sake of the wiring diagram for RAMPS 1.4 we keep 40/42, confirmed working.
#define BTN_ENC -1 #define BTN_ENC -1
#define LCD_SDSS SDSS #define LCD_SDSS SDSS

3
Marlin/ultralcd_impl_HD44780.h
View File

@ -1164,8 +1164,9 @@ static void lcd_implementation_status_screen() {
static uint8_t ledsprev = 0; static uint8_t ledsprev = 0;
uint8_t leds = 0; uint8_t leds = 0;
#if HAS_HEATED_BED
if (thermalManager.degTargetBed() > 0) leds |= LED_A; if (thermalManager.degTargetBed() > 0) leds |= LED_A;
#endif
if (thermalManager.degTargetHotend(0) > 0) leds |= LED_B; if (thermalManager.degTargetHotend(0) > 0) leds |= LED_B;
#if FAN_COUNT > 0 #if FAN_COUNT > 0