CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Pins updates

Browse Source
This commit is contained in:
Scott Lahteine 2017-09-06 06:28:32 -05:00
parent 3d8a0ab4b2
commit 82fff87e16
5 changed files with 35 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Marlin/src/pins/pins.h
View File

@ -35,11 +35,19 @@
#ifndef __PINS_H__
#define __PINS_H__
#define IS_RAMPS_EFB (MB(RAMPS_13_EFB) || MB(RAMPS_14_EFB) || MB(RAMPS_14_RE_ARM_EFB) || MB(RAMPS_SMART_EFB) || MB(RAMPS_DUO_EFB) || MB(RAMPS4DUE_EFB))
#define IS_RAMPS_EEB (MB(RAMPS_13_EEB) || MB(RAMPS_14_EEB) || MB(RAMPS_14_RE_ARM_EEB) || MB(RAMPS_SMART_EEB) || MB(RAMPS_DUO_EEB) || MB(RAMPS4DUE_EEB))
#define IS_RAMPS_EFF (MB(RAMPS_13_EFF) || MB(RAMPS_14_EFF) || MB(RAMPS_14_RE_ARM_EFF) || MB(RAMPS_SMART_EFF) || MB(RAMPS_DUO_EFF) || MB(RAMPS4DUE_EFF))
#define IS_RAMPS_EEF (MB(RAMPS_13_EEF) || MB(RAMPS_14_EEF) || MB(RAMPS_14_RE_ARM_EEF) || MB(RAMPS_SMART_EEF) || MB(RAMPS_DUO_EEF) || MB(RAMPS4DUE_EEF))
#define IS_RAMPS_SF (MB(RAMPS_13_SF) || MB(RAMPS_14_SF) || MB(RAMPS_14_RE_ARM_SF) || MB(RAMPS_SMART_SF) || MB(RAMPS_DUO_SF) || MB(RAMPS4DUE_SF) )
#include "../inc/MarlinConfig.h"
#if MB(RAMPS_13_EFB) || MB(RAMPS_14_EFB) || MB(RAMPS_14_RE_ARM_EFB) || MB(RAMPS_SMART_EFB) || MB(RAMPS_DUO_EFB) || MB(RAMPS4DUE_EFB)
#define IS_RAMPS_EFB
#elif MB(RAMPS_13_EEB) || MB(RAMPS_14_EEB) || MB(RAMPS_14_RE_ARM_EEB) || MB(RAMPS_SMART_EEB) || MB(RAMPS_DUO_EEB) || MB(RAMPS4DUE_EEB)
#define IS_RAMPS_EEB
#elif MB(RAMPS_13_EFF) || MB(RAMPS_14_EFF) || MB(RAMPS_14_RE_ARM_EFF) || MB(RAMPS_SMART_EFF) || MB(RAMPS_DUO_EFF) || MB(RAMPS4DUE_EFF)
#define IS_RAMPS_EFF
#elif MB(RAMPS_13_EEF) || MB(RAMPS_14_EEF) || MB(RAMPS_14_RE_ARM_EEF) || MB(RAMPS_SMART_EEF) || MB(RAMPS_DUO_EEF) || MB(RAMPS4DUE_EEF)
#define IS_RAMPS_EEF
#elif MB(RAMPS_13_SF) || MB(RAMPS_14_SF) || MB(RAMPS_14_RE_ARM_SF) || MB(RAMPS_SMART_SF) || MB(RAMPS_DUO_SF) || MB(RAMPS4DUE_SF)
#define IS_RAMPS_SF
#endif
//
// RAMPS 1.3 / 1.4 - ATmega1280, ATmega2560
@ -254,7 +262,7 @@
#include "pins_DUE3DOM_MINI.h"
#elif MB(RADDS)
#include "pins_RADDS.h"
#elif MB(RAMPS_FD_V1)
#elif MB(RAMPS_FD)
#include "pins_RAMPS_FD.h"
#elif MB(RAMPS_FD_V2)
#include "pins_RAMPS_FD_V2.h"
@ -290,9 +298,6 @@
#include "pins_RAMPS4DUE.h"
#elif MB(ALLIGATOR)
#include "pins_ALLIGATOR_R2.h"
#elif MB(RAMPS_FD_V1) || MB(RAMPS_FD_V2)
#include "pins_RAMPS_FD_v1.h"
#else
#error "Unknown MOTHERBOARD value set in Configuration.h"
#endif
@ -670,7 +675,6 @@
// Note: default SPI pins are defined in the HAL
#include "src/HAL/HAL_spi_pins.h"
#include "../HAL/HAL_spi_pins.h"
#endif // __PINS_H__

2
Marlin/src/pins/pinsDebug.h
View File

@ -102,7 +102,7 @@ const PinInfo pin_array[] PROGMEM = {
};
#include "src/HAL/HAL_pinsDebug.h" // get the correct support file for this CPU
#include "../HAL/HAL_pinsDebug.h" // get the correct support file for this CPU
static void print_input_or_output(const bool isout) {

2
Marlin/src/pins/pins_RAMPS.h
View File

@ -63,7 +63,7 @@
//
// Servos
//
#ifdef IS_RAMPS_13
#if ENABLED(IS_RAMPS_13)
#define SERVO0_PIN 7 // RAMPS_13 // Will conflict with BTN_EN2 on LCD_I2C_VIKI
#else
#define SERVO0_PIN 11

12
Marlin/src/pins/pins_RUMBA.h
View File

@ -153,6 +153,12 @@
//
// M3/M4/M5 - Spindle/Laser Control
//
#define SPINDLE_LASER_PWM_PIN 4 // MUST BE HARDWARE PWM
#define SPINDLE_LASER_ENABLE_PIN 14 // Pin should have a pullup!
#define SPINDLE_DIR_PIN 15
#ifndef SPINDLE_LASER_PWM_PIN
#define SPINDLE_LASER_PWM_PIN 4 // MUST BE HARDWARE PWM. Pin 4 interrupts OC0* and OC1* always in use?
#endif
#ifndef SPINDLE_LASER_ENABLE_PIN
#define SPINDLE_LASER_ENABLE_PIN 14 // Pin should have a pullup!
#endif
#ifndef SPINDLE_DIR_PIN
#define SPINDLE_DIR_PIN 15
#endif

18
Marlin/src/pins/pins_TEENSY35_36.h
View File

@ -62,17 +62,17 @@ D8 HEATER_BED_PIN CS1 RX4 A12 31 | 46 * * 47 | 34 A15 PWM
*/
#define X_STEP_PIN 22
#define X_DIR_PIN 21
#define X_ENABLE_PIN 39
#define X_STEP_PIN 22
#define X_DIR_PIN 21
#define X_ENABLE_PIN 39
#define Y_STEP_PIN 19
#define Y_DIR_PIN 18
#define Y_ENABLE_PIN 20
#define Y_STEP_PIN 19
#define Y_DIR_PIN 18
#define Y_ENABLE_PIN 20
#define Z_STEP_PIN 38
#define Z_DIR_PIN 37
#define Z_ENABLE_PIN 17
#define Z_STEP_PIN 38
#define Z_DIR_PIN 37
#define Z_ENABLE_PIN 17
#define E0_STEP_PIN 31
#define E0_DIR_PIN 30