Skip to content

Adding support for RuRamps4D version 1.3 #11363

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

Merged
thinkyhead merged 1 commit into from
Jul 26, 2018
Merged

Adding support for RuRamps4D version 1.3 #11363

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
3 changes: 2 additions & 1 deletion Marlin/src/core/boards.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,8 @@
#define BOARD_RAMPS4DUE_EFF 1545 // RAMPS4DUE (Power outputs: Hotend, Fan0, Fan1)
#define BOARD_RAMPS4DUE_EEF 1546 // RAMPS4DUE (Power outputs: Hotend0, Hotend1, Fan)
#define BOARD_RAMPS4DUE_SF 1548 // RAMPS4DUE (Power outputs: Spindle, Controller Fan)
#define BOARD_RURAMPS4D 1550 // RuRAMPS4Duo v1 (Power outputs: Hotend0, Hotend2, Hotend2, Fan0, Fan1, Bed)
#define BOARD_RURAMPS4D_11 1550 // RuRAMPS4Duo v1.1 (Power outputs: Hotend0, Hotend1, Hotend2, Fan0, Fan1, Bed)
#define BOARD_RURAMPS4D_13 1551 // RuRAMPS4Duo v1.3 (Power outputs: Hotend0, Hotend1, Hotend2, Fan0, Fan1, Bed)
#define BOARD_ULTRATRONICS_PRO 1560 // ReprapWorld Ultratronics Pro V1.0
#define BOARD_ARCHIM2 1590 // UltiMachine Archim2 (with TMC2130 drivers)
#define BOARD_ALLIGATOR 1602 // Alligator Board R2
Expand Down
3 changes: 3 additions & 0 deletions Marlin/src/inc/SanityCheck.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -311,10 +311,13 @@

#define BOARD_MKS_13 -47
#define BOARD_TRIGORILLA -343
#define BOARD_RURAMPS4D -1550
#if MB(MKS_13)
#error "BOARD_MKS_13 has been renamed BOARD_MKS_GEN_13. Please update your configuration."
#elif MB(BOARD_TRIGORILLA)
#error "BOARD_TRIGORILLA has been renamed BOARD_TRIGORILLA_13. Please update your configuration."
#elif MB(BOARD_RURAMPS4D)
#error "BOARD_RURAMPS4D has been renamed BOARD_RURAMPS4D_11. Please update your configuration."
#endif

/**
Expand Down
6 changes: 4 additions & 2 deletions Marlin/src/pins/pins.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -305,8 +305,10 @@
#include "pins_DUE3DOM_MINI.h" // SAM3X8E env:DUE env:DUE_USB env:DUE_debug
#elif MB(RADDS)
#include "pins_RADDS.h" // SAM3X8E env:DUE env:DUE_USB env:DUE_debug
#elif MB(RURAMPS4D)
#include "pins_RURAMPS4D.h" // SAM3X8E env:DUE env:DUE_USB env:DUE_debug
#elif MB(RURAMPS4D_11)
#include "pins_RURAMPS4D_11.h" // SAM3X8E env:DUE env:DUE_USB env:DUE_debug
#elif MB(RURAMPS4D_13)
#include "pins_RURAMPS4D_13.h" // SAM3X8E env:DUE env:DUE_USB env:DUE_debug
#elif MB(RAMPS_FD_V1)
#include "pins_RAMPS_FD_V1.h" // SAM3X8E env:DUE env:DUE_USB env:DUE_debug
#elif MB(RAMPS_FD_V2)
Expand Down
3 changes: 0 additions & 3 deletions Marlin/src/pins/pinsDebug_list.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -917,9 +917,6 @@
#if PIN_EXISTS(Z_MS2)
REPORT_NAME_DIGITAL(__LINE__, Z_MS2_PIN)
#endif
#if PIN_EXISTS(Z_PROBE)
REPORT_NAME_DIGITAL(__LINE__, Z_PROBE_PIN)
#endif
#if PIN_EXISTS(Z_STEP)
REPORT_NAME_DIGITAL(__LINE__, Z_STEP_PIN)
#endif
Expand Down
78 changes: 42 additions & 36 deletions Marlin/src/pins/pins_RURAMPS4D.h → Marlin/src/pins/pins_RURAMPS4D_11.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,9 +37,15 @@
#endif

#ifndef BOARD_NAME
#define BOARD_NAME "RuRAMPS4Due"
#define BOARD_NAME "RuRAMPS4Due v1.1"
#endif

//
// Servos
//
#define SERVO0_PIN 5
#define SERVO1_PIN 3

//
// Limit Switches
//
Expand All @@ -63,38 +69,51 @@
#define X_STEP_PIN 37 // Support Extension Board
#define X_DIR_PIN 36
#define X_ENABLE_PIN 38
#ifndef X_CS_PIN
#define X_CS_PIN -1
#endif

#define Y_STEP_PIN 32 // Support Extension Board
#define Y_DIR_PIN 35
#define Y_ENABLE_PIN 34
#ifndef Y_CS_PIN
#define Y_CS_PIN -1
#endif

#define Z_STEP_PIN 30 // Support Extension Board
#define Z_DIR_PIN 2
#define Z_ENABLE_PIN 33
#ifndef Z_CS_PIN
#define Z_CS_PIN -1
#endif

#define E0_STEP_PIN 29
#define E0_DIR_PIN 28
#define E0_ENABLE_PIN 31
#ifndef E0_CS_PIN
#define E0_CS_PIN -1
#endif

#define E1_STEP_PIN 22
#define E1_DIR_PIN 24
#define E1_ENABLE_PIN 26
#ifndef E1_CS_PIN
#define E1_CS_PIN -1
#endif

#define E2_STEP_PIN 25
#define E2_DIR_PIN 23
#define E2_ENABLE_PIN 27
#ifndef E2_CS_PIN
#define E2_CS_PIN -1
#endif

#define E3_STEP_PIN 15 // Only For Extension Board
#define E3_DIR_PIN 14
#define E3_ENABLE_PIN 61

//#define X_CS_PIN -1
//#define Y_CS_PIN -1
//#define Z_CS_PIN -1
//#define E0_CS_PIN -1
//#define E1_CS_PIN -1
//#define E2_CS_PIN -1
//#define E3_CS_PIN -1
#ifndef E3_CS_PIN
#define E3_CS_PIN -1
#endif

// For Future: Microstepping pins - Mapping not from fastio.h (?)
//#define E3_MS1_PIN ?
Expand Down Expand Up @@ -136,8 +155,9 @@
#define TEMP_2_PIN 2 // ANALOG A2
#define TEMP_3_PIN 3 // ANALOG A2
#define TEMP_BED_PIN 4 // ANALOG A3
//Thermocouple Use Analog Pins
#if ENABLED(VER_WITH_THERMOCOUPLE) // If Nead, define is in Configuration.h

// The thermocouple uses Analog pins
#if ENABLED(VER_WITH_THERMOCOUPLE) // Defined in Configuration.h
#define TEMP_4_PIN 5 // A5
#define TEMP_5_PIN 6 // A6 (Marlin 2.0 not support)
#endif
Expand All @@ -149,14 +169,6 @@
// #define MAX6675_SS 49
//#endif

//
// Servos
//
#define SERVO0_PIN 5
#define SERVO1_PIN 3
#define SERVO2_PIN -1
#define SERVO3_PIN -1

//
// Misc. Functions
//
Expand Down Expand Up @@ -195,44 +207,32 @@

#if ENABLED(RADDS_DISPLAY) || ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)

#define BEEPER_PIN 62

#define LCD_PINS_RS 63
#define LCD_PINS_ENABLE 64
#define LCD_PINS_D4 48
#define LCD_PINS_D5 50
#define LCD_PINS_D6 52
#define LCD_PINS_D7 53

#define BEEPER_PIN 62

#define BTN_EN1 44
#define BTN_EN2 42
#define BTN_ENC 40

#define SD_DETECT_PIN 51

#elif ENABLED(REPRAP_DISCOUNT_FULL_GRAPHIC_SMART_CONTROLLER)

#define BEEPER_PIN 62

#define LCD_PINS_RS 52
#define LCD_PINS_ENABLE 53
#define LCD_PINS_D4 48
#define LCD_PINS_D5 50
#define LCD_PINS_D6 52
#define LCD_PINS_D7 53

#define BEEPER_PIN 62

#if ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER)
#define BTN_EN1 44
#define BTN_EN2 42
#define BTN_ENC 40
#define SD_DETECT_PIN 51
#endif
#define SD_DETECT_PIN 51

#elif ENABLED(SSD1306_OLED_I2C_CONTROLLER)

#define BTN_EN1 44
#define BTN_EN2 42
#define BTN_ENC 40
#define BEEPER_PIN 62
#define LCD_SDSS 10
#define SD_DETECT_PIN 51
Expand All @@ -250,4 +250,10 @@

#endif // SPARK_FULL_GRAPHICS

#if ENABLED(NEWPANEL)
#define BTN_EN1 44
#define BTN_EN2 42
#define BTN_ENC 40
#endif

#endif // ULTRA_LCD
Loading