CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #4168 from thinkyhead/rc_viki2_for_ramps

Browse Source 
Support for VIKI2 in RAMPS and derivatives
This commit is contained in:
Scott Lahteine 2016-06-30 01:48:50 -07:00 committed by GitHub
commit b6b3a4afbf
4 changed files with 37 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Marlin/pins_AZTEEG_X3.h
View File

@ -26,26 +26,18 @@
#include "pins_RAMPS_14_EFB.h" #include "pins_RAMPS_14_EFB.h"
//LCD Pins//
#if ENABLED(VIKI2) || ENABLED(miniVIKI) #if ENABLED(VIKI2) || ENABLED(miniVIKI)
#define BEEPER_PIN 33 #undef DOGLCD_A0
#undef DOGLCD_CS
// Pins for DOGM SPI LCD Support #undef BTN_ENC
#define DOGLCD_A0 31 #define DOGLCD_A0 31
#define DOGLCD_CS 32 #define DOGLCD_CS 32
#define LCD_SCREEN_ROT_180 #define BTN_ENC 12
//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
#if ENABLED(TEMP_STAT_LEDS) #if ENABLED(TEMP_STAT_LEDS)
#undef STAT_LED_RED
#undef STAT_LED_BLUE
#define STAT_LED_RED 64 #define STAT_LED_RED 64
#define STAT_LED_BLUE 63 #define STAT_LED_BLUE 63
#endif #endif

23
Marlin/pins_AZTEEG_X3_PRO.h
View File

@ -105,27 +105,10 @@
#undef SERVO0_PIN #undef SERVO0_PIN
#define SERVO0_PIN 47 #define SERVO0_PIN 47
//LCD Pins//
#if ENABLED(VIKI2) || ENABLED(miniVIKI) #if ENABLED(VIKI2) || ENABLED(miniVIKI)
#define BEEPER_PIN 33 #undef SD_DETECT_PIN
// Pins for DOGM SPI LCD Support #define SD_DETECT_PIN 49 // For easy adapter board
#define DOGLCD_A0 44 #elif ENABLED(TEMP_STAT_LEDS)
#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_RED 32
#define STAT_LED_BLUE 35 #define STAT_LED_BLUE 35
#endif #endif

5
Marlin/pins_MKS_13.h
View File

@ -33,3 +33,8 @@
#undef HEATER_1_PIN #undef HEATER_1_PIN
#define HEATER_1_PIN 7 // EXTRUDER 2 (-1 on RAMPS 1.4) #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
Marlin/pins_RAMPS_14.h
View File

@ -183,6 +183,27 @@
#define BTN_ENC -1 #define BTN_ENC -1
#define LCD_SDSS 53 #define LCD_SDSS 53
#define SD_DETECT_PIN 49 #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) #elif ENABLED(ELB_FULL_GRAPHIC_CONTROLLER)
#define BTN_EN1 35 // reverse if the encoder turns the wrong way. #define BTN_EN1 35 // reverse if the encoder turns the wrong way.
#define BTN_EN2 37 #define BTN_EN2 37