From 00514857e9941ceecd67d5276cb7e53d70bc3bbf Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 9 Nov 2017 21:35:26 -0600 Subject: [PATCH 1/2] SBASE serial port -1, RAMPS spacing --- Marlin/src/config/examples/Mks/Sbase/Configuration.h | 2 +- Marlin/src/pins/pins_RAMPS.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Marlin/src/config/examples/Mks/Sbase/Configuration.h b/Marlin/src/config/examples/Mks/Sbase/Configuration.h index b581a540cc..d258509e72 100644 --- a/Marlin/src/config/examples/Mks/Sbase/Configuration.h +++ b/Marlin/src/config/examples/Mks/Sbase/Configuration.h @@ -101,7 +101,7 @@ * * :[-1, 0, 1, 2, 3, 4, 5, 6, 7] */ -#define SERIAL_PORT 0 +#define SERIAL_PORT -1 /** * This setting determines the communication speed of the printer. diff --git a/Marlin/src/pins/pins_RAMPS.h b/Marlin/src/pins/pins_RAMPS.h index b4740ea6e1..5fef155749 100644 --- a/Marlin/src/pins/pins_RAMPS.h +++ b/Marlin/src/pins/pins_RAMPS.h @@ -195,7 +195,7 @@ #endif #ifndef FAN_PIN - #define FAN_PIN 4 // IO pin. Buffer needed + #define FAN_PIN 4 // IO pin. Buffer needed #endif // From 006dad4b526c288b1d1224b32c6dd332e5522811 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Thu, 9 Nov 2017 14:24:14 -0600 Subject: [PATCH 2/2] Add pins_RURAMPS4D.h & change pins.h http://3dtoday.ru/blogs/svs0724/ruramps4d-ramps-for-adruino-due-the-pilot-shipment-available-for-zack/ --- Marlin/src/core/boards.h | 1 + Marlin/src/pins/pins.h | 2 + Marlin/src/pins/pins_RAMPS_FD_V1.h | 4 +- Marlin/src/pins/pins_RURAMPS4D.h | 224 +++++++++++++++++++++++++++++ 4 files changed, 229 insertions(+), 2 deletions(-) create mode 100644 Marlin/src/pins/pins_RURAMPS4D.h diff --git a/Marlin/src/core/boards.h b/Marlin/src/core/boards.h index 2dd00d27d2..990cc1b910 100644 --- a/Marlin/src/core/boards.h +++ b/Marlin/src/core/boards.h @@ -174,6 +174,7 @@ #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_ARCHIM2 1590 // UltiMachine Archim2 (with TMC2130 drivers) #define BOARD_ALLIGATOR 1602 // Alligator Board R2 diff --git a/Marlin/src/pins/pins.h b/Marlin/src/pins/pins.h index 787018bd34..a6cf7e39a7 100644 --- a/Marlin/src/pins/pins.h +++ b/Marlin/src/pins/pins.h @@ -268,6 +268,8 @@ #include "pins_DUE3DOM_MINI.h" #elif MB(RADDS) #include "pins_RADDS.h" +#elif MB(RURAMPS4D) + #include "pins_RURAMPS4D.h" #elif MB(RAMPS_FD_V1) #include "pins_RAMPS_FD_V1.h" #elif MB(RAMPS_FD_V2) diff --git a/Marlin/src/pins/pins_RAMPS_FD_V1.h b/Marlin/src/pins/pins_RAMPS_FD_V1.h index 5cbf7fb196..3914ca1399 100644 --- a/Marlin/src/pins/pins_RAMPS_FD_V1.h +++ b/Marlin/src/pins/pins_RAMPS_FD_V1.h @@ -100,9 +100,9 @@ // SPI for Max6675 or Max31855 Thermocouple #if DISABLED(SDSUPPORT) - #define MAX6675_SS 53 + #define MAX6675_SS 53 #else - #define MAX6675_SS 49 + #define MAX6675_SS 49 #endif // diff --git a/Marlin/src/pins/pins_RURAMPS4D.h b/Marlin/src/pins/pins_RURAMPS4D.h new file mode 100644 index 0000000000..e19b0f7ca2 --- /dev/null +++ b/Marlin/src/pins/pins_RURAMPS4D.h @@ -0,0 +1,224 @@ +/** + * Marlin 3D Printer Firmware + * Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin] + * + * Based on Sprinter and grbl. + * Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation, either version 3 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . + * + * Ported sys0724 & Vynt + */ + +/** + * Arduino Mega? or Due with RuRAMPS4DUE pin assignments + * + * Applies to the following boards: + * RURAMPS4DUE (Hotend0, Hotend1, Hotend2, Fan0, Fan1, Bed) + * + * Differences between + * RADDS | RuRAMPS4DUE + * A13 | A9/D63 (shares the same pin with AUX2_4PIN) + * A14 | A10/D64 (shares the same pin with AUX2_5PIN) + * A15 | NC + */ + +#ifndef __SAM3X8E__ + #error "Oops! Make sure you have 'Arduino Due' selected from the 'Tools -> Boards' menu." +#endif + +#ifndef BOARD_NAME + #define BOARD_NAME "RuRAMPS4Due" +#endif + +#undef INVERTED_HEATER_PINS +#undef INVERTED_BED_PINS +#undef INVERTED_FAN_PINS + +#define I2C_EEPROM +//#define SPI_EEPROM + +// +// Servos +// +#define SERVO0_PIN 5 +#define SERVO1_PIN 3 +#define SERVO2_PIN -1 +#define SERVO3_PIN 1 + +// +// Limit Switches +// +#define X_MIN_PIN 45 +#define X_MAX_PIN 39 +#define Y_MIN_PIN 46 +#define Y_MAX_PIN 41 +#define Z_MIN_PIN 49 +#define Z_MAX_PIN 43 + +// +// Z Probe (when not Z_MIN_PIN) +// +#ifndef Z_MIN_PROBE_PIN + #define Z_MIN_PROBE_PIN 43 +#endif + +// +// Steppers +// +#define X_STEP_PIN 37 +#define X_DIR_PIN 36 +#define X_ENABLE_PIN 38 +#define X_CS_PIN -1 + +#define Y_STEP_PIN 32 +#define Y_DIR_PIN 35 +#define Y_ENABLE_PIN 34 +#define Y_CS_PIN -1 + +#define Z_STEP_PIN 30 +#define Z_DIR_PIN 2 +#define Z_ENABLE_PIN 33 +#define Z_CS_PIN -1 + +#define E0_STEP_PIN 29 +#define E0_DIR_PIN 28 +#define E0_ENABLE_PIN 31 +#define E0_CS_PIN -1 + +#define E1_STEP_PIN 22 +#define E1_DIR_PIN 24 +#define E1_ENABLE_PIN 26 +#define E1_CS_PIN -1 + +#define E2_STEP_PIN 25 //14 //sys0724 +#define E2_DIR_PIN 23 //15 +#define E2_ENABLE_PIN 27 //61 +#define E2_CS_PIN -1 + +// For Extension Board V2 +// http://doku.radds.org/dokumentation/extension-board +//#define E3_STEP_PIN 35 +//#define E3_DIR_PIN 33 +//#define E3_ENABLE_PIN 37 +//#define E3_CS_PIN 6 + +//#define Z2_STEP_PIN 29 +//#define Z2_DIR_PIN 27 +//#define Z2_ENABLE_PIN 31 +//#define Z2_CS_PIN 39 + +// Microstepping pins - Mapping not from fastio.h (?) +//#define E3_MS1_PIN 67 +//#define E3_MS2_PIN 68 +//#define E3_MS3_PIN 69 +//#define Z2_MS1_PIN 67 // shared with E3_MS1_PIN +//#define Z2_MS2_PIN 68 // shared with E3_MS2_PIN +//#define Z2_MS3_PIN 69 // shared with E3_MS3_PIN + +// +// Temperature Sensors +// +#define TEMP_0_PIN 0 // ANALOG NUMBERING #54 +#define TEMP_1_PIN 1 // ANALOG NUMBERING #55 +#define TEMP_2_PIN 2 // ANALOG NUMBERING #56 +#define TEMP_3_PIN 3 // ANALOG NUMBERING #57 +#define TEMP_BED_PIN 4 // ANALOG NUMBERING #58 + +/* +// SPI for Max6675 or Max31855 Thermocouple +#if DISABLED(SDSUPPORT) + #define MAX6675_SS 53 +#else + #define MAX6675_SS 49 +#endif +*/ + +// +// Heaters / Fans +// +#define HEATER_0_PIN 13 +#define HEATER_1_PIN 12 +#define HEATER_2_PIN 11 +#define HEATER_BED_PIN 7 // BED H1 + +#define FAN_PIN 9 +#define FAN1_PIN 8 + +// +// Misc. Functions +// +#define SDSS 4 // 4,10,52 if using HW SPI. +#define LED_PIN 13 + +//#define FIL_RUNOUT_PIN Y_MIN_PIN + +// +// LCD / Controller +// +#if ENABLED(ULTRA_LCD) + // RADDS LCD panel + #if ENABLED(RADDS_DISPLAY) || ENABLED(REPRAP_DISCOUNT_SMART_CONTROLLER) + #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 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 + + #define BTN_EN1 44 //! + #define BTN_EN2 42 //! + #define BTN_ENC 40 + #define SD_DETECT_PIN 51 + + #elif ENABLED(SSD1306_OLED_I2C_CONTROLLER) + + #define BTN_EN1 44 //? + #define BTN_EN2 42 //? + #define BTN_ENC 40 //? + #define SD_DETECT_PIN 51 //? + + #define BEEPER_PIN 62 //? + #define LCD_SDSS 10 //? + + #elif ENABLED(SPARK_FULL_GRAPHICS) //!!! - check! + + #define LCD_PINS_D4 29 + #define LCD_PINS_ENABLE 27 + #define LCD_PINS_RS 25 + #define BTN_EN1 35 + #define BTN_EN2 33 + #define BTN_ENC 37 + + #endif // SPARK_FULL_GRAPHICS + +#endif // ULTRA_LCD