bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Split RAMPS 1.3 an 1.4 (PR#2741)

Browse Source 
because of hardware differences on the SERVO0_PIN
This commit is contained in:
AnHardt
2015-10-31 02:05:09 +01:00
committed by Richard Wackerbarth
parent 6dfc7124a1
commit 8da2e98985
4 changed files with 59 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Marlin/pins_RAMPS_13.h
View File

@ -1,5 +1,5 @@
/**
* Arduino Mega with RAMPS v1.3 pin assignments
* Arduino Mega with RAMPS v1.3 v1.4 pin assignments
*
* Applies to the following boards:
*
@ -8,8 +8,18 @@
* RAMPS_13_EFF (Extruder, Fan, Fan)
* RAMPS_13_EEF (Extruder, Extruder, Fan)
* RAMPS_13_SF (Spindle, Controller Fan)
*
* RAMPS_14_EFB (Extruder, Fan, Bed)
* RAMPS_14_EEB (Extruder, Extruder, Bed)
* RAMPS_14_EFF (Extruder, Fan, Fan)
* RAMPS_14_EEF (Extruder, Extruder, Fan)
* RAMPS_14_SF (Spindle, Controller Fan)
*
* Other pins_MYBOARD.h files may override these defaults
*
* Differences between
* RAMPS_13 | RAMPS_14
* 7 | 11
*/
#if !defined(__AVR_ATmega1280__) && !defined(__AVR_ATmega2560__)
@ -18,7 +28,11 @@
#define LARGE_FLASH true
#define SERVO0_PIN 11
#ifdef IS_RAMPS_14
#define SERVO0_PIN 11
#else
#define SERVO0_PIN 7 // RAMPS_13 // Will conflict with BTN_EN2 on LCD_I2C_VIKI
#endif
#define SERVO1_PIN 6
#define SERVO2_PIN 5
#define SERVO3_PIN 4
@ -154,7 +168,9 @@
#define KILL_PIN 41
#elif ENABLED(LCD_I2C_VIKI)
#define BTN_EN1 22 // reverse if the encoder turns the wrong way.
#define BTN_EN2 7
#define BTN_EN2 7 // http://files.panucatt.com/datasheets/viki_wiring_diagram.pdf
// tells about 40/42.
// 22/7 are unused on RAMPS_14. 22 is unused and 7 the SERVO0_PIN on RAMPS_13.
#define BTN_ENC -1
#define LCD_SDSS 53
#define SD_DETECT_PIN 49