Skip to content

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

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

Merged
thinkyhead merged 7 commits into from
Oct 31, 2019
Merged

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

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
b3ac35d
Merge pull request #13 from MarlinFirmware/bugfix-1.1.x
chepo92 Oct 31, 2019
f3e7726
Compatibility of RAMPS with Viki1 LCD
chepo92 Oct 31, 2019
ac7bc10
Viki LCD
chepo92 Oct 31, 2019
cb0227c
Revert "Viki LCD"
chepo92 Oct 31, 2019
f72298f
vikilcd
chepo92 Oct 31, 2019
75576a6
viki
chepo92 Oct 31, 2019
e1206a7
Revert "viki"
chepo92 Oct 31, 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
6 changes: 3 additions & 3 deletions Marlin/pins_RAMPS.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@
// Servos
//
#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
#define SERVO0_PIN 11
#endif
Expand Down Expand Up @@ -448,8 +448,8 @@

#elif ENABLED(LCD_I2C_VIKI)

#define BTN_EN1 22 // 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_EN1 40 // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf explains 40/42.
#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 LCD_SDSS SDSS
Expand Down
5 changes: 3 additions & 2 deletions Marlin/ultralcd_impl_HD44780.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1164,8 +1164,9 @@ static void lcd_implementation_status_screen() {
static uint8_t ledsprev = 0;
uint8_t leds = 0;

if (thermalManager.degTargetBed() > 0) leds |= LED_A;

#if HAS_HEATED_BED
if (thermalManager.degTargetBed() > 0) leds |= LED_A;
#endif
if (thermalManager.degTargetHotend(0) > 0) leds |= LED_B;

#if FAN_COUNT > 0
Expand Down