Clean up RUMBA pins conditions

This commit is contained in:
Scott Lahteine 2015-08-03 12:31:02 -07:00 committed by Richard Wackerbarth
parent 46453905d6
commit c30b7693e0

View file

@ -48,36 +48,36 @@
#define PS_ON_PIN 45 #define PS_ON_PIN 45
#define KILL_PIN 46 #define KILL_PIN 46
#if (TEMP_SENSOR_0==0) #if TEMP_SENSOR_0 == 0
#define TEMP_0_PIN -1 #define TEMP_0_PIN -1
#define HEATER_0_PIN -1 #define HEATER_0_PIN -1
#else #else
#define HEATER_0_PIN 2 // EXTRUDER 1 #define HEATER_0_PIN 2 // EXTRUDER 1
#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 NUMBERING - 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 NUMBERING - default connector for thermistor *T0* on rumba board is used
#endif #endif
#endif #endif
#if (TEMP_SENSOR_1==0) #if TEMP_SENSOR_1 == 0
#define TEMP_1_PIN -1 #define TEMP_1_PIN -1
#define HEATER_1_PIN -1 #define HEATER_1_PIN -1
#else #else
#define HEATER_1_PIN 3 // EXTRUDER 2 #define HEATER_1_PIN 3 // EXTRUDER 2
#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 NUMBERING - 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 NUMBERING - default connector for thermistor *T1* on rumba board is used
#endif #endif
#endif #endif
#if (TEMP_SENSOR_2==0) #if TEMP_SENSOR_2 == 0
#define TEMP_2_PIN -1 #define TEMP_2_PIN -1
#define HEATER_2_PIN -1 #define HEATER_2_PIN -1
#else #else
#define HEATER_2_PIN 6 // EXTRUDER 3 #define HEATER_2_PIN 6 // EXTRUDER 3
#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 NUMBERING - 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 NUMBERING - default connector for thermistor *T2* on rumba board is used
@ -87,12 +87,12 @@
//optional for extruder 4 or chamber: #define TEMP_X_PIN 12 // ANALOG NUMBERING - default connector for thermistor *T3* on rumba board is used //optional for extruder 4 or chamber: #define TEMP_X_PIN 12 // ANALOG NUMBERING - default connector for thermistor *T3* on rumba board is used
//optional FAN1 can be used as 4th heater output: #define HEATER_3_PIN 8 // EXTRUDER 4 //optional FAN1 can be used as 4th heater output: #define HEATER_3_PIN 8 // EXTRUDER 4
#if (TEMP_SENSOR_BED==0) #if TEMP_SENSOR_BED == 0
#define TEMP_BED_PIN -1 #define TEMP_BED_PIN -1
#define HEATER_BED_PIN -1 #define HEATER_BED_PIN -1
#else #else
#define HEATER_BED_PIN 9 // BED #define HEATER_BED_PIN 9 // BED
#if (TEMP_SENSOR_BED==-1) #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 #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 #else
#define TEMP_BED_PIN 11 // ANALOG NUMBERING - default connector for thermistor *THB* on rumba board is used #define TEMP_BED_PIN 11 // ANALOG NUMBERING - default connector for thermistor *THB* on rumba board is used