Follow-up the PR #4955, etc

・More ANALOG NUMBERING to Analog Input
・Add comment header to all the section of all the pins files

・Sort sections as follows:
1. Some special definitions (USBCON, LARGE_FLASH, etc)
2. Servos
3. Limit Switches
4. Z Probe
5. Steppers
6. Temperature Sensors
7. Heaters / Fans
8. Misc. Functions
9. LCD / Controller

・Move MAX6675_SS into "Temperature Sensors" section
・Adjust spacing
This commit is contained in:
esenapaj
2016-10-09 05:27:04 +09:00
parent 00456b0cb3
commit f41c60d4a4
49 changed files with 739 additions and 484 deletions

View File

@@ -34,35 +34,44 @@
#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 Y_STEP_PIN 22
#define Y_DIR_PIN 23
#define Y_STOP_PIN 19
#define Z_STEP_PIN 3
#define Z_DIR_PIN 2
#define Z_STOP_PIN 20
#define E0_STEP_PIN 1
#define E0_DIR_PIN 0
#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
//
// Z Probe (when not Z_MIN_PIN)
//
#if ENABLED(Z_PROBE_SLED)
#define SLED_PIN -1
#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)
#if ENABLED(SANGUINOLOLU_V_1_2)
@@ -79,7 +88,7 @@
#else
#define HEATER_BED_PIN 14 // (bed)
#define HEATER_BED_PIN 14 // (bed)
#define X_ENABLE_PIN -1
#define Y_ENABLE_PIN -1
#define Z_ENABLE_PIN -1
@@ -87,16 +96,29 @@
#endif
#define TEMP_0_PIN 7 // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!! (pin 33 extruder)
#define TEMP_BED_PIN 6 // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!! (pin 34 bed)
#define SDSS 31
#if MB(AZTEEG_X1) || MB(STB_11) || IS_MELZI
#define FAN_PIN 4 // Works for Panelolu2 too
#endif
//
// Misc. Functions
//
/**
* 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.
*/
//#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)
// No buzzer installed
@@ -105,12 +127,12 @@
// LCD Pins
#if ENABLED(DOGLCD)
#if ENABLED(U8GLIB_ST7920) //SPI GLCD 12864 ST7920 ( like [www.digole.com] ) For Melzi V2.0
#if ENABLED(U8GLIB_ST7920) // SPI GLCD 12864 ST7920 ( like [www.digole.com] ) For Melzi V2.0
#if IS_MELZI // Melzi board
#define LCD_PINS_RS 30 //CS chip select /SS chip slave select
#define LCD_PINS_ENABLE 29 //SID (MOSI)
#define LCD_PINS_D4 17 //SCK (CLK) clock
#define LCD_PINS_RS 30 // CS chip select /SS chip slave select
#define LCD_PINS_ENABLE 29 // SID (MOSI)
#define LCD_PINS_D4 17 // SCK (CLK) clock
// Pin 27 is taken by LED_PIN, but Melzi LED does nothing with
// Marlin so this can be used for BEEPER_PIN. You can use this pin
// with M42 instead of BEEPER_PIN.
@@ -162,7 +184,7 @@
#else
#define BTN_ENC 16
#define LCD_SDSS 28 // Smart Controller SD card reader rather than the Melzi
#endif //Panelolu2
#endif // Panelolu2
#define SD_DETECT_PIN -1