Merge commit pins.h from master to experimentell
Conflicts: Sprinter/pins.h
This commit is contained in:
commit
8954e1ccb9
1 changed files with 4 additions and 5 deletions
|
|
@ -143,6 +143,7 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
/****************************************************************************************
|
/****************************************************************************************
|
||||||
* RepRap Motherboard ****---NOOOOOO RS485/EXTRUDER CONTROLLER!!!!!!!!!!!!!!!!!---*******
|
* RepRap Motherboard ****---NOOOOOO RS485/EXTRUDER CONTROLLER!!!!!!!!!!!!!!!!!---*******
|
||||||
*
|
*
|
||||||
|
|
@ -662,17 +663,20 @@
|
||||||
#define HEATER_0_PIN 13 // (extruder)
|
#define HEATER_0_PIN 13 // (extruder)
|
||||||
|
|
||||||
#ifdef SANGUINOLOLU_V_1_2
|
#ifdef SANGUINOLOLU_V_1_2
|
||||||
|
|
||||||
#define HEATER_1_PIN 12 // (bed)
|
#define HEATER_1_PIN 12 // (bed)
|
||||||
#define X_ENABLE_PIN 14
|
#define X_ENABLE_PIN 14
|
||||||
#define Y_ENABLE_PIN 14
|
#define Y_ENABLE_PIN 14
|
||||||
#define Z_ENABLE_PIN 26
|
#define Z_ENABLE_PIN 26
|
||||||
#define E_ENABLE_PIN 14
|
#define E_ENABLE_PIN 14
|
||||||
#else
|
#else
|
||||||
|
|
||||||
#define HEATER_1_PIN 14 // (bed)
|
#define HEATER_1_PIN 14 // (bed)
|
||||||
#define X_ENABLE_PIN -1
|
#define X_ENABLE_PIN -1
|
||||||
#define Y_ENABLE_PIN -1
|
#define Y_ENABLE_PIN -1
|
||||||
#define Z_ENABLE_PIN -1
|
#define Z_ENABLE_PIN -1
|
||||||
#define E_ENABLE_PIN -1
|
#define E_ENABLE_PIN -1
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define TEMP_0_PIN 7 // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!! (pin 33 extruder)
|
#define TEMP_0_PIN 7 // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!! (pin 33 extruder)
|
||||||
|
|
@ -682,7 +686,6 @@
|
||||||
|
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
|
||||||
/****************************************************************************************
|
/****************************************************************************************
|
||||||
* Gen7 pin assignment
|
* Gen7 pin assignment
|
||||||
*
|
*
|
||||||
|
|
@ -773,8 +776,6 @@
|
||||||
#define E_DIR_PIN 35
|
#define E_DIR_PIN 35
|
||||||
#define E_ENABLE_PIN 13
|
#define E_ENABLE_PIN 13
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#define HEATER_0_PIN 15 // Extruder
|
#define HEATER_0_PIN 15 // Extruder
|
||||||
#define HEATER_1_PIN 14 // Bed
|
#define HEATER_1_PIN 14 // Bed
|
||||||
#define FAN_PIN 16 // Fan
|
#define FAN_PIN 16 // Fan
|
||||||
|
|
@ -830,8 +831,6 @@
|
||||||
#define E_DIR_PIN 35
|
#define E_DIR_PIN 35
|
||||||
#define E_ENABLE_PIN 13
|
#define E_ENABLE_PIN 13
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
#define HEATER_0_PIN 15 // Extruder
|
#define HEATER_0_PIN 15 // Extruder
|
||||||
#define HEATER_1_PIN 14 // Bed
|
#define HEATER_1_PIN 14 // Bed
|
||||||
#define FAN_PIN 16 // Fan
|
#define FAN_PIN 16 // Fan
|
||||||
|
|
|
||||||
Loading…
Reference in a new issue