Label analog pins in a similar way

Some other pins formatting also
This commit is contained in:
Scott Lahteine 2016-10-05 01:52:43 -05:00
parent 0c0deb5194
commit bd8520e61d
26 changed files with 172 additions and 140 deletions

View file

@ -75,8 +75,8 @@
// //
// Temperature Sensors // Temperature Sensors
// //
#define TEMP_0_PIN 1 // Analog #define TEMP_0_PIN 1 // Analog Input
#define TEMP_BED_PIN 0 // Analog #define TEMP_BED_PIN 0 // Analog Input
// //
// Heaters / Fans // Heaters / Fans

View file

@ -55,8 +55,8 @@
// //
// Temperature Sensors // Temperature Sensors
// //
#define TEMP_0_PIN 6 // ANALOG INPUT - NOT DIGITAL OUTPUT #define TEMP_0_PIN 6 // Analog Input
#define TEMP_BED_PIN 10 #define TEMP_BED_PIN 10 // Analog Input
// //
// Heaters / Fans // Heaters / Fans

View file

@ -40,7 +40,7 @@
#define SLED_PIN -1 #define SLED_PIN -1
#define FILWIDTH_PIN 3 // ANALOG NUMBERING #define FILWIDTH_PIN 3 // Analog Input
/************************************************ /************************************************
* Rambo pin assignments old * Rambo pin assignments old
@ -112,8 +112,8 @@
#define FAN0_PIN 6 #define FAN0_PIN 6
#define FAN1_PIN 2 #define FAN1_PIN 2
#define TEMP_0_PIN 0 #define TEMP_0_PIN 0 // Analog Input
#define TEMP_BED_PIN 7 #define TEMP_BED_PIN 7 // Analog Input
#define SDSS 53 #define SDSS 53
#define LED_PIN 13 #define LED_PIN 13

View file

@ -34,5 +34,5 @@
#undef TEMP_0_PIN #undef TEMP_0_PIN
#undef TEMP_1_PIN #undef TEMP_1_PIN
#define TEMP_0_PIN 9 // ANALOG NUMBERING #define TEMP_0_PIN 9 // Analog Input
#define TEMP_1_PIN 11 // ANALOG NUMBERING #define TEMP_1_PIN 11 // Analog Input

View file

@ -68,8 +68,8 @@
// //
// Temperature Sensors // Temperature Sensors
// //
#define TEMP_0_PIN 7 // Extruder / Analog pin numbering #define TEMP_0_PIN 7 // Analog Input
#define TEMP_BED_PIN 6 // Bed / Analog pin numbering #define TEMP_BED_PIN 6 // Analog Input
// //
// Heaters / Fans // Heaters / Fans

View file

@ -78,9 +78,9 @@
// //
// Temperature Sensors // Temperature Sensors
// //
#define TEMP_0_PIN 2 // Extruder / Analog pin numbering #define TEMP_0_PIN 2 // Analog Input
#define TEMP_1_PIN 1 // Spare / Analog pin numbering #define TEMP_1_PIN 1 // Analog Input
#define TEMP_BED_PIN 0 // Bed / Analog pin numbering #define TEMP_BED_PIN 0 // Analog Input
// //
// Heaters / Fans // Heaters / Fans

View file

@ -64,9 +64,9 @@
// //
// Temperature sensors // Temperature sensors
// //
#define TEMP_0_PIN 15 #define TEMP_0_PIN 15 // Analog Input
#define TEMP_1_PIN 14 #define TEMP_1_PIN 14 // Analog Input
#define TEMP_BED_PIN 13 #define TEMP_BED_PIN 13 // Analog Input
// //
// Heaters / Fans // Heaters / Fans

View file

@ -51,11 +51,11 @@
// //
// Temperature Sensors // Temperature Sensors
// //
#define TEMP_0_PIN 0 // ANALOG INPUT !! #define TEMP_0_PIN 0 // Analog Input
#define TEMP_1_PIN 3 // 3 for tool2 -> 2 for chambertemp #define TEMP_1_PIN 3 // Analog Input. 3 for tool2 -> 2 for chambertemp
#define TEMP_2_PIN 2 // 9 for tool3 -> 2 for chambertemp #define TEMP_2_PIN 2 // Analog Input. 9 for tool3 -> 2 for chambertemp
#define TEMP_3_PIN 11 // 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
// //
// Heaters / Fans // Heaters / Fans

View file

@ -51,12 +51,12 @@
// //
// Temperature Sensors // Temperature Sensors
// //
#define TEMP_0_PIN 0 // ANALOG INPUT !! #define TEMP_0_PIN 0 // Analog Input
#define TEMP_1_PIN 9 // 9 for tool2 -> 13 for chambertemp #define TEMP_1_PIN 9 // Analog Input. 9 for tool2 -> 13 for chambertemp
#define TEMP_2_PIN 13 // 10 for tool3 -> 13 for chambertemp #define TEMP_2_PIN 13 // Analog Input. 10 for tool3 -> 13 for chambertemp
#define TEMP_3_PIN 11 // 11 for tool4 -> 13 for chambertemp #define TEMP_3_PIN 11 // Analog Input. 11 for tool4 -> 13 for chambertemp
#define TEMP_BED_PIN 14 // ANALOG INPUT !! #define TEMP_BED_PIN 14 // Analog Input
//#define TEMP_CHAMBER_PIN 13 // ANALOG INPUT !! //#define TEMP_CHAMBER_PIN 13 // Analog Input
// //
// Heaters / Fans // Heaters / Fans

View file

@ -77,10 +77,10 @@
// //
// Temperature Sensors // Temperature Sensors
// //
#define TEMP_0_PIN 3 // ANALOG NUMBERING #define TEMP_0_PIN 3 // Analog Input
#define TEMP_1_PIN 2 // ANALOG NUMBERING #define TEMP_1_PIN 2 // Analog Input
#define TEMP_2_PIN 1 // ANALOG NUMBERING #define TEMP_2_PIN 1 // Analog Input
#define TEMP_BED_PIN 0 // ANALOG NUMBERING #define TEMP_BED_PIN 0 // Analog Input
// //
// Heaters / Fans // Heaters / Fans

View file

@ -60,7 +60,7 @@
// //
// Temperature Sensors // Temperature Sensors
// //
#define TEMP_0_PIN 0 #define TEMP_0_PIN 0 // Analog Input
// //
// Heaters // Heaters

View file

@ -61,8 +61,8 @@
// //
// Temperature Sensors // Temperature Sensors
// //
#define TEMP_0_PIN 0 // ANALOG INPUT (pin 33 extruder) #define TEMP_0_PIN 0 // Analog Input (pin 33 extruder)
#define TEMP_BED_PIN 5 // ANALOG INPUT (pin 34 bed) #define TEMP_BED_PIN 5 // Analog Input (pin 34 bed)
// //
// Heaters // Heaters

View file

@ -56,23 +56,23 @@
#define Z_DIR_PIN 28 #define Z_DIR_PIN 28
#define Z_ENABLE_PIN 29 #define Z_ENABLE_PIN 29
#define E0_STEP_PIN 4 //Edited @ EJE Electronics 20100715 #define E0_STEP_PIN 4 //Edited @ EJE Electronics 20100715
#define E0_DIR_PIN 2 //Edited @ EJE Electronics 20100715 #define E0_DIR_PIN 2 //Edited @ EJE Electronics 20100715
#define E0_ENABLE_PIN 3 //Added @ EJE Electronics 20100715 #define E0_ENABLE_PIN 3 //Added @ EJE Electronics 20100715
// //
// Temperature Sensor // Temperature Sensor
// //
#define TEMP_0_PIN 5 //changed @ rkoeppl 20110410 #define TEMP_0_PIN 5 // Analog Input
// //
// Heaters // Heaters
// //
#define HEATER_0_PIN 14 //changed @ rkoeppl 20110410 #define HEATER_0_PIN 14 //changed @ rkoeppl 20110410
#if !MB(GEN6) #if !MB(GEN6)
#define HEATER_BED_PIN 1 //changed @ rkoeppl 20110410 #define HEATER_BED_PIN 1 //changed @ rkoeppl 20110410
#define TEMP_BED_PIN 0 //changed @ rkoeppl 20110410 #define TEMP_BED_PIN 0 // Analog Input
#endif #endif
// //

View file

@ -73,8 +73,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

View file

@ -32,40 +32,49 @@
#define GEN7_VERSION 14 // v1.4 #define GEN7_VERSION 14 // v1.4
//x axis pins //
#define X_STEP_PIN 29 // Limit switches
#define X_DIR_PIN 28 //
#define X_ENABLE_PIN 25 #define X_STOP_PIN 0
#define X_STOP_PIN 0 #define Y_STOP_PIN 1
#define Z_STOP_PIN 2
//y axis pins //
#define Y_STEP_PIN 27 // Steppers
#define Y_DIR_PIN 26 //
#define Y_ENABLE_PIN 25 #define X_STEP_PIN 29
#define Y_STOP_PIN 1 #define X_DIR_PIN 28
#define X_ENABLE_PIN 25
//z axis pins #define Y_STEP_PIN 27
#define Z_STEP_PIN 23 #define Y_DIR_PIN 26
#define Z_DIR_PIN 22 #define Y_ENABLE_PIN 25
#define Z_ENABLE_PIN 25
#define Z_STOP_PIN 2
//extruder pins #define Z_STEP_PIN 23
#define E0_STEP_PIN 19 #define Z_DIR_PIN 22
#define E0_DIR_PIN 18 #define Z_ENABLE_PIN 25
#define E0_ENABLE_PIN 25
#define TEMP_0_PIN 1 #define E0_STEP_PIN 19
#define TEMP_BED_PIN 0 #define E0_DIR_PIN 18
#define E0_ENABLE_PIN 25
//
// Temperature Sensors
//
#define TEMP_0_PIN 1 // Analog Input
#define TEMP_BED_PIN 0 // Analog Input
//
// Heaters
//
#define HEATER_0_PIN 4 #define HEATER_0_PIN 4
#define HEATER_BED_PIN 3 #define HEATER_BED_PIN 3
#define PS_ON_PIN 15 #define PS_ON_PIN 15
//our pin for debugging. // A pin for debugging
#define DEBUG_PIN 0 #define DEBUG_PIN 0
//our RS485 pins // RS485 pins
#define TX_ENABLE_PIN 12 #define TX_ENABLE_PIN 12
#define RX_ENABLE_PIN 13 #define RX_ENABLE_PIN 13

View file

@ -33,58 +33,66 @@
#define BOARD_NAME "Gen7 Custom" #define BOARD_NAME "Gen7 Custom"
//x axis pins //
#define X_STEP_PIN 21 // different from standard GEN7 // Limit Switches
#define X_DIR_PIN 20 // different from standard GEN7 //
#define X_ENABLE_PIN 24
#define X_STOP_PIN 0 #define X_STOP_PIN 0
#define Y_STOP_PIN 1
#define Z_STOP_PIN 2
//
// Steppers
//
#define X_STEP_PIN 21 // different from standard GEN7
#define X_DIR_PIN 20 // different from standard GEN7
#define X_ENABLE_PIN 24
//y axis pins
#define Y_STEP_PIN 23 #define Y_STEP_PIN 23
#define Y_DIR_PIN 22 #define Y_DIR_PIN 22
#define Y_ENABLE_PIN 24 #define Y_ENABLE_PIN 24
#define Y_STOP_PIN 1
//z axis pins
#define Z_STEP_PIN 26 #define Z_STEP_PIN 26
#define Z_DIR_PIN 25 #define Z_DIR_PIN 25
#define Z_ENABLE_PIN 24 #define Z_ENABLE_PIN 24
#define Z_STOP_PIN 2
//extruder pins
#define E0_STEP_PIN 28 #define E0_STEP_PIN 28
#define E0_DIR_PIN 27 #define E0_DIR_PIN 27
#define E0_ENABLE_PIN 24 #define E0_ENABLE_PIN 24
#define TEMP_0_PIN 2 //
#define TEMP_BED_PIN 1 // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!! (pin 34 bed) // Temperature Sensors
//
#define TEMP_0_PIN 2 // Analog Input
#define TEMP_BED_PIN 1 // Analog Input (pin 34 bed)
//
// Heaters
//
#define HEATER_0_PIN 4 #define HEATER_0_PIN 4
#define HEATER_BED_PIN 3 // (bed) #define HEATER_BED_PIN 3 // (bed)
#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
//our pin for debugging.
// A pin for debugging
#define DEBUG_PIN -1 #define DEBUG_PIN -1
//our RS485 pins #define BEEPER_PIN -1
//#define TX_ENABLE_PIN 12
//#define RX_ENABLE_PIN 13
#define BEEPER_PIN -1 // 4bit LCD Support
#define LCD_PINS_RS 18
//Pins for 4bit LCD Support
#define LCD_PINS_RS 18
#define LCD_PINS_ENABLE 17 #define LCD_PINS_ENABLE 17
#define LCD_PINS_D4 16 #define LCD_PINS_D4 16
#define LCD_PINS_D5 15 #define LCD_PINS_D5 15
#define LCD_PINS_D6 13 #define LCD_PINS_D6 13
#define LCD_PINS_D7 14 #define LCD_PINS_D7 14
//buttons are directly attached // Buttons are directly attached
#define BTN_EN1 11 #define BTN_EN1 11
#define BTN_EN2 10 #define BTN_EN2 10
#define BTN_ENC 12 #define BTN_ENC 12
// RS485 pins
//#define TX_ENABLE_PIN 12
//#define RX_ENABLE_PIN 13

View file

@ -74,9 +74,9 @@
// //
// Temperature Sensors // Temperature Sensors
// //
#define TEMP_0_PIN 13 //D27 // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!! #define TEMP_0_PIN 13 // Analog Input (D27)
#define TEMP_1_PIN 15 // 1 #define TEMP_1_PIN 15 // Analog Input (1)
#define TEMP_BED_PIN 14 // 1,2 or I2C #define TEMP_BED_PIN 14 // Analog Input (1,2 or I2C)
// //
// Heaters / Fans // Heaters / Fans

View file

@ -92,23 +92,23 @@
// Temperature Sensors // Temperature Sensors
// //
#if TEMP_SENSOR_0 == -1 #if TEMP_SENSOR_0 == -1
#define TEMP_0_PIN 4 // ANALOG NUMBERING #define TEMP_0_PIN 4 // Analog Input
#else #else
#define TEMP_0_PIN 0 // ANALOG NUMBERING #define TEMP_0_PIN 0 // Analog Input
#endif #endif
#if TEMP_SENSOR_1 == -1 #if TEMP_SENSOR_1 == -1
#define TEMP_1_PIN 5 // ANALOG NUMBERING #define TEMP_1_PIN 5 // Analog Input
#else #else
#define TEMP_1_PIN 2 // ANALOG NUMBERING #define TEMP_1_PIN 2 // Analog Input
#endif #endif
#define TEMP_2_PIN 3 // ANALOG NUMBERING #define TEMP_2_PIN 3 // Analog Input
#if TEMP_SENSOR_BED == -1 #if TEMP_SENSOR_BED == -1
#define TEMP_BED_PIN 6 // ANALOG NUMBERING #define TEMP_BED_PIN 6 // Analog Input
#else #else
#define TEMP_BED_PIN 1 // ANALOG NUMBERING #define TEMP_BED_PIN 1 // Analog Input
#endif #endif
// //

View file

@ -82,12 +82,12 @@
// Temperature Sensors // Temperature Sensors
// //
#if TEMP_SENSOR_0 == -1 #if TEMP_SENSOR_0 == -1
#define TEMP_0_PIN 8 // ANALOG NUMBERING #define TEMP_0_PIN 8 // Analog Input
#else #else
#define TEMP_0_PIN 13 // ANALOG NUMBERING #define TEMP_0_PIN 13 // Analog Input
#endif #endif
#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
// //
// Heaters / Fans // Heaters / Fans

View file

@ -86,21 +86,21 @@
// Temperature Sensors // Temperature Sensors
// //
#if TEMP_SENSOR_0 == -1 #if TEMP_SENSOR_0 == -1
#define TEMP_0_PIN 4 // ANALOG NUMBERING #define TEMP_0_PIN 4 // Analog Input
#else #else
#define TEMP_0_PIN 13 // ANALOG NUMBERING #define TEMP_0_PIN 13 // Analog Input
#endif #endif
#if TEMP_SENSOR_1 == -1 #if TEMP_SENSOR_1 == -1
#define TEMP_1_PIN 8 // ANALOG NUMBERING #define TEMP_1_PIN 8 // Analog Input
#else #else
#define TEMP_1_PIN 15 // ANALOG NUMBERING #define TEMP_1_PIN 15 // Analog Input
#endif #endif
#if TEMP_SENSOR_BED == -1 #if TEMP_SENSOR_BED == -1
#define TEMP_BED_PIN 8 // ANALOG NUMBERING #define TEMP_BED_PIN 8 // Analog Input
#else #else
#define TEMP_BED_PIN 14 // ANALOG NUMBERING #define TEMP_BED_PIN 14 // Analog Input
#endif #endif
// //

View file

@ -102,24 +102,24 @@
// Temperature Sensors // Temperature Sensors
// //
#if TEMP_SENSOR_0 == -1 #if TEMP_SENSOR_0 == -1
#define TEMP_0_PIN 11 // ANALOG NUMBERING #define TEMP_0_PIN 11 // Analog Input
#else #else
#define TEMP_0_PIN 15 // ANALOG NUMBERING #define TEMP_0_PIN 15 // Analog Input
#endif #endif
#if TEMP_SENSOR_1 == -1 #if TEMP_SENSOR_1 == -1
#define TEMP_1_PIN 10 // ANALOG NUMBERING #define TEMP_1_PIN 10 // Analog Input
#else #else
#define TEMP_1_PIN 13 // ANALOG NUMBERING #define TEMP_1_PIN 13 // Analog Input
#endif #endif
#if TEMP_SENSOR_2 == -1 #if TEMP_SENSOR_2 == -1
#define TEMP_2_PIN 9 // ANALOG NUMBERING #define TEMP_2_PIN 9 // Analog Input
#else #else
#define TEMP_2_PIN 12 // ANALOG NUMBERING #define TEMP_2_PIN 12 // Analog Input
#endif #endif
#if TEMP_SENSOR_BED == -1 #if TEMP_SENSOR_BED == -1
#define TEMP_BED_PIN 8 // ANALOG NUMBERING #define TEMP_BED_PIN 8 // Analog Input
#else #else
#define TEMP_BED_PIN 14 // ANALOG NUMBERING #define TEMP_BED_PIN 14 // Analog Input
#endif #endif
// //

View file

@ -89,9 +89,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

View file

@ -74,9 +74,9 @@
#define SDSS 16 #define SDSS 16
#define LED_PIN 46 #define LED_PIN 46
#define TEMP_0_PIN 7 // ANALOG NUMBERING #define TEMP_0_PIN 7 // Analog Input
#define TEMP_1_PIN 6 // ANALOG NUMBERING #define TEMP_1_PIN 6 // Analog Input
#define TEMP_BED_PIN 6 // ANALOG NUMBERING #define TEMP_BED_PIN 6 // Analog Input
// //
// Heaters / Fans // Heaters / Fans

View file

@ -98,9 +98,9 @@
#define HEATER_0_PIN 3 // DONE PWM on RIGHT connector #define HEATER_0_PIN 3 // DONE PWM on RIGHT connector
#define HEATER_BED_PIN 4 #define HEATER_BED_PIN 4
#define TEMP_0_PIN 0 // ANALOG INPUT NUMBERING #define TEMP_0_PIN 0 // Analog Input
#define TEMP_1_PIN 1 // ANALOG #define TEMP_1_PIN 1 // Analog Input
#define TEMP_BED_PIN 2 // 1,2 or I2C #define TEMP_BED_PIN 2 // Analog Input (1,2 or I2C)
#define I2C_SCL 16 #define I2C_SCL 16
#define I2C_SDA 17 #define I2C_SDA 17

View file

@ -56,20 +56,27 @@
#define BOARD_NAME "Alpha OMCA" #define BOARD_NAME "Alpha OMCA"
//
// Limit Switches
//
#define X_STOP_PIN 0
#define Y_STOP_PIN 1
#define Z_STOP_PIN 2
//
// Steppers
//
#define X_STEP_PIN 21 #define X_STEP_PIN 21
#define X_DIR_PIN 20 #define X_DIR_PIN 20
#define X_ENABLE_PIN 24 #define X_ENABLE_PIN 24
#define X_STOP_PIN 0
#define Y_STEP_PIN 23 #define Y_STEP_PIN 23
#define Y_DIR_PIN 22 #define Y_DIR_PIN 22
#define Y_ENABLE_PIN 24 #define Y_ENABLE_PIN 24
#define Y_STOP_PIN 1
#define Z_STEP_PIN 26 #define Z_STEP_PIN 26
#define Z_DIR_PIN 25 #define Z_DIR_PIN 25
#define Z_ENABLE_PIN 24 #define Z_ENABLE_PIN 24
#define Z_STOP_PIN 2
#define E0_STEP_PIN 28 #define E0_STEP_PIN 28
#define E0_DIR_PIN 27 #define E0_DIR_PIN 27
@ -83,10 +90,17 @@
#define E2_DIR_PIN -1 // 16 #define E2_DIR_PIN -1 // 16
#define E2_ENABLE_PIN 24 #define E2_ENABLE_PIN 24
#define SDSS 11 //
// Temperature Sensors
//
#define TEMP_0_PIN 0 // Analog Input (D27)
//
// Heaters / Fans
//
#define HEATER_0_PIN 4
#define FAN_PIN 3 #define FAN_PIN 3
#define HEATER_0_PIN 4 #define SDSS 11
#define TEMP_0_PIN 0 //D27 // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!!
/* 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

@ -79,10 +79,11 @@
#define Y_STOP_PIN 8 // Ystop in Ystop socket #define Y_STOP_PIN 8 // Ystop in Ystop socket
#endif #endif
#define Z_STOP_PIN 36 #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 #define TEMP_0_PIN 1 // Analog Input
#define TEMP_BED_PIN 0 // Analog Input
#define FILWIDTH_PIN 2 // Analog Input
////LCD Pin Setup//// ////LCD Pin Setup////