Fix and follow-up the PR #4955 (PINS_DEBUGGING and M43: Read pin states), etc
This commit is contained in:
Scott Lahteine 2016-10-10 13:27:52 -05:00 committed by GitHub
commit a07033a6c1
51 changed files with 742 additions and 487 deletions

View file

@ -4700,7 +4700,7 @@ inline void gcode_M42() {
pin_state[pin - first_pin] = digitalRead(pin); pin_state[pin - first_pin] = digitalRead(pin);
} }
#if ENABLED(EMERGENCY_PARSER) #if ENABLED(EMERGENCY_PARSER) && DISABLED(ULTIPANEL)
wait_for_user = true; wait_for_user = true;
#endif #endif
@ -4718,7 +4718,7 @@ inline void gcode_M42() {
} }
} }
#if ENABLED(EMERGENCY_PARSER) #if ENABLED(EMERGENCY_PARSER) && DISABLED(ULTIPANEL)
if (!wait_for_user) break; if (!wait_for_user) break;
#endif #endif

View file

@ -36,7 +36,7 @@
#define _PIN_SAY(NAME) { SERIAL_ECHOPGM(STRINGIFY(NAME)); return true; } #define _PIN_SAY(NAME) { SERIAL_ECHOPGM(STRINGIFY(NAME)); return true; }
#define PIN_SAY(NAME) if (pin == NAME) _PIN_SAY(_##NAME##_); #define PIN_SAY(NAME) if (pin == NAME) _PIN_SAY(_##NAME##_);
#define ANALOG_PIN_SAY(NAME) if (pin == analogInputToDigitalPin(NAME)) _PIN_SAY(_##NAME##_); #define ANALOG_PIN_SAY(NAME) if (pin == analogInputToDigitalPin(NAME)) _PIN_SAY(_##NAME##_);
#define IS_ANALOG(P) if ((P) >= analogInputToDigitalPin(0) && ((P) <= analogInputToDigitalPin(15) || (P) <= analogInputToDigitalPin(5))) #define IS_ANALOG(P) ((P) >= analogInputToDigitalPin(0) && ((P) <= analogInputToDigitalPin(15) || (P) <= analogInputToDigitalPin(5)))
// Report pin name for a given fastio digital pin index // Report pin name for a given fastio digital pin index
static bool report_pin_name(int8_t pin) { static bool report_pin_name(int8_t pin) {

View file

@ -36,6 +36,9 @@
#define DEFAULT_SOURCE_CODE_URL "http://3dprint.elettronicain.it/" #define DEFAULT_SOURCE_CODE_URL "http://3dprint.elettronicain.it/"
#endif #endif
//
// Heaters / Fans
//
#define RAMPS_D8_PIN 9 #define RAMPS_D8_PIN 9
#define RAMPS_D9_PIN 8 #define RAMPS_D9_PIN 8
#define MOSFET_D_PIN 12 #define MOSFET_D_PIN 12
@ -55,7 +58,12 @@
#define Z_ENABLE_PIN 63 #define Z_ENABLE_PIN 63
// //
// SD Card // Heaters / Fans
//
#define HEATER_2_PIN 6
//
// Misc. Functions
// //
#undef SDSS #undef SDSS
#define SDSS 25 #define SDSS 25
@ -63,11 +71,6 @@
#undef SD_DETECT_PIN #undef SD_DETECT_PIN
#define SD_DETECT_PIN 53 #define SD_DETECT_PIN 53
//
// Heaters / Fans
//
#define HEATER_2_PIN 6
// //
// LCD / Controller // LCD / Controller
// //

View file

@ -89,6 +89,6 @@
#define FAN_PIN 16 #define FAN_PIN 16
// //
// SD Card // Misc. Functions
// //
#define SDSS 20 #define SDSS 20

View file

@ -64,5 +64,8 @@
#define HEATER_0_PIN 13 #define HEATER_0_PIN 13
#define HEATER_BED_PIN 4 #define HEATER_BED_PIN 4
//
// Misc. Functions
//
#define SDSS 53 #define SDSS 53
#define PS_ON_PIN 9 #define PS_ON_PIN 9

View file

@ -30,6 +30,12 @@
#define BOARD_NAME "AJ4P" #define BOARD_NAME "AJ4P"
#define LARGE_FLASH true
/************************************************
* Rambo pin assignments old
************************************************/
// //
// Servos // Servos
// //
@ -38,16 +44,6 @@
#define SERVO2_PIN 24 // Motor header MX3 #define SERVO2_PIN 24 // Motor header MX3
#define SERVO3_PIN 5 // PWM header pin 5 #define SERVO3_PIN 5 // PWM header pin 5
#define SLED_PIN -1
#define FILWIDTH_PIN 3 // Analog Input
/************************************************
* Rambo pin assignments old
************************************************/
#define LARGE_FLASH true
// //
// Limit Switches // Limit Switches
// //
@ -65,42 +61,52 @@
#define Z_MIN_PROBE_PIN 30 #define Z_MIN_PROBE_PIN 30
#endif #endif
#define SLED_PIN -1
// //
// Steppers // Steppers
// //
#define X_STEP_PIN 37 #define X_STEP_PIN 37
#define X_DIR_PIN 48 #define X_DIR_PIN 48
#define X_ENABLE_PIN 29 #define X_ENABLE_PIN 29
#define X_MS1_PIN 40
#define X_MS2_PIN 41
#define Y_STEP_PIN 36 #define Y_STEP_PIN 36
#define Y_DIR_PIN 49 #define Y_DIR_PIN 49
#define Y_ENABLE_PIN 28 #define Y_ENABLE_PIN 28
#define Y_MS1_PIN 69
#define Y_MS2_PIN 39
#define Z_STEP_PIN 35 #define Z_STEP_PIN 35
#define Z_DIR_PIN 47 #define Z_DIR_PIN 47
#define Z_ENABLE_PIN 27 #define Z_ENABLE_PIN 27
#define Z_MS1_PIN 68
#define Z_MS2_PIN 67
#define E0_STEP_PIN 34 #define E0_STEP_PIN 34
#define E0_DIR_PIN 43 #define E0_DIR_PIN 43
#define E0_ENABLE_PIN 26 #define E0_ENABLE_PIN 26
#define E0_MS1_PIN 65
#define E0_MS2_PIN 66
#define E1_STEP_PIN 33 #define E1_STEP_PIN 33
#define E1_DIR_PIN 42 #define E1_DIR_PIN 42
#define E1_ENABLE_PIN 25 #define E1_ENABLE_PIN 25
// Microstepping pins - Mapping not from fastio.h (?)
#define X_MS1_PIN 40
#define X_MS2_PIN 41
#define Y_MS1_PIN 69
#define Y_MS2_PIN 39
#define Z_MS1_PIN 68
#define Z_MS2_PIN 67
#define E0_MS1_PIN 65
#define E0_MS2_PIN 66
#define E1_MS1_PIN 63 #define E1_MS1_PIN 63
#define E1_MS2_PIN 64 #define E1_MS2_PIN 64
#define DIGIPOTSS_PIN 38 #define DIGIPOTSS_PIN 38
#define DIGIPOT_CHANNELS {4,5,3,0,1} // X Y Z E0 E1 digipot channels to stepper driver mapping #define DIGIPOT_CHANNELS {4,5,3,0,1} // X Y Z E0 E1 digipot channels to stepper driver mapping
//
// Temperature Sensors
//
#define TEMP_0_PIN 0 // Analog Input
#define TEMP_BED_PIN 7 // Analog Input
// //
// Heaters / Fans // Heaters / Fans
// //
@ -112,31 +118,32 @@
#define FAN0_PIN 6 #define FAN0_PIN 6
#define FAN1_PIN 2 #define FAN1_PIN 2
#define TEMP_0_PIN 0 // Analog Input //
#define TEMP_BED_PIN 7 // Analog Input // Misc. Functions
//
#define SDSS 53 #define SDSS 53
#define LED_PIN 13 #define LED_PIN 13
#define PS_ON_PIN 4 #define PS_ON_PIN 4
#define FILWIDTH_PIN 3 // Analog Input
// //
// LCD / Controller // LCD / Controller
// //
#define LCD_PINS_RS 70 //ext2_5 #define LCD_PINS_RS 70 // Ext2_5
#define LCD_PINS_ENABLE 71 //ext2_7 #define LCD_PINS_ENABLE 71 // Ext2_7
#define LCD_PINS_D4 72 ///////Ext2 9 ? #define LCD_PINS_D4 72 // Ext2_9 ?
#define LCD_PINS_D5 73 ///////Ext2 11 ? #define LCD_PINS_D5 73 // Ext2_11 ?
#define LCD_PINS_D6 74 //ext2_13 #define LCD_PINS_D6 74 // Ext2_13
#define LCD_PINS_D7 75 ///////Ext2 15 ? #define LCD_PINS_D7 75 // Ext2_15 ?
#define BEEPER_PIN -1 #define BEEPER_PIN -1
#define BTN_HOME 80 //ext_16 #define BTN_HOME 80 // Ext_16
#define BTN_CENTER 81 //ext_14 #define BTN_CENTER 81 // Ext_14
#define BTN_ENC BTN_CENTER #define BTN_ENC BTN_CENTER
#define BTN_RIGHT 82 //ext_12 #define BTN_RIGHT 82 // Ext_12
#define BTN_LEFT 83 //ext_10 #define BTN_LEFT 83 // Ext_10
#define BTN_UP 84 //ext2_8 #define BTN_UP 84 // Ext2_8
#define BTN_DOWN 85 //ext2_6 #define BTN_DOWN 85 // Ext2_6
#define HOME_PIN BTN_HOME #define HOME_PIN BTN_HOME

View file

@ -32,6 +32,9 @@
#include "pins_RAMPS_13.h" #include "pins_RAMPS_13.h"
//
// LCD / Controller
//
#if ENABLED(VIKI2) || ENABLED(miniVIKI) #if ENABLED(VIKI2) || ENABLED(miniVIKI)
#undef DOGLCD_A0 #undef DOGLCD_A0

View file

@ -28,6 +28,8 @@
#include "pins_RAMPS.h" #include "pins_RAMPS.h"
//
// Servos
// //
// Tested this pin with bed leveling on a Delta with 1 servo. // Tested this pin with bed leveling on a Delta with 1 servo.
// Physical wire attachment on EXT1: GND, 5V, D47. // Physical wire attachment on EXT1: GND, 5V, D47.
@ -35,6 +37,8 @@
#undef SERVO0_PIN #undef SERVO0_PIN
#define SERVO0_PIN 47 #define SERVO0_PIN 47
//
// Limit Switches
// //
// Swap the MIN and MAX endstop pins because the X3 Pro comes with only // Swap the MIN and MAX endstop pins because the X3 Pro comes with only
// MIN endstop pin headers soldered onto the board. // MIN endstop pin headers soldered onto the board.
@ -80,11 +84,11 @@
// //
// Temperature Sensors // Temperature Sensors
// //
#define TEMP_2_PIN 12 // ANALOG NUMBERING #define TEMP_2_PIN 12 // Analog Input
#define TEMP_3_PIN 11 // ANALOG NUMBERING #define TEMP_3_PIN 11 // Analog Input
#define TEMP_4_PIN 10 // ANALOG NUMBERING #define TEMP_4_PIN 10 // Analog Input
#define TC1 4 // ANALOG NUMBERING Thermo couple on Azteeg X3Pro #define TC1 4 // Analog Input (Thermo couple on Azteeg X3Pro)
#define TC2 5 // ANALOG NUMBERING Thermo couple on Azteeg X3Pro #define TC2 5 // Analog Input (Thermo couple on Azteeg X3Pro)
// //
// Heaters / Fans // Heaters / Fans

View file

@ -32,6 +32,9 @@
#include "pins_RAMPS.h" #include "pins_RAMPS.h"
//
// Temperature Sensors
//
#undef TEMP_0_PIN #undef TEMP_0_PIN
#undef TEMP_1_PIN #undef TEMP_1_PIN
#define TEMP_0_PIN 9 // Analog Input #define TEMP_0_PIN 9 // Analog Input

View file

@ -30,6 +30,9 @@
#define BOARD_NAME "ZUM Mega 3D" #define BOARD_NAME "ZUM Mega 3D"
//
// Heaters / Fans
//
#define RAMPS_D8_PIN 10 #define RAMPS_D8_PIN 10
#define RAMPS_D9_PIN 12 #define RAMPS_D9_PIN 12
#define RAMPS_D10_PIN 9 #define RAMPS_D10_PIN 9
@ -37,23 +40,38 @@
#include "pins_RAMPS_13.h" #include "pins_RAMPS_13.h"
//
// Limit Switches
//
#undef X_MAX_PIN #undef X_MAX_PIN
#define X_MAX_PIN 79 // 2 #define X_MAX_PIN 79 // 2
//
// Z Probe (when not Z_MIN_PIN)
//
#undef Z_MIN_PROBE_PIN #undef Z_MIN_PROBE_PIN
#define Z_MIN_PROBE_PIN 19 // IND_S_5V #define Z_MIN_PROBE_PIN 19 // IND_S_5V
#undef Z_ENABLE_PIN #undef Z_ENABLE_PIN
#define Z_ENABLE_PIN 77 // 62 #define Z_ENABLE_PIN 77 // 62
#undef TEMP_1_PIN //
#define TEMP_1_PIN 14 // 15 // Steppers
//
#undef TEMP_BED_PIN
#define TEMP_BED_PIN 15 // 14
#define DIGIPOTSS_PIN 22 #define DIGIPOTSS_PIN 22
#define DIGIPOT_CHANNELS { 4, 5, 3, 0, 1 } #define DIGIPOT_CHANNELS { 4, 5, 3, 0, 1 }
//
// Temperature Sensors
//
#undef TEMP_1_PIN
#define TEMP_1_PIN 14 // Analog Input (15)
#undef TEMP_BED_PIN
#define TEMP_BED_PIN 15 // Analog Input (14)
//
// Misc. Functions
//
#undef PS_ON_PIN // 12 #undef PS_ON_PIN // 12
#define PS_ON_PIN 81 // External Power Supply #define PS_ON_PIN 81 // External Power Supply

View file

@ -76,6 +76,10 @@
// //
#define HEATER_0_PIN 4 // Extruder #define HEATER_0_PIN 4 // Extruder
#define HEATER_BED_PIN 38 // Bed #define HEATER_BED_PIN 38 // Bed
#define FAN_PIN 3 // Fan #define FAN_PIN 3 // Fan
//
// Misc. Functions
//
#define LED_PIN 39 #define LED_PIN 39

View file

@ -90,9 +90,8 @@
#define FAN_PIN 16 // Fan, PWM #define FAN_PIN 16 // Fan, PWM
// //
// LCD / Controller // Misc. Functions
// //
#define SDSS 20 #define SDSS 20
#define SD_DETECT_PIN 12 #define SD_DETECT_PIN 12
#define LED_PIN 19 #define LED_PIN 19

View file

@ -75,6 +75,9 @@
#define HEATER_1_PIN 23 // EXTRUDER 2 #define HEATER_1_PIN 23 // EXTRUDER 2
#define HEATER_BED_PIN 22 #define HEATER_BED_PIN 22
//
// LCD / Controller
//
// Cheaptronic v1.0 doesn't support LCD // Cheaptronic v1.0 doesn't support LCD
#define LCD_PINS_RS -1 #define LCD_PINS_RS -1
#define LCD_PINS_ENABLE -1 #define LCD_PINS_ENABLE -1

View file

@ -56,6 +56,7 @@
#define TEMP_2_PIN 2 // Analog Input. 9 for tool3 -> 2 for chambertemp #define TEMP_2_PIN 2 // Analog Input. 9 for tool3 -> 2 for chambertemp
#define TEMP_3_PIN 11 // Analog Input. 11 for tool4 -> 2 for chambertemp #define TEMP_3_PIN 11 // Analog Input. 11 for tool4 -> 2 for chambertemp
#define TEMP_BED_PIN 1 // Analog Input #define TEMP_BED_PIN 1 // Analog Input
//#define TEMP_CHAMBER_PIN 2 // Analog Input
// //
// Heaters / Fans // Heaters / Fans
@ -66,6 +67,14 @@
#define HEATER_3_PIN 46 #define HEATER_3_PIN 46
#define HEATER_BED_PIN 2 #define HEATER_BED_PIN 2
//#define FAN_PIN 7 // common PWM pin for all tools
//
// Misc. Functions
//
#define SDSS 53
#define SD_DETECT_PIN 13
// Tools // Tools
//#define TOOL_0_PIN 4 //#define TOOL_0_PIN 4
@ -76,18 +85,10 @@
// Common I/O // Common I/O
//#define TEMP_CHAMBER_PIN 2 // ANALOG INPUT !!
//#define FIL_RUNOUT_PIN -1 //#define FIL_RUNOUT_PIN -1
//#define PWM_1_PIN 11 //#define PWM_1_PIN 11
//#define PWM_2_PIN 10 //#define PWM_2_PIN 10
//#define SPARE_IO 12 //#define SPARE_IO 12
//#define FAN_PIN 7 // common PWM pin for all tools
//
// SD Card
//
#define SDSS 53
#define SD_DETECT_PIN 13
// //
// LCD / Controller // LCD / Controller
@ -112,8 +113,5 @@
//#define UI1 31 //#define UI1 31
//#define UI2 22 //#define UI2 22
//
// Misc. Functions
//
#define STAT_LED_BLUE_PIN -1 #define STAT_LED_BLUE_PIN -1
#define STAT_LED_RED_PIN 31 #define STAT_LED_RED_PIN 31

View file

@ -69,9 +69,11 @@
#define FAN_PIN 5 // 5 is PWMtool3 -> 7 is common PWM pin for all tools #define FAN_PIN 5 // 5 is PWMtool3 -> 7 is common PWM pin for all tools
//#define PWM_1_PIN 12 //
//#define PWM_2_PIN 13 // Misc. Functions
//#define SPARE_IO 17 //
#define SDSS 53
#define SD_DETECT_PIN 15
// Tools // Tools
@ -86,6 +88,11 @@
// Common I/O // Common I/O
#define FIL_RUNOUT_PIN 18
//#define PWM_1_PIN 12
//#define PWM_2_PIN 13
//#define SPARE_IO 17
// //
// LCD / Controller // LCD / Controller
// //
@ -113,12 +120,3 @@
#define STAT_LED_BLUE_PIN -1 #define STAT_LED_BLUE_PIN -1
#define STAT_LED_RED_PIN 10 // TOOL_0_PWM_PIN #define STAT_LED_RED_PIN 10 // TOOL_0_PWM_PIN
//
// SD Card
//
#define SDSS 53
#define SD_DETECT_PIN 15
// Other
#define FIL_RUNOUT_PIN 18

View file

@ -30,16 +30,25 @@
#define BOARD_NAME "Felix 2.0+" #define BOARD_NAME "Felix 2.0+"
//
// Heaters / Fans
//
// Power outputs EFBF or EFBE // Power outputs EFBF or EFBE
#define MOSFET_D_PIN 7 #define MOSFET_D_PIN 7
#include "pins_RAMPS.h" #include "pins_RAMPS.h"
//
// Misc. Functions
//
#undef SDPOWER #undef SDPOWER
#define SDPOWER 1 #define SDPOWER 1
#define PS_ON_PIN 12 #define PS_ON_PIN 12
//
// LCD / Controller
//
#if ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL) #if ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL)
#define SD_DETECT_PIN 6 #define SD_DETECT_PIN 6

View file

@ -68,7 +68,7 @@
#define HEATER_0_PIN 16 #define HEATER_0_PIN 16
// //
// Etc. // Misc. Functions
// //
#define PS_ON_PIN 14 // Alex, does this work on the card? #define PS_ON_PIN 14 // Alex, does this work on the card?

View file

@ -56,8 +56,6 @@
#define E0_DIR_PIN 21 #define E0_DIR_PIN 21
#define E0_ENABLE_PIN 13 #define E0_ENABLE_PIN 13
#define PS_ON_PIN 14
// //
// Temperature Sensors // Temperature Sensors
// //
@ -71,6 +69,8 @@
#define HEATER_BED_PIN 16 #define HEATER_BED_PIN 16
// //
// SD Card // Misc. Functions
// //
#define SDSS 4 #define SDSS 4
#define PS_ON_PIN 14

View file

@ -75,14 +75,10 @@
#define TEMP_BED_PIN 0 // Analog Input #define TEMP_BED_PIN 0 // Analog Input
#endif #endif
//
// SD Card
//
#define SDSS 17
// //
// Misc. Functions // Misc. Functions
// //
#define SDSS 17
#define DEBUG_PIN 0 #define DEBUG_PIN 0
// RS485 pins // RS485 pins

View file

@ -70,6 +70,9 @@
#define HEATER_0_PIN 4 #define HEATER_0_PIN 4
#define HEATER_BED_PIN 3 #define HEATER_BED_PIN 3
//
// Misc. Functions
//
#define PS_ON_PIN 15 #define PS_ON_PIN 15
// A pin for debugging // A pin for debugging

View file

@ -71,13 +71,18 @@
#define HEATER_0_PIN 4 #define HEATER_0_PIN 4
#define HEATER_BED_PIN 3 // (bed) #define HEATER_BED_PIN 3 // (bed)
//
// Misc. Functions
//
#define SDSS 31 // SCL pin of I2C header || CS Pin for SD Card support #define SDSS 31 // SCL pin of I2C header || CS Pin for SD Card support
#define PS_ON_PIN 19 #define PS_ON_PIN 19
// A pin for debugging // A pin for debugging
#define DEBUG_PIN -1 #define DEBUG_PIN -1
//
// LCD / Controller
//
#define BEEPER_PIN -1 #define BEEPER_PIN -1
// 4bit LCD Support // 4bit LCD Support

View file

@ -37,18 +37,31 @@
#include "pins_3DRAG.h" #include "pins_3DRAG.h"
#undef X_MAX_PIN //
#undef X_MIN_PIN // Limit Switches
#undef Y_MAX_PIN //
#undef Y_MIN_PIN
#define X_STOP_PIN 3 #define X_STOP_PIN 3
#define Y_STOP_PIN 14 #define Y_STOP_PIN 14
#undef X_MIN_PIN
#undef X_MAX_PIN
#undef Y_MIN_PIN
#undef Y_MAX_PIN
//
// Steppers
//
#undef E1_STEP_PIN #undef E1_STEP_PIN
#define E1_STEP_PIN 32 #define E1_STEP_PIN 32
#undef PS_ON_PIN //
#undef KILL_PIN // Heaters / Fans
//
#undef HEATER_1_PIN #undef HEATER_1_PIN
#define HEATER_1_PIN 11 #define HEATER_1_PIN 11
//
// Misc. Functions
//
#undef PS_ON_PIN
#undef KILL_PIN

View file

@ -63,14 +63,6 @@
#define E1_DIR_PIN 40 // 40 #define E1_DIR_PIN 40 // 40
#define E1_ENABLE_PIN 36 // 36 #define E1_ENABLE_PIN 36 // 36
//
// Misc. Functions
//
#define SDSS 11
#define LED_PIN 13
#define SOL1_PIN 16
#define SOL2_PIN 17
// //
// Temperature Sensors // Temperature Sensors
// //
@ -88,5 +80,12 @@
#define FAN_PIN 7 #define FAN_PIN 7
/* Unused (1) (2) (3) 4 5 6 7 8 9 10 11 12 13 (14) (15) (16) 17 (18) (19) (20) (21) (22) (23) 24 (25) (26) (27) 28 (29) (30) (31) */ //
// Misc. Functions
//
#define SDSS 11
#define LED_PIN 13
#define SOL1_PIN 16
#define SOL2_PIN 17
/* Unused (1) (2) (3) 4 5 6 7 8 9 10 11 12 13 (14) (15) (16) 17 (18) (19) (20) (21) (22) (23) 24 (25) (26) (27) 28 (29) (30) (31) */

View file

@ -82,12 +82,6 @@
#define E1_DIR_PIN 27 #define E1_DIR_PIN 27
#define E1_ENABLE_PIN 25 #define E1_ENABLE_PIN 25
//
// Misc. Functions
//
#define SDSS 53
#define LED_PIN 13
// //
// Temperature Sensors // Temperature Sensors
// //
@ -126,6 +120,12 @@
#define FAN_SOFT_PWM #define FAN_SOFT_PWM
//
// Misc. Functions
//
#define SDSS 53
#define LED_PIN 13
// //
// LCD / Controller // LCD / Controller
// //
@ -150,4 +150,3 @@
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN 49
#endif // MINIPANEL #endif // MINIPANEL

View file

@ -71,13 +71,6 @@
#define E1_DIR_PIN 36 #define E1_DIR_PIN 36
#define E1_ENABLE_PIN 30 #define E1_ENABLE_PIN 30
//
// Misc. Functions
//
#define SDSS 53
#define LED_PIN 13
#define PS_ON_PIN 12
// //
// Temperature Sensors // Temperature Sensors
// //
@ -98,6 +91,13 @@
#define FAN_PIN 7 // IO pin. Buffer needed #define FAN_PIN 7 // IO pin. Buffer needed
//
// Misc. Functions
//
#define SDSS 53
#define LED_PIN 13
#define PS_ON_PIN 12
// //
// LCD / Controller // LCD / Controller
// //

View file

@ -75,13 +75,6 @@
#define E2_DIR_PIN 24 #define E2_DIR_PIN 24
#define E2_ENABLE_PIN 22 #define E2_ENABLE_PIN 22
//
// Misc. Functions
//
#define SDSS 53
#define LED_PIN 13
#define PS_ON_PIN 12
// //
// Temperature Sensors // Temperature Sensors
// //
@ -113,6 +106,13 @@
#define FAN_PIN 7 #define FAN_PIN 7
#define FAN1_PIN 6 #define FAN1_PIN 6
//
// Misc. Functions
//
#define SDSS 53
#define LED_PIN 13
#define PS_ON_PIN 12
// //
// LCD / Controller // LCD / Controller
// //

View file

@ -63,6 +63,8 @@
#define Z_MIN_PROBE_PIN 19 #define Z_MIN_PROBE_PIN 19
#endif #endif
#define SLED_PIN -1
// //
// Steppers // Steppers
// //
@ -90,14 +92,6 @@
#define E2_DIR_PIN 60 #define E2_DIR_PIN 60
#define E2_ENABLE_PIN 23 #define E2_ENABLE_PIN 23
//
// Misc. Functions
//
#define SDSS 53
#define LED_PIN 13
#define PS_ON_PIN 12
#define SLED_PIN -1
// //
// Temperature Sensors // Temperature Sensors
// //
@ -133,6 +127,13 @@
#define FAN_PIN 6 #define FAN_PIN 6
#define FAN1_PIN 7 #define FAN1_PIN 7
//
// Misc. Functions
//
#define SDSS 53
#define LED_PIN 13
#define PS_ON_PIN 12
// //
// LCD / Controller // LCD / Controller
// //

View file

@ -54,31 +54,33 @@
#define X_STEP_PIN 37 #define X_STEP_PIN 37
#define X_DIR_PIN 48 #define X_DIR_PIN 48
#define X_ENABLE_PIN 29 #define X_ENABLE_PIN 29
#define X_MS1_PIN 40
#define X_MS2_PIN 41
#define Y_STEP_PIN 36 #define Y_STEP_PIN 36
#define Y_DIR_PIN 49 #define Y_DIR_PIN 49
#define Y_ENABLE_PIN 28 #define Y_ENABLE_PIN 28
#define Y_MS1_PIN 69
#define Y_MS2_PIN 39
#define Z_STEP_PIN 35 #define Z_STEP_PIN 35
#define Z_DIR_PIN 47 #define Z_DIR_PIN 47
#define Z_ENABLE_PIN 27 #define Z_ENABLE_PIN 27
#define Z_MS1_PIN 68
#define Z_MS2_PIN 67
#define E0_STEP_PIN 34 #define E0_STEP_PIN 34
#define E0_DIR_PIN 43 #define E0_DIR_PIN 43
#define E0_ENABLE_PIN 26 #define E0_ENABLE_PIN 26
#define E0_MS1_PIN 65
#define E0_MS2_PIN 66
#define E1_STEP_PIN -1 #define E1_STEP_PIN -1
#define E1_DIR_PIN -1 #define E1_DIR_PIN -1
#define E1_ENABLE_PIN -1 #define E1_ENABLE_PIN -1
// Microstepping pins - Mapping not from fastio.h (?)
#define X_MS1_PIN 40
#define X_MS2_PIN 41
#define Y_MS1_PIN 69
#define Y_MS2_PIN 39
#define Z_MS1_PIN 68
#define Z_MS2_PIN 67
#define E0_MS1_PIN 65
#define E0_MS2_PIN 66
#define MOTOR_CURRENT_PWM_XY_PIN 46 #define MOTOR_CURRENT_PWM_XY_PIN 46
#define MOTOR_CURRENT_PWM_Z_PIN 45 #define MOTOR_CURRENT_PWM_Z_PIN 45
#define MOTOR_CURRENT_PWM_E_PIN 44 #define MOTOR_CURRENT_PWM_E_PIN 44

View file

@ -71,9 +71,6 @@
// //
// Temperature Sensors // Temperature Sensors
// //
#define SDSS 16
#define LED_PIN 46
#define TEMP_0_PIN 7 // Analog Input #define TEMP_0_PIN 7 // Analog Input
#define TEMP_1_PIN 6 // Analog Input #define TEMP_1_PIN 6 // Analog Input
#define TEMP_BED_PIN 6 // Analog Input #define TEMP_BED_PIN 6 // Analog Input
@ -87,6 +84,12 @@
#define FAN_PIN 9 #define FAN_PIN 9
//
// Misc. Functions
//
#define SDSS 16
#define LED_PIN 46
// //
// LCD / Controller // LCD / Controller
// //

View file

@ -35,11 +35,17 @@
#define BOARD_NAME "MKS > v1.3" #define BOARD_NAME "MKS > v1.3"
//
// Heaters / Fans
//
// Power outputs EFBF or EFBE // Power outputs EFBF or EFBE
#define MOSFET_D_PIN 7 #define MOSFET_D_PIN 7
#include "pins_RAMPS.h" #include "pins_RAMPS.h"
//
// LCD / Controller
//
#if ENABLED(VIKI2) || ENABLED(miniVIKI) #if ENABLED(VIKI2) || ENABLED(miniVIKI)
/** /**
* VIKI2 Has two groups of wires with... * VIKI2 Has two groups of wires with...

View file

@ -30,6 +30,9 @@
#define BOARD_NAME "MKS BASE 1.0" #define BOARD_NAME "MKS BASE 1.0"
//
// Heaters / Fans
//
// Power outputs EFBF or EFBE // Power outputs EFBF or EFBE
#define MOSFET_D_PIN 7 #define MOSFET_D_PIN 7

View file

@ -57,33 +57,32 @@
#define BOARD_NAME "Final OMCA" #define BOARD_NAME "Final OMCA"
//
// Limit Switches
//
#define X_STOP_PIN 0
#define Y_STOP_PIN 1
#define Z_STOP_PIN 2
//
// Steppers
//
#define X_STEP_PIN 26 #define X_STEP_PIN 26
#define X_DIR_PIN 25 #define X_DIR_PIN 25
#define X_ENABLE_PIN 10 #define X_ENABLE_PIN 10
#define X_STOP_PIN 0
#define Y_STEP_PIN 28 #define Y_STEP_PIN 28
#define Y_DIR_PIN 27 #define Y_DIR_PIN 27
#define Y_ENABLE_PIN 10 #define Y_ENABLE_PIN 10
#define Y_STOP_PIN 1
#define Z_STEP_PIN 23 #define Z_STEP_PIN 23
#define Z_DIR_PIN 22 #define Z_DIR_PIN 22
#define Z_ENABLE_PIN 10 #define Z_ENABLE_PIN 10
#define Z_STOP_PIN 2
#define E0_STEP_PIN 24 #define E0_STEP_PIN 24
#define E0_DIR_PIN 21 #define E0_DIR_PIN 21
#define E0_ENABLE_PIN 10 #define E0_ENABLE_PIN 10
// future proofing
#define __FS 20
#define __FD 19
#define __GS 18
#define __GD 13
#define UNUSED_PWM 14 // PWM on LEFT connector
#define E1_STEP_PIN -1 // 21 #define E1_STEP_PIN -1 // 21
#define E1_DIR_PIN -1 // 20 #define E1_DIR_PIN -1 // 20
#define E1_ENABLE_PIN -1 // 19 #define E1_ENABLE_PIN -1 // 19
@ -92,16 +91,33 @@
#define E2_DIR_PIN -1 // 20 #define E2_DIR_PIN -1 // 20
#define E2_ENABLE_PIN -1 // 18 #define E2_ENABLE_PIN -1 // 18
#define SDSS 11 //
#define FAN_PIN 14 // PWM on MIDDLE connector // Temperature Sensors
//
#define HEATER_0_PIN 3 // DONE PWM on RIGHT connector
#define HEATER_BED_PIN 4
#define TEMP_0_PIN 0 // Analog Input #define TEMP_0_PIN 0 // Analog Input
#define TEMP_1_PIN 1 // Analog Input #define TEMP_1_PIN 1 // Analog Input
#define TEMP_BED_PIN 2 // Analog Input (1,2 or I2C) #define TEMP_BED_PIN 2 // Analog Input (1,2 or I2C)
//
// Heaters / Fans
//
#define HEATER_0_PIN 3 // DONE PWM on RIGHT connector
#define HEATER_BED_PIN 4
#define FAN_PIN 14 // PWM on MIDDLE connector
//
// Misc. Functions
//
#define SDSS 11
#define I2C_SCL 16 #define I2C_SCL 16
#define I2C_SDA 17 #define I2C_SDA 17
// future proofing
#define __FS 20
#define __FD 19
#define __GS 18
#define __GD 13
#define UNUSED_PWM 14 // PWM on LEFT connector

View file

@ -99,8 +99,12 @@
// Heaters / Fans // Heaters / Fans
// //
#define HEATER_0_PIN 4 #define HEATER_0_PIN 4
#define FAN_PIN 3 #define FAN_PIN 3
//
// Misc. Functions
//
#define SDSS 11 #define SDSS 11
/* Unused (1) (2) (3) 4 5 6 7 8 9 10 11 12 13 (14) (15) (16) 17 (18) (19) (20) (21) (22) (23) 24 (25) (26) (27) 28 (29) (30) (31) */ /* Unused (1) (2) (3) 4 5 6 7 8 9 10 11 12 13 (14) (15) (16) 17 (18) (19) (20) (21) (22) (23) 24 (25) (26) (27) 28 (29) (30) (31) */

View file

@ -43,6 +43,20 @@
// Disable JTAG pins so they can be used for the Extrudrboard // Disable JTAG pins so they can be used for the Extrudrboard
#define DISABLE_JTAG true #define DISABLE_JTAG true
//
// Limit Switches
//
#define X_STOP_PIN 35
#if ENABLED(SDSUPPORT)
#define Y_STOP_PIN 37 // Move Ystop to Estop socket
#else
#define Y_STOP_PIN 8 // Ystop in Ystop socket
#endif
#define Z_STOP_PIN 36
//
// Steppers
//
#define X_STEP_PIN 0 #define X_STEP_PIN 0
#define X_DIR_PIN 1 #define X_DIR_PIN 1
#define X_ENABLE_PIN 39 #define X_ENABLE_PIN 39
@ -59,6 +73,15 @@
#define E0_DIR_PIN 7 #define E0_DIR_PIN 7
#define E0_ENABLE_PIN 19 #define E0_ENABLE_PIN 19
//
// Temperature Sensors
//
#define TEMP_0_PIN 1 // Analog Input
#define TEMP_BED_PIN 0 // Analog Input
//
// Heaters / Fans
//
#define HEATER_0_PIN 21 // Extruder #define HEATER_0_PIN 21 // Extruder
#define HEATER_1_PIN 46 #define HEATER_1_PIN 46
#define HEATER_2_PIN 47 #define HEATER_2_PIN 47
@ -72,23 +95,15 @@
#define FAN_PIN 16 #define FAN_PIN 16
#endif #endif
#define X_STOP_PIN 35 //
#if ENABLED(SDSUPPORT) // Misc. Functions
#define Y_STOP_PIN 37 // Move Ystop to Estop socket //
#else #define SDSS 26
#define Y_STOP_PIN 8 // Ystop in Ystop socket
#endif
#define Z_STOP_PIN 36
#define TEMP_0_PIN 1 // Analog Input
#define TEMP_BED_PIN 0 // Analog Input
#define FILWIDTH_PIN 2 // Analog Input #define FILWIDTH_PIN 2 // Analog Input
////LCD Pin Setup//// //
// LCD / Controller
#define SDSS 26 //
#if ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL) #if ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL)
// we have no buzzer installed // we have no buzzer installed
#define BEEPER_PIN -1 #define BEEPER_PIN -1

View file

@ -38,6 +38,16 @@
#define BOARD_NAME "Printrboard Rev F" #define BOARD_NAME "Printrboard Rev F"
#define LARGE_FLASH true #define LARGE_FLASH true
//
// Limit Switches
//
#define X_STOP_PIN 35
#define Y_STOP_PIN 12
#define Z_STOP_PIN 36
//
// Steppers
//
#define X_STEP_PIN 0 #define X_STEP_PIN 0
#define X_DIR_PIN 1 #define X_DIR_PIN 1
#define X_ENABLE_PIN 39 #define X_ENABLE_PIN 39
@ -54,6 +64,27 @@
#define E0_DIR_PIN 7 #define E0_DIR_PIN 7
#define E0_ENABLE_PIN 19 #define E0_ENABLE_PIN 19
// uncomment to enable an I2C based DAC like on the Printrboard REVF
#define DAC_STEPPER_CURRENT
// Number of channels available for DAC, For Printrboar REVF there are 4
#define DAC_STEPPER_ORDER { 3, 2, 1, 0 }
#define DAC_STEPPER_SENSE 0.11
#define DAC_STEPPER_ADDRESS 0
#define DAC_STEPPER_MAX 3520
#define DAC_STEPPER_VREF 1 // internal Vref, gain 1x = 2.048V
#define DAC_STEPPER_GAIN 0
#define DAC_OR_ADDRESS 0x00
//
// Temperature Sensors
//
#define TEMP_0_PIN 1 // Analog Input (Extruder)
#define TEMP_BED_PIN 0 // Analog Input (Bed)
//
// Heaters / Fans
//
#define HEATER_0_PIN 21 // Extruder #define HEATER_0_PIN 21 // Extruder
#define HEATER_1_PIN 46 #define HEATER_1_PIN 46
#define HEATER_2_PIN 47 #define HEATER_2_PIN 47
@ -67,31 +98,15 @@
#define FAN_PIN 16 #define FAN_PIN 16
#endif #endif
#define X_STOP_PIN 35 //
#define Y_STOP_PIN 12 // Misc. Functions
#define Z_STOP_PIN 36 //
#define TEMP_0_PIN 1 // Extruder / Analog pin numbering
#define TEMP_BED_PIN 0 // Bed / Analog pin numbering
#define FILWIDTH_PIN 2 // ANALOG NUMBERING
////LCD Pin Setup////
#define SDSS 20 // Teensylu pin mapping #define SDSS 20 // Teensylu pin mapping
#define FILWIDTH_PIN 2 // Analog Input
// uncomment to enable an I2C based DAC like on the Printrboard REVF //
#define DAC_STEPPER_CURRENT // LCD / Controller
// Number of channels available for DAC, For Printrboar REVF there are 4 //
#define DAC_STEPPER_ORDER { 3, 2, 1, 0 }
#define DAC_STEPPER_SENSE 0.11
#define DAC_STEPPER_ADDRESS 0
#define DAC_STEPPER_MAX 3520
#define DAC_STEPPER_VREF 1 //internal Vref, gain 1x = 2.048V
#define DAC_STEPPER_GAIN 0
#define DAC_OR_ADDRESS 0x00
#if ENABLED(ULTRA_LCD) #if ENABLED(ULTRA_LCD)
#define BEEPER_PIN -1 #define BEEPER_PIN -1

View file

@ -56,6 +56,13 @@
#define SERVO2_PIN 24 // Motor header MX3 #define SERVO2_PIN 24 // Motor header MX3
#define SERVO3_PIN 5 // PWM header pin 5 #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
#if ENABLED(Z_PROBE_SLED) #if ENABLED(Z_PROBE_SLED)
#define SLED_PIN -1 #define SLED_PIN -1
#endif #endif
@ -70,43 +77,38 @@
#define Z_MIN_PIN 10 #define Z_MIN_PIN 10
#define Z_MAX_PIN 30 #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 // Steppers
// //
#define X_STEP_PIN 37 #define X_STEP_PIN 37
#define X_DIR_PIN 48 #define X_DIR_PIN 48
#define X_ENABLE_PIN 29 #define X_ENABLE_PIN 29
#define X_MS1_PIN 40
#define X_MS2_PIN 41
#define Y_STEP_PIN 36 #define Y_STEP_PIN 36
#define Y_DIR_PIN 49 #define Y_DIR_PIN 49
#define Y_ENABLE_PIN 28 #define Y_ENABLE_PIN 28
#define Y_MS1_PIN 69
#define Y_MS2_PIN 39
#define Z_STEP_PIN 35 #define Z_STEP_PIN 35
#define Z_DIR_PIN 47 #define Z_DIR_PIN 47
#define Z_ENABLE_PIN 27 #define Z_ENABLE_PIN 27
#define Z_MS1_PIN 68
#define Z_MS2_PIN 67
#define E0_STEP_PIN 34 #define E0_STEP_PIN 34
#define E0_DIR_PIN 43 #define E0_DIR_PIN 43
#define E0_ENABLE_PIN 26 #define E0_ENABLE_PIN 26
#define E0_MS1_PIN 65
#define E0_MS2_PIN 66
#define E1_STEP_PIN 33 #define E1_STEP_PIN 33
#define E1_DIR_PIN 42 #define E1_DIR_PIN 42
#define E1_ENABLE_PIN 25 #define E1_ENABLE_PIN 25
// Microstepping pins - Mapping not from fastio.h (?)
#define X_MS1_PIN 40
#define X_MS2_PIN 41
#define Y_MS1_PIN 69
#define Y_MS2_PIN 39
#define Z_MS1_PIN 68
#define Z_MS2_PIN 67
#define E0_MS1_PIN 65
#define E0_MS2_PIN 66
#define E1_MS1_PIN 63 #define E1_MS1_PIN 63
#define E1_MS2_PIN 64 #define E1_MS2_PIN 64
@ -116,9 +118,9 @@
// //
// Temperature Sensors // Temperature Sensors
// //
#define TEMP_0_PIN 0 #define TEMP_0_PIN 0 // Analog Input
#define TEMP_1_PIN 1 #define TEMP_1_PIN 1 // Analog Input
#define TEMP_BED_PIN 2 #define TEMP_BED_PIN 2 // Analog Input
// //
// Heaters / Fans // Heaters / Fans
@ -137,9 +139,12 @@
// //
#define SDSS 53 #define SDSS 53
#define LED_PIN 13 #define LED_PIN 13
#define FILWIDTH_PIN 3 // ANALOG NUMBERING #define FILWIDTH_PIN 3 // Analog Input
#define PS_ON_PIN 4 #define PS_ON_PIN 4
//
// LCD / Controller
//
#if ENABLED(ULTRA_LCD) #if ENABLED(ULTRA_LCD)
#define KILL_PIN 80 #define KILL_PIN 80

View file

@ -85,6 +85,8 @@
#define Z_MIN_PROBE_PIN 32 #define Z_MIN_PROBE_PIN 32
#endif #endif
#define SLED_PIN -1
// //
// Steppers // Steppers
// //
@ -111,24 +113,16 @@
// //
// Temperature Sensors // Temperature Sensors
// //
#define TEMP_0_PIN 13 // ANALOG NUMBERING #define TEMP_0_PIN 13 // Analog Input
#define TEMP_1_PIN 15 // ANALOG NUMBERING #define TEMP_1_PIN 15 // Analog Input
#define TEMP_BED_PIN 14 // ANALOG NUMBERING #define TEMP_BED_PIN 14 // Analog Input
// // SPI for Max6675 or Max31855 Thermocouple
// Misc. Functions #if DISABLED(SDSUPPORT)
// #define MAX6675_SS 66 // Do not use pin 53 if there is even the remote possibility of using Display/SD card
#define SDSS 53 #else
#define LED_PIN 13 #define MAX6675_SS 66 // Do not use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
#endif
// Use the RAMPS 1.4 Analog input 5 on the AUX2 connector
#define FILWIDTH_PIN 5 // ANALOG NUMBERING
// define digital pin 4 for the filament runout sensor. Use the RAMPS 1.4 digital input 4 on the servos connector
#define FIL_RUNOUT_PIN 4
#define PS_ON_PIN 12
#define SLED_PIN -1
// //
// Augmentation for auto-assigning RAMPS plugs // Augmentation for auto-assigning RAMPS plugs
@ -193,6 +187,20 @@
#define FAN_PIN 4 // IO pin. Buffer needed #define FAN_PIN 4 // IO pin. Buffer needed
#endif #endif
//
// Misc. Functions
//
#define SDSS 53
#define LED_PIN 13
// Use the RAMPS 1.4 Analog input 5 on the AUX2 connector
#define FILWIDTH_PIN 5 // Analog Input
// define digital pin 4 for the filament runout sensor. Use the RAMPS 1.4 digital input 4 on the servos connector
#define FIL_RUNOUT_PIN 4
#define PS_ON_PIN 12
// //
// LCD / Controller // LCD / Controller
// //
@ -350,10 +358,3 @@
#endif // NEWPANEL #endif // NEWPANEL
#endif // ULTRA_LCD #endif // ULTRA_LCD
// SPI for Max6675 or Max31855 Thermocouple
#if DISABLED(SDSUPPORT)
#define MAX6675_SS 66 // Do not use pin 53 if there is even the remote possibility of using Display/SD card
#else
#define MAX6675_SS 66 // Do not use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
#endif

View file

@ -69,18 +69,18 @@
#define E0_DIR_PIN 34 #define E0_DIR_PIN 34
#define E0_ENABLE_PIN 30 #define E0_ENABLE_PIN 30
//
// Misc. Functions
//
#define SDPOWER 48
#define SDSS 53
#define LED_PIN 13
// //
// Temperature Sensors // Temperature Sensors
// //
#define TEMP_0_PIN 2 // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!! #define TEMP_0_PIN 2 // Analog Input
#define TEMP_BED_PIN 1 // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!! #define TEMP_BED_PIN 1 // Analog Input
// SPI for Max6675 or Max31855 Thermocouple
#if DISABLED(SDSUPPORT)
#define MAX6675_SS 66 // Do not use pin 53 if there is even the remote possibility of using Display/SD card
#else
#define MAX6675_SS 66 // Do not use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
#endif
// //
// Heaters / Fans // Heaters / Fans
@ -95,9 +95,9 @@
#define FAN_PIN 9 #define FAN_PIN 9
#endif #endif
// SPI for Max6675 or Max31855 Thermocouple //
#if DISABLED(SDSUPPORT) // Misc. Functions
#define MAX6675_SS 66// Do not use pin 53 if there is even the remote possibility of using Display/SD card //
#else #define SDPOWER 48
#define MAX6675_SS 66// Do not use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present #define SDSS 53
#endif #define LED_PIN 13

View file

@ -26,21 +26,75 @@
#define BOARD_NAME "RigidBoard" #define BOARD_NAME "RigidBoard"
#define RAMPS_D10_PIN 9 // EXTRUDER 1 //
#define MOSFET_D_PIN 12 // EXTRUDER 2 or FAN // Z Probe (when not Z_MIN_PIN)
//
#ifndef Z_MIN_PROBE_PIN #ifndef Z_MIN_PROBE_PIN
#define Z_MIN_PROBE_PIN 19 // Z-MAX pin J14 End Stops #define Z_MIN_PROBE_PIN 19 // Z-MAX pin J14 End Stops
#endif #endif
#include "pins_RAMPS.h" #include "pins_RAMPS.h"
//
// Steppers
//
// RigidBot swaps E0 / E1 plugs vs RAMPS 1.3
#undef E0_STEP_PIN
#undef E0_DIR_PIN
#undef E0_ENABLE_PIN
#define E0_STEP_PIN 36
#define E0_DIR_PIN 34
#define E0_ENABLE_PIN 30
#undef E1_STEP_PIN
#undef E1_DIR_PIN
#undef E1_ENABLE_PIN
#define E1_STEP_PIN 26
#define E1_DIR_PIN 28
#define E1_ENABLE_PIN 24
#define STEPPER_RESET_PIN 41 // Stepper drivers have a reset on RigidBot
//
// Temperature Sensors
//
#undef TEMP_0_PIN #undef TEMP_0_PIN
#undef TEMP_1_PIN #undef TEMP_1_PIN
#define TEMP_0_PIN 14 // ANALOG NUMBERING #undef TEMP_BED_PIN
#define TEMP_1_PIN 13 // ANALOG NUMBERING #define TEMP_0_PIN 14 // Analog Input
#define TEMP_1_PIN 13 // Analog Input
#define TEMP_BED_PIN 15 // Analog Input
// SPI for Max6675 or Max31855 Thermocouple
#undef MAX6675_SS
#if DISABLED(SDSUPPORT)
#define MAX6675_SS 53 // Don't use pin 53 if there is even the remote possibility of using Display/SD card
#else
#define MAX6675_SS 49 // Don't use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
#endif
//
// Heaters / Fans
//
#define RAMPS_D10_PIN 9 // EXTRUDER 1
#define MOSFET_D_PIN 12 // EXTRUDER 2 or FAN
#undef HEATER_BED_PIN
#define HEATER_BED_PIN 10
#undef FAN_PIN
#define FAN_PIN 8 // Same as RAMPS_13_EEF
//
// Misc. Functions
//
#undef PS_ON_PIN
#define PS_ON_PIN -1
//
// LCD / Controller
//
// LCD Panel options for the RigidBoard // LCD Panel options for the RigidBoard
#if ENABLED(RIGIDBOT_PANEL) #if ENABLED(RIGIDBOT_PANEL)
#undef BEEPER_PIN #undef BEEPER_PIN
@ -77,41 +131,3 @@
#define KILL_PIN 32 #define KILL_PIN 32
#endif #endif
// SPI for Max6675 or Max31855 Thermocouple
#undef MAX6675_SS
#if ENABLED(SDSUPPORT)
#define MAX6675_SS 49 // Don't use pin 49 as this is tied to the switch inside the SD card socket to detect if there is an SD card present
#else
#define MAX6675_SS 53 // Don't use pin 53 if there is even the remote possibility of using Display/SD card
#endif
// RigidBot swaps E0 / E1 plugs vs RAMPS 1.3
#undef E0_STEP_PIN
#undef E0_DIR_PIN
#undef E0_ENABLE_PIN
#define E0_STEP_PIN 36
#define E0_DIR_PIN 34
#define E0_ENABLE_PIN 30
#undef E1_STEP_PIN
#undef E1_DIR_PIN
#undef E1_ENABLE_PIN
#define E1_STEP_PIN 26
#define E1_DIR_PIN 28
#define E1_ENABLE_PIN 24
#undef FAN_PIN
#define FAN_PIN 8 // Same as RAMPS_13_EEF
#undef PS_ON_PIN
#define PS_ON_PIN -1
#undef HEATER_BED_PIN
#define HEATER_BED_PIN 10
#undef TEMP_BED_PIN
#define TEMP_BED_PIN 15 // ANALOG NUMBERING
#define STEPPER_RESET_PIN 41 // Stepper drivers have a reset on RigidBot

View file

@ -29,6 +29,9 @@
#undef BOARD_NAME #undef BOARD_NAME
#define BOARD_NAME "RigidBoard V2" #define BOARD_NAME "RigidBoard V2"
//
// Steppers
//
// I2C based DAC like on the Printrboard REVF // I2C based DAC like on the Printrboard REVF
#define DAC_STEPPER_CURRENT #define DAC_STEPPER_CURRENT
// Channels available for DAC, For Rigidboard there are 4 // Channels available for DAC, For Rigidboard there are 4

View file

@ -35,6 +35,11 @@
#define DEFAULT_MACHINE_NAME "Rumba" #define DEFAULT_MACHINE_NAME "Rumba"
#define BOARD_NAME "Rumba" #define BOARD_NAME "Rumba"
//
// Servos
//
#define SERVO0_PIN 5
// //
// Limit Switches // Limit Switches
// //
@ -79,33 +84,34 @@
#define E2_DIR_PIN 28 #define E2_DIR_PIN 28
#define E2_ENABLE_PIN 39 #define E2_ENABLE_PIN 39
//
// Misc. Functions
//
#define LED_PIN 13
#define PS_ON_PIN 45
#define KILL_PIN 46
// //
// Temperature Sensors // Temperature Sensors
// //
#if TEMP_SENSOR_0 == -1 #if TEMP_SENSOR_0 == -1
#define TEMP_0_PIN 6 // ANALOG NUMBERING - connector *K1* on RUMBA thermocouple ADD ON is used #define TEMP_0_PIN 6 // Analog Input (connector *K1* on RUMBA thermocouple ADD ON is used)
#else #else
#define TEMP_0_PIN 15 // ANALOG NUMBERING - default connector for thermistor *T0* on rumba board is used #define TEMP_0_PIN 15 // Analog Input (default connector for thermistor *T0* on rumba board is used)
#endif #endif
#if TEMP_SENSOR_1 == -1 #if TEMP_SENSOR_1 == -1
#define TEMP_1_PIN 5 // ANALOG NUMBERING - connector *K2* on RUMBA thermocouple ADD ON is used #define TEMP_1_PIN 5 // Analog Input (connector *K2* on RUMBA thermocouple ADD ON is used)
#else #else
#define TEMP_1_PIN 14 // ANALOG NUMBERING - default connector for thermistor *T1* on rumba board is used #define TEMP_1_PIN 14 // Analog Input (default connector for thermistor *T1* on rumba board is used)
#endif #endif
#if TEMP_SENSOR_2 == -1 #if TEMP_SENSOR_2 == -1
#define TEMP_2_PIN 7 // ANALOG NUMBERING - connector *K3* on RUMBA thermocouple ADD ON is used <-- this can not be used when TEMP_SENSOR_BED is defined as thermocouple #define TEMP_2_PIN 7 // Analog Input (connector *K3* on RUMBA thermocouple ADD ON is used <-- this can not be used when TEMP_SENSOR_BED is defined as thermocouple)
#else #else
#define TEMP_2_PIN 13 // ANALOG NUMBERING - default connector for thermistor *T2* on rumba board is used #define TEMP_2_PIN 13 // Analog Input (default connector for thermistor *T2* on rumba board is used)
#endif
// optional for extruder 4 or chamber:
//#define TEMP_X_PIN 12 // Analog Input (default connector for thermistor *T3* on rumba board is used)
#if TEMP_SENSOR_BED == -1
#define TEMP_BED_PIN 7 // Analog Input (connector *K3* on RUMBA thermocouple ADD ON is used <-- this can not be used when TEMP_SENSOR_2 is defined as thermocouple)
#else
#define TEMP_BED_PIN 11 // Analog Input (default connector for thermistor *THB* on rumba board is used)
#endif #endif
// //
@ -120,16 +126,17 @@
#define FAN_PIN 7 #define FAN_PIN 7
#define FAN1_PIN 8 #define FAN1_PIN 8
//optional for extruder 4 or chamber: //
// #define TEMP_X_PIN 12 // ANALOG NUMBERING - default connector for thermistor *T3* on rumba board is used // Misc. Functions
//
#if TEMP_SENSOR_BED == -1
#define TEMP_BED_PIN 7 // ANALOG NUMBERING - connector *K3* on RUMBA thermocouple ADD ON is used <-- this can not be used when TEMP_SENSOR_2 is defined as thermocouple
#else
#define TEMP_BED_PIN 11 // ANALOG NUMBERING - default connector for thermistor *THB* on rumba board is used
#endif
#define SDSS 53 #define SDSS 53
#define LED_PIN 13
#define PS_ON_PIN 45
#define KILL_PIN 46
//
// LCD / Controller
//
#define SD_DETECT_PIN 49 #define SD_DETECT_PIN 49
#define BEEPER_PIN 44 #define BEEPER_PIN 44
#define LCD_PINS_RS 19 #define LCD_PINS_RS 19
@ -141,6 +148,3 @@
#define BTN_EN1 11 #define BTN_EN1 11
#define BTN_EN2 12 #define BTN_EN2 12
#define BTN_ENC 43 #define BTN_ENC 43
#define SERVO0_PIN 5

View file

@ -30,6 +30,9 @@
#define BOARD_NAME "Sainsmart" #define BOARD_NAME "Sainsmart"
//
// Heaters / Fans
//
#define RAMPS_D10_PIN 9 // E #define RAMPS_D10_PIN 9 // E
#define RAMPS_D9_PIN 7 // F PART FAN in front of board next to Extruder heat #define RAMPS_D9_PIN 7 // F PART FAN in front of board next to Extruder heat
// RAMPS_D8_PIN 8 // B // RAMPS_D8_PIN 8 // B

View file

@ -34,35 +34,44 @@
#define IS_MELZI (MB(MELZI) || MB(MELZI_MAKR3D)) #define IS_MELZI (MB(MELZI) || MB(MELZI_MAKR3D))
#define X_STEP_PIN 15 //
#define X_DIR_PIN 21 // Limit Switches
//
#define X_STOP_PIN 18 #define X_STOP_PIN 18
#define Y_STEP_PIN 22
#define Y_DIR_PIN 23
#define Y_STOP_PIN 19 #define Y_STOP_PIN 19
#define Z_STEP_PIN 3
#define Z_DIR_PIN 2
#define Z_STOP_PIN 20 #define Z_STOP_PIN 20
#define E0_STEP_PIN 1 //
#define E0_DIR_PIN 0 // Z Probe (when not Z_MIN_PIN)
//
#if MB(AZTEEG_X1) || MB(STB_11) || IS_MELZI
#define FAN_PIN 4 // Works for Panelolu2 too
#endif
#if IS_MELZI
#define LED_PIN 27 // On some broken versions of the Sanguino libraries the pin definitions are wrong, so LED_PIN needs to be 28. But you should upgrade your Sanguino libraries! See #368.
#elif MB(STB_11)
#define LCD_BACKLIGHT_PIN 17 // LCD backlight LED
#endif
#if ENABLED(Z_PROBE_SLED) #if ENABLED(Z_PROBE_SLED)
#define SLED_PIN -1 #define SLED_PIN -1
#endif #endif
//
// Steppers
//
#define X_STEP_PIN 15
#define X_DIR_PIN 21
#define Y_STEP_PIN 22
#define Y_DIR_PIN 23
#define Z_STEP_PIN 3
#define Z_DIR_PIN 2
#define E0_STEP_PIN 1
#define E0_DIR_PIN 0
//
// Temperature Sensors
//
#define TEMP_0_PIN 7 // Analog Input (pin 33 extruder)
#define TEMP_BED_PIN 6 // Analog Input (pin 34 bed)
//
// Heaters / Fans
//
#define HEATER_0_PIN 13 // (extruder) #define HEATER_0_PIN 13 // (extruder)
#if ENABLED(SANGUINOLOLU_V_1_2) #if ENABLED(SANGUINOLOLU_V_1_2)
@ -87,16 +96,29 @@
#endif #endif
#define TEMP_0_PIN 7 // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!! (pin 33 extruder) #if MB(AZTEEG_X1) || MB(STB_11) || IS_MELZI
#define TEMP_BED_PIN 6 // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!! (pin 34 bed) #define FAN_PIN 4 // Works for Panelolu2 too
#define SDSS 31 #endif
//
// Misc. Functions
//
/** /**
* On some broken versions of the Sanguino libraries the pin definitions are wrong, * On some broken versions of the Sanguino libraries the pin definitions are wrong,
* which then needs SDSS as pin 24. But you should upgrade your Sanguino libraries! See #368. * which then needs SDSS as pin 24. But you should upgrade your Sanguino libraries! See #368.
*/ */
//#define SDSS 24 //#define SDSS 24
#define SDSS 31
#if IS_MELZI
#define LED_PIN 27 // On some broken versions of the Sanguino libraries the pin definitions are wrong, so LED_PIN needs to be 28. But you should upgrade your Sanguino libraries! See #368.
#elif MB(STB_11)
#define LCD_BACKLIGHT_PIN 17 // LCD backlight LED
#endif
//
// LCD / Controller
//
#if ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL) #if ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL)
// No buzzer installed // No buzzer installed

View file

@ -38,6 +38,22 @@
#define USBCON 1286 // Disable MarlinSerial etc. #define USBCON 1286 // Disable MarlinSerial etc.
#define LARGE_FLASH true #define LARGE_FLASH true
//
// Servos
//
#define SERVO0_PIN 41 // In teensy's pin definition for pinMode (in servo.cpp)
//
// Limit Switches
//
#define X_STOP_PIN 13
#define Y_STOP_PIN 14
//#define Z_STOP_PIN 15
#define Z_STOP_PIN 36 // For inductive sensor.
//
// Steppers
//
#define X_STEP_PIN 0 #define X_STEP_PIN 0
#define X_DIR_PIN 1 #define X_DIR_PIN 1
#define X_ENABLE_PIN 39 #define X_ENABLE_PIN 39
@ -54,18 +70,24 @@
#define E0_DIR_PIN 7 #define E0_DIR_PIN 7
#define E0_ENABLE_PIN 19 #define E0_ENABLE_PIN 19
//
// Temperature Sensors
//
#define TEMP_0_PIN 7 // Analog Input (Extruder)
#define TEMP_BED_PIN 6 // Analog Input (Bed)
//
// Heaters / Fans
//
#define HEATER_0_PIN 21 // Extruder #define HEATER_0_PIN 21 // Extruder
#define HEATER_BED_PIN 20 // Bed #define HEATER_BED_PIN 20 // Bed
#define FAN_PIN 16 // Fan -- from Teensyduino environment. #define FAN_PIN 16 // Fan -- from Teensyduino environment.
// For the fan and Teensyduino uses a different pin mapping. // For the fan and Teensyduino uses a different pin mapping.
#define X_STOP_PIN 13
#define Y_STOP_PIN 14
//#define Z_STOP_PIN 15
#define Z_STOP_PIN 36 // For inductive sensor.
#define TEMP_0_PIN 7 // Extruder / Analog pin numbering
#define TEMP_BED_PIN 6 // Bed / Analog pin numbering
//
// Misc. Functions
//
#define SDSS 20 // PB0 - 8 in marlin env. #define SDSS 20 // PB0 - 8 in marlin env.
// Extension header pin mapping // Extension header pin mapping
@ -94,6 +116,9 @@
#define EXT_AUX_A4_IO 44 // Digital IO, 42 (teensy), 44 (marlin) #define EXT_AUX_A4_IO 44 // Digital IO, 42 (teensy), 44 (marlin)
//
// LCD / Controller
//
#define BEEPER_PIN -1 #define BEEPER_PIN -1
#define LCD_PINS_RS -1 #define LCD_PINS_RS -1
#define LCD_PINS_ENABLE -1 #define LCD_PINS_ENABLE -1
@ -116,5 +141,3 @@
#define KILL_PIN EXT_AUX_A2_IO #define KILL_PIN EXT_AUX_A2_IO
#define HOME_PIN EXT_AUX_A4_IO #define HOME_PIN EXT_AUX_A4_IO
#endif // SAV_3DLCD || SAV_3DGLCD #endif // SAV_3DLCD || SAV_3DGLCD
#define SERVO0_PIN 41 // In teensy's pin definition for pinMode (in servo.cpp)

View file

@ -64,8 +64,8 @@
// //
// Temperature Sensors // Temperature Sensors
// //
#define TEMP_0_PIN 1 #define TEMP_0_PIN 1 // Analog Input
#define TEMP_BED_PIN 2 #define TEMP_BED_PIN 2 // Analog Input
// //
// Heaters / Fans // Heaters / Fans
@ -81,6 +81,9 @@
#define FAN_PIN 31 #define FAN_PIN 31
#endif #endif
//
// Misc. Functions
//
#define PS_ON_PIN 15 #define PS_ON_PIN 15
// All these generations of Gen7 supply thermistor power // All these generations of Gen7 supply thermistor power

View file

@ -79,6 +79,16 @@
#define USBCON 1286 // Disable MarlinSerial etc. #define USBCON 1286 // Disable MarlinSerial etc.
#define LARGE_FLASH true #define LARGE_FLASH true
//
// Limit Switches
//
#define X_STOP_PIN 2
#define Y_STOP_PIN 3
#define Z_STOP_PIN 4
//
// Steppers
//
#define X_STEP_PIN 28 // 0 Marlin #define X_STEP_PIN 28 // 0 Marlin
#define X_DIR_PIN 29 // 1 Marlin #define X_DIR_PIN 29 // 1 Marlin
#define X_ENABLE_PIN 26 #define X_ENABLE_PIN 26
@ -95,21 +105,29 @@
#define E0_DIR_PIN 35 // 7 #define E0_DIR_PIN 35 // 7
#define E0_ENABLE_PIN 26 // Shared w/x #define E0_ENABLE_PIN 26 // Shared w/x
//
// Temperature Sensors
//
#define TEMP_0_PIN 7 // Analog Input (Extruder)
#define TEMP_BED_PIN 6 // Analog Input (Bed)
//
// Heaters / Fans
//
#define HEATER_0_PIN 15 // 21 // Extruder #define HEATER_0_PIN 15 // 21 // Extruder
#define HEATER_BED_PIN 14 // 20 // Bed #define HEATER_BED_PIN 14 // 20 // Bed
#define FAN_PIN 16 // 22 // Fan #define FAN_PIN 16 // 22 // Fan
#define X_STOP_PIN 2 //
#define Y_STOP_PIN 3 // Misc. Functions
#define Z_STOP_PIN 4 //
#define TEMP_0_PIN 7 // Extruder / Analog pin numbering
#define TEMP_BED_PIN 6 // Bed / Analog pin numbering
#define SDSS 20 // 8 #define SDSS 20 // 8
#define LED_PIN 6 #define LED_PIN 6
#define PS_ON_PIN 27 #define PS_ON_PIN 27
//
// LCD / Controller
//
#if ENABLED(ULTIPANEL) #if ENABLED(ULTIPANEL)
#define LCD_PINS_RS 8 #define LCD_PINS_RS 8
#define LCD_PINS_ENABLE 9 #define LCD_PINS_ENABLE 9

View file

@ -40,6 +40,16 @@
#define USBCON 1286 // Disable MarlinSerial etc. #define USBCON 1286 // Disable MarlinSerial etc.
#define LARGE_FLASH true #define LARGE_FLASH true
//
// Limit Switches
//
#define X_STOP_PIN 13
#define Y_STOP_PIN 14
#define Z_STOP_PIN 15
//
// Steppers
//
#define X_STEP_PIN 0 #define X_STEP_PIN 0
#define X_DIR_PIN 1 #define X_DIR_PIN 1
#define X_ENABLE_PIN 39 #define X_ENABLE_PIN 39
@ -56,6 +66,15 @@
#define E0_DIR_PIN 7 #define E0_DIR_PIN 7
#define E0_ENABLE_PIN 19 #define E0_ENABLE_PIN 19
//
// Temperature Sensors
//
#define TEMP_0_PIN 7 // Analog Input (Extruder)
#define TEMP_BED_PIN 6 // Analog Input (Bed)
//
// Heaters / Fans
//
#define HEATER_0_PIN 21 // Extruder #define HEATER_0_PIN 21 // Extruder
#define HEATER_1_PIN 46 #define HEATER_1_PIN 46
#define HEATER_2_PIN 47 #define HEATER_2_PIN 47
@ -69,14 +88,14 @@
#define FAN_PIN 16 #define FAN_PIN 16
#endif #endif
#define X_STOP_PIN 13 //
#define Y_STOP_PIN 14 // Misc. Functions
#define Z_STOP_PIN 15 //
#define TEMP_0_PIN 7 // Extruder / Analog pin numbering
#define TEMP_BED_PIN 6 // Bed / Analog pin numbering
#define SDSS 8 #define SDSS 8
//
// LCD / Controller
//
#if ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL) #if ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL)
#define BEEPER_PIN -1 #define BEEPER_PIN -1

View file

@ -72,9 +72,9 @@
// //
// Temperature Sensors // Temperature Sensors
// //
#define TEMP_0_PIN 8 #define TEMP_0_PIN 8 // Analog Input
#define TEMP_1_PIN 9 #define TEMP_1_PIN 9 // Analog Input
#define TEMP_BED_PIN 10 #define TEMP_BED_PIN 10 // Analog Input
// //
// Heaters / Fans // Heaters / Fans
@ -86,15 +86,17 @@
#define FAN_PIN 7 #define FAN_PIN 7
// //
// SD Card // Misc. Functions
// //
#define SDSS 53 #define SDSS 53
#define SD_DETECT_PIN 39 #define SD_DETECT_PIN 39
#define LED_PIN 8 #define LED_PIN 8
#define SAFETY_TRIGGERED_PIN 28 // PIN to detect the safety circuit has triggered #define SAFETY_TRIGGERED_PIN 28 // PIN to detect the safety circuit has triggered
#define MAIN_VOLTAGE_MEASURE_PIN 14 // ANALOG PIN to measure the main voltage, with a 100k - 4k7 resitor divider. #define MAIN_VOLTAGE_MEASURE_PIN 14 // ANALOG PIN to measure the main voltage, with a 100k - 4k7 resitor divider.
//
// LCD / Controller
//
#define BEEPER_PIN 18 #define BEEPER_PIN 18
#define LCD_PINS_RS 20 #define LCD_PINS_RS 20

View file

@ -82,9 +82,9 @@
// //
// Temperature Sensors // Temperature Sensors
// //
#define TEMP_0_PIN 8 #define TEMP_0_PIN 8 // Analog Input
#define TEMP_1_PIN 9 #define TEMP_1_PIN 9 // Analog Input
#define TEMP_BED_PIN 10 #define TEMP_BED_PIN 10 // Analog Input
// //
// Heaters / Fans // Heaters / Fans
@ -93,9 +93,13 @@
#define HEATER_1_PIN 3 #define HEATER_1_PIN 3
#define HEATER_BED_PIN 4 #define HEATER_BED_PIN 4
#define FAN_PIN 7
//
// Misc. Functions
//
#define SDSS 53 #define SDSS 53
#define LED_PIN 13 #define LED_PIN 13
#define FAN_PIN 7
#define PS_ON_PIN 12 #define PS_ON_PIN 12
#define SUICIDE_PIN 54 // PIN that has to be turned on right after start, to keep power flowing. #define SUICIDE_PIN 54 // PIN that has to be turned on right after start, to keep power flowing.

View file

@ -77,8 +77,8 @@
// //
// Temperature Sensors // Temperature Sensors
// //
#define TEMP_0_PIN 8 #define TEMP_0_PIN 8 // Analog Input
#define TEMP_1_PIN 1 #define TEMP_1_PIN 1 // Analog Input
// //
// Heaters / Fans // Heaters / Fans