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

Support for VIKI2 in RAMPS and derivatives #4168

Merged
merged 1 commit into from
Jun 30, 2016
Merged

Support for VIKI2 in RAMPS and derivatives #4168

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
20 changes: 6 additions & 14 deletions Marlin/pins_AZTEEG_X3.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,26 +26,18 @@

#include "pins_RAMPS_14_EFB.h"

//LCD Pins//

#if ENABLED(VIKI2) || ENABLED(miniVIKI)

#define BEEPER_PIN 33

// Pins for DOGM SPI LCD Support
#undef DOGLCD_A0
#undef DOGLCD_CS
#undef BTN_ENC
#define DOGLCD_A0 31
#define DOGLCD_CS 32
#define LCD_SCREEN_ROT_180

//The encoder and click button
#define BTN_EN1 22
#define BTN_EN2 7
#define BTN_ENC 12 //the click switch

#define SDSS 53
#define SD_DETECT -1 // Pin 49 if using display sd interface
#define BTN_ENC 12

#if ENABLED(TEMP_STAT_LEDS)
#undef STAT_LED_RED
#undef STAT_LED_BLUE
#define STAT_LED_RED 64
#define STAT_LED_BLUE 63
#endif
Expand Down
27 changes: 5 additions & 22 deletions Marlin/pins_AZTEEG_X3_PRO.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -105,27 +105,10 @@
#undef SERVO0_PIN
#define SERVO0_PIN 47

//LCD Pins//

#if ENABLED(VIKI2) || ENABLED(miniVIKI)
#define BEEPER_PIN 33
// Pins for DOGM SPI LCD Support
#define DOGLCD_A0 44
#define DOGLCD_CS 45
#define LCD_SCREEN_ROT_180

//The encoder and click button
#define BTN_EN1 22
#define BTN_EN2 7
#define BTN_ENC 39 //the click switch

#define SDSS 53
#define SD_DETECT_PIN 49

#define KILL_PIN 31
#endif

#if ENABLED(TEMP_STAT_LEDS)
#define STAT_LED_RED 32
#define STAT_LED_BLUE 35
#undef SD_DETECT_PIN
#define SD_DETECT_PIN 49 // For easy adapter board
#elif ENABLED(TEMP_STAT_LEDS)
#define STAT_LED_RED 32
#define STAT_LED_BLUE 35
#endif
5 changes: 5 additions & 0 deletions Marlin/pins_MKS_13.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,3 +33,8 @@

#undef HEATER_1_PIN
#define HEATER_1_PIN 7 // EXTRUDER 2 (-1 on RAMPS 1.4)

#if ENABLED(VIKI2) || ENABLED(miniVIKI)
//#undef SD_DETECT_PIN
//#define SD_DETECT_PIN 49 // For easy adapter board
#endif
21 changes: 21 additions & 0 deletions Marlin/pins_RAMPS_14.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,27 @@
#define BTN_ENC -1
#define LCD_SDSS 53
#define SD_DETECT_PIN 49
#elif ENABLED(VIKI2) || ENABLED(miniVIKI)
#define BEEPER_PIN 33

// Pins for DOGM SPI LCD Support
#define DOGLCD_A0 44
#define DOGLCD_CS 45
#define LCD_SCREEN_ROT_180

#define BTN_EN1 22
#define BTN_EN2 7
#define BTN_ENC 39

#define SDSS 53
#define SD_DETECT_PIN -1 // Pin 49 for display sd interface, 72 for easy adapter board

#define KILL_PIN 31

#if ENABLED(TEMP_STAT_LEDS)
#define STAT_LED_RED 32
#define STAT_LED_BLUE 35
#endif
#elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
#define BTN_EN1 35 // reverse if the encoder turns the wrong way.
#define BTN_EN2 37
Expand Down