In for a penny, in for a pound

2.0.x
Richard Wackerbarth 9 years ago
parent e944f960de
commit f32048b8f5

@ -8,24 +8,24 @@
#if ENABLED(VIKI2) || ENABLED(miniVIKI) #if ENABLED(VIKI2) || ENABLED(miniVIKI)
#define BEEPER_PIN 33 #define BEEPER_PIN 33
// Pins for DOGM SPI LCD Support // Pins for DOGM SPI LCD Support
#define DOGLCD_A0 31 #define DOGLCD_A0 31
#define DOGLCD_CS 32 #define DOGLCD_CS 32
#define LCD_SCREEN_ROT_180 #define LCD_SCREEN_ROT_180
//The encoder and click button //The encoder and click button
#define BTN_EN1 22 #define BTN_EN1 22
#define BTN_EN2 7 #define BTN_EN2 7
#define BTN_ENC 12 //the click switch #define BTN_ENC 12 //the click switch
#define SDSS 53 #define SDSS 53
#define SDCARDDETECT -1 // Pin 49 if using display sd interface #define SDCARDDETECT -1 // Pin 49 if using display sd interface
#if ENABLED(TEMP_STAT_LEDS) #if ENABLED(TEMP_STAT_LEDS)
#define STAT_LED_RED 64 #define STAT_LED_RED 64
#define STAT_LED_BLUE 63 #define STAT_LED_BLUE 63
#endif #endif
#elif ENABLED(TEMP_STAT_LEDS) #elif ENABLED(TEMP_STAT_LEDS)

@ -3,10 +3,10 @@
*/ */
#ifndef __AVR_ATmega2560__ #ifndef __AVR_ATmega2560__
#error Oops! Make sure you have 'Arduino Mega 2560 or Rambo' selected from the 'Tools -> Boards' menu. #error Oops! Make sure you have 'Arduino Mega 2560 or Rambo' selected from the 'Tools -> Boards' menu.
#endif #endif
#define LARGE_FLASH true #define LARGE_FLASH true
#undef X_MS1_PIN #undef X_MS1_PIN
@ -20,94 +20,94 @@
#undef E1_MS1_PIN #undef E1_MS1_PIN
#undef E1_MS2_PIN #undef E1_MS2_PIN
#define X_STEP_PIN 37 #define X_STEP_PIN 37
#define X_DIR_PIN 48 #define X_DIR_PIN 48
#define X_MIN_PIN 12 #define X_MIN_PIN 12
#define X_MAX_PIN 30 #define X_MAX_PIN 30
#define X_ENABLE_PIN 29 #define X_ENABLE_PIN 29
#define X_MS1_PIN 40 #define X_MS1_PIN 40
#define X_MS2_PIN 41 #define X_MS2_PIN 41
#define Y_STEP_PIN 36 #define Y_STEP_PIN 36
#define Y_DIR_PIN 49 #define Y_DIR_PIN 49
#define Y_MIN_PIN 11 #define Y_MIN_PIN 11
#define Y_MAX_PIN 24 #define Y_MAX_PIN 24
#define Y_ENABLE_PIN 28 #define Y_ENABLE_PIN 28
#define Y_MS1_PIN 69 #define Y_MS1_PIN 69
#define Y_MS2_PIN 39 #define Y_MS2_PIN 39
#define Z_STEP_PIN 35 #define Z_STEP_PIN 35
#define Z_DIR_PIN 47 #define Z_DIR_PIN 47
#define Z_MIN_PIN 10 #define Z_MIN_PIN 10
#define Z_MAX_PIN 23 #define Z_MAX_PIN 23
#define Z_ENABLE_PIN 27 #define Z_ENABLE_PIN 27
#define Z_MS1_PIN 68 #define Z_MS1_PIN 68
#define Z_MS2_PIN 67 #define Z_MS2_PIN 67
#define HEATER_BED_PIN 4 #define HEATER_BED_PIN 4
#define TEMP_BED_PIN 2 #define TEMP_BED_PIN 2
#define HEATER_0_PIN 3 #define HEATER_0_PIN 3
#define TEMP_0_PIN 0 #define TEMP_0_PIN 0
#define HEATER_1_PIN 7 #define HEATER_1_PIN 7
#define TEMP_1_PIN 1 #define TEMP_1_PIN 1
#if ENABLED(BARICUDA) #if ENABLED(BARICUDA)
#define HEATER_2_PIN 6 #define HEATER_2_PIN 6
#else #else
#define HEATER_2_PIN -1 #define HEATER_2_PIN -1
#endif #endif
#define TEMP_2_PIN -1 #define TEMP_2_PIN -1
#define E0_STEP_PIN 34 #define E0_STEP_PIN 34
#define E0_DIR_PIN 43 #define E0_DIR_PIN 43
#define E0_ENABLE_PIN 26 #define E0_ENABLE_PIN 26
#define E0_MS1_PIN 65 #define E0_MS1_PIN 65
#define E0_MS2_PIN 66 #define E0_MS2_PIN 66
#define E1_STEP_PIN -1 #define E1_STEP_PIN -1
#define E1_DIR_PIN -1 #define E1_DIR_PIN -1
#define E1_ENABLE_PIN -1 #define E1_ENABLE_PIN -1
#define E1_MS1_PIN -1 #define E1_MS1_PIN -1
#define E1_MS2_PIN -1 #define E1_MS2_PIN -1
#define MOTOR_CURRENT_PWM_XY_PIN 46 #define MOTOR_CURRENT_PWM_XY_PIN 46
#define MOTOR_CURRENT_PWM_Z_PIN 45 #define MOTOR_CURRENT_PWM_Z_PIN 45
#define MOTOR_CURRENT_PWM_E_PIN 44 #define MOTOR_CURRENT_PWM_E_PIN 44
//Motor current PWM conversion, PWM value = MotorCurrentSetting * 255 / range //Motor current PWM conversion, PWM value = MotorCurrentSetting * 255 / range
#define MOTOR_CURRENT_PWM_RANGE 2000 #define MOTOR_CURRENT_PWM_RANGE 2000
#define DEFAULT_PWM_MOTOR_CURRENT {1300, 1300, 1250} #define DEFAULT_PWM_MOTOR_CURRENT {1300, 1300, 1250}
#define SDPOWER -1 #define SDPOWER -1
#define SDSS 53 #define SDSS 53
#define LED_PIN 13 #define LED_PIN 13
#define FAN_PIN 8 #define FAN_PIN 8
#define FAN_1_PIN 6 #define FAN_1_PIN 6
#define PS_ON_PIN -1 #define PS_ON_PIN -1
#define KILL_PIN -1 //80 with Smart Controller LCD #define KILL_PIN -1 // 80 with Smart Controller LCD
#define SUICIDE_PIN -1 //PIN that has to be turned on right after start, to keep power flowing. #define SUICIDE_PIN -1 // PIN that has to be turned on right after start, to keep power flowing.
#if ENABLED(ULTRA_LCD) #if ENABLED(ULTRA_LCD)
#define KILL_PIN 32 #define KILL_PIN 32
#if ENABLED(NEWPANEL) #if ENABLED(NEWPANEL)
#define BEEPER_PIN 84 // Beeper on AUX-4 #define BEEPER_PIN 84 // Beeper on AUX-4
#define LCD_PINS_RS 82 #define LCD_PINS_RS 82
#define LCD_PINS_ENABLE 18 #define LCD_PINS_ENABLE 18
#define LCD_PINS_D4 19 #define LCD_PINS_D4 19
#define LCD_PINS_D5 70 #define LCD_PINS_D5 70
#define LCD_PINS_D6 85 #define LCD_PINS_D6 85
#define LCD_PINS_D7 71 #define LCD_PINS_D7 71
//buttons are directly attached using AUX-2 //buttons are directly attached using AUX-2
#define BTN_EN1 14 #define BTN_EN1 14
#define BTN_EN2 72 #define BTN_EN2 72
#define BTN_ENC 9 //the click #define BTN_ENC 9 // the click
#define SDCARDDETECT 15 #define SDCARDDETECT 15
#endif //NEWPANEL #endif //NEWPANEL
#endif //ULTRA_LCD #endif //ULTRA_LCD

@ -69,16 +69,16 @@
#if ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL) #if ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL)
#define BEEPER_PIN -1 #define BEEPER_PIN -1
#if ENABLED(LCD_I2C_PANELOLU2) #if ENABLED(LCD_I2C_PANELOLU2)
#define BTN_EN1 27 //RX1 - fastio.h pin mapping 27 #define BTN_EN1 27 //RX1 - fastio.h pin mapping 27
#define BTN_EN2 26 //TX1 - fastio.h pin mapping 26 #define BTN_EN2 26 //TX1 - fastio.h pin mapping 26
#define BTN_ENC 43 //A3 - fastio.h pin mapping 43 #define BTN_ENC 43 //A3 - fastio.h pin mapping 43
#define SDSS 40 //use SD card on Panelolu2 (Teensyduino pin mapping) #define SDSS 40 //use SD card on Panelolu2 (Teensyduino pin mapping)
#endif // LCD_I2C_PANELOLU2 #endif // LCD_I2C_PANELOLU2
#define SDCARDDETECT -1 #define SDCARDDETECT -1
#endif // ULTRA_LCD && NEWPANEL #endif // ULTRA_LCD && NEWPANEL

Loading…
Cancel
Save