wp/Marlin-Ai3M
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge Marlin 1.1.8

Browse Source
This commit is contained in:
David Ramiro
2019-01-31 12:25:28 +01:00
parent 8aa4ed6945
commit 5893bcbcc0
320 changed files with 34109 additions and 50001 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
Marlin/pins_RAMBO.h
View File

@@ -49,10 +49,17 @@
//
// Servos
//
#define SERVO0_PIN 22 // Motor header MX1
#define SERVO1_PIN 23 // Motor header MX2
#define SERVO2_PIN 24 // Motor header MX3
#define SERVO3_PIN 5 // PWM header pin 5
#define SERVO0_PIN 22 // Motor header MX1
#define SERVO1_PIN 23 // Motor header MX2
#define SERVO2_PIN 24 // Motor header MX3
#define SERVO3_PIN 5 // PWM header pin 5
//
// Z Probe (when not Z_MIN_PIN)
//
#ifndef Z_MIN_PROBE_PIN
#define Z_MIN_PROBE_PIN 30
#endif
//
// Limit Switches
@@ -64,13 +71,6 @@
#define Z_MIN_PIN 10
#define Z_MAX_PIN 30
//
// Z Probe (when not Z_MIN_PIN)
//
#ifndef Z_MIN_PROBE_PIN
#define Z_MIN_PROBE_PIN 30
#endif
//
// Steppers
//
@@ -107,10 +107,7 @@
#define E1_MS2_PIN 64
#define DIGIPOTSS_PIN 38
#define DIGIPOT_CHANNELS { 4,5,3,0,1 } // X Y Z E0 E1 digipot channels to stepper driver mapping
#ifndef DIGIPOT_MOTOR_CURRENT
#define DIGIPOT_MOTOR_CURRENT { 135,135,135,135,135 } // Values 0-255 (RAMBO 135 = ~0.75A, 185 = ~1A)
#endif
#define DIGIPOT_CHANNELS {4,5,3,0,1} // X Y Z E0 E1 digipot channels to stepper driver mapping
//
// Temperature Sensors
@@ -127,9 +124,7 @@
#define HEATER_2_PIN 6
#define HEATER_BED_PIN 3
#ifndef FAN_PIN
#define FAN_PIN 8
#endif
#define FAN_PIN 8
#define FAN1_PIN 6
#define FAN2_PIN 2
@@ -148,8 +143,8 @@
//
// M3/M4/M5 - Spindle/Laser Control
//
#define SPINDLE_LASER_PWM_PIN 45 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENABLE_PIN 31 // Pin should have a pullup!
#define SPINDLE_LASER_PWM_PIN 45 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENABLE_PIN 31 // Pin should have a pullup!
#define SPINDLE_DIR_PIN 32
//
@@ -157,14 +152,14 @@
//
#define E_MUX0_PIN 17
#define E_MUX1_PIN 16
#define E_MUX2_PIN 84 // 84 in MK2 Firmware
#define E_MUX2_PIN 84 // 84 in MK2 Firmware
//
// LCD / Controller
//
#if ENABLED(ULTRA_LCD)
#define KILL_PIN 80
#define KILL_PIN 80
#if ENABLED(NEWPANEL)
@@ -176,41 +171,41 @@
#define LCD_PINS_D7 75
#if ENABLED(VIKI2) || ENABLED(miniVIKI)
#define BEEPER_PIN 44
#define BEEPER_PIN 44
// NB: Panucatt's Viki 2.0 wiring diagram (v1.2) indicates that the
// beeper/buzzer is connected to pin 33; however, the pin used in the
// diagram is actually pin 44, so this is correct.
#define DOGLCD_A0 70
#define DOGLCD_CS 71
#define DOGLCD_A0 70
#define DOGLCD_CS 71
#define LCD_SCREEN_ROT_180
#define BTN_EN1 85
#define BTN_EN2 84
#define BTN_ENC 83
#define BTN_EN1 85
#define BTN_EN2 84
#define BTN_ENC 83
#define SD_DETECT_PIN -1 // Pin 72 if using easy adapter board
#define SD_DETECT_PIN -1 // Pin 72 if using easy adapter board
#define STAT_LED_RED_PIN 22
#define STAT_LED_BLUE_PIN 32
#else // !VIKI2 && !miniVIKI
#else
#define BEEPER_PIN 79 // AUX-4
#define BEEPER_PIN 79 // AUX-4
// AUX-2
#define BTN_EN1 76
#define BTN_EN2 77
#define BTN_ENC 78
#define BTN_EN1 76
#define BTN_EN2 77
#define BTN_ENC 78
#define SD_DETECT_PIN 81
#endif // !VIKI2 && !miniVIKI
#endif // VIKI2/miniVIKI
#else // !NEWPANEL - old style panel with shift register
// No Beeper added
#define BEEPER_PIN 33
#define BEEPER_PIN 33
// buttons are attached to a shift register
// Not wired yet