bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Better Sanguinololu & Graphical Controller (PR#2504)

Browse Source 
- Change suggested at
https://github.com/MarlinFirmware/Marlin/issues/2482#issuecomment-123553
266
This commit is contained in:
Scott Lahteine 2015-07-23 12:33:22 -07:00 committed by Richard Wackerbarth
parent a1154d4a20
commit f7e7862588
1 changed files with 109 additions and 96 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

205
Marlin/pins_SANGUINOLOLU_11.h
View File

@ -14,34 +14,23 @@
#define Y_DIR_PIN 23 #define Y_DIR_PIN 23
#define Y_STOP_PIN 19 #define Y_STOP_PIN 19
#define Z_STEP_PIN 3 #define Z_STEP_PIN 3
#define Z_DIR_PIN 2 #define Z_DIR_PIN 2
#define Z_STOP_PIN 20 #define Z_STOP_PIN 20
#define E0_STEP_PIN 1 #define E0_STEP_PIN 1
#define E0_DIR_PIN 0 #define E0_DIR_PIN 0
#define LED_PIN -1 #define LED_PIN -1
#define FAN_PIN -1 #define FAN_PIN -1
// #if FAN_PIN == 12 || FAN_PIN ==13 #if MB(AZTEEG_X1) || MB(STB_11) || MB(MELZI)
// #define FAN_SOFT_PWM #define FAN_PIN 4 // Works for Panelolu2 too
// #endif #if MB(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.
#if MB(MELZI) #elif MB(STB_11)
#define LED_PIN 27 /* On some broken versions of the Sanguino libraries the pin definitions are wrong, which then needs LED_PIN as pin 28. But you better upgrade your Sanguino libraries! See #368. */ #define LCD_PIN_BL 17 // LCD backlight LED
#define FAN_PIN 4 // Works for Panelolu2 too #endif
#endif
#if MB(STB_11)
#define FAN_PIN 4
// Uncomment this if you have the first generation (V1.10) of STBs board
#define LCD_PIN_BL 17 // LCD backlight LED
#endif
#if MB(AZTEEG_X1)
#define FAN_PIN 4
#endif #endif
#ifdef Z_PROBE_SLED #ifdef Z_PROBE_SLED
@ -49,13 +38,13 @@
#endif #endif
#ifdef NUM_SERVOS #ifdef NUM_SERVOS
#define SERVO0_PIN -1 #define SERVO0_PIN -1
#if NUM_SERVOS > 1 #if NUM_SERVOS > 1
#define SERVO1_PIN -1 #define SERVO1_PIN -1
#if NUM_SERVOS > 2 #if NUM_SERVOS > 2
#define SERVO2_PIN -1 #define SERVO2_PIN -1
#if NUM_SERVOS > 3 #if NUM_SERVOS > 3
#define SERVO3_PIN -1 #define SERVO3_PIN -1
#endif #endif
#endif #endif
#endif #endif
@ -70,23 +59,23 @@
#ifdef SANGUINOLOLU_V_1_2 #ifdef SANGUINOLOLU_V_1_2
#define HEATER_BED_PIN 12 // (bed) #define HEATER_BED_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 E0_ENABLE_PIN 14 #define E0_ENABLE_PIN 14
#ifdef LCD_I2C_PANELOLU2 #ifdef LCD_I2C_PANELOLU2
#define FAN_PIN 4 // Uses Transistor1 (PWM) on Panelolu2's Sanguino Adapter Board to drive the fan #define FAN_PIN 4 // Uses Transistor1 (PWM) on Panelolu2's Sanguino Adapter Board to drive the fan
#endif #endif
#else #else
#define HEATER_BED_PIN 14 // (bed) #define HEATER_BED_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 E0_ENABLE_PIN -1 #define E0_ENABLE_PIN -1
#endif #endif
@ -97,77 +86,101 @@
#define SDPOWER -1 #define SDPOWER -1
#define SDSS 31 #define SDSS 31
/* On some broken versions of the Sanguino libraries the pin definitions are wrong, which then needs SDSS as pin 24. But you better upgrade your Sanguino libraries! See #368. */ /**
* 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 24
#ifdef ULTRA_LCD #if defined(ULTRA_LCD) && defined(NEWPANEL)
#ifdef NEWPANEL
//we have no buzzer installed
#define BEEPER -1
//LCD Pins
#ifdef DOGLCD
#ifdef U8GLIB_ST7920 //SPI GLCD 12864 ST7920 ( like [www.digole.com] ) For Melzi V2.0
#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 BEEPER 27 // Pin 27 is take by LED_Pin, but Melzi LED do nothing with Marlin and I take this pin for BEEPER.... See here > [github.com] , If you want use this pin with Gcode M42 instead BEEPER
#else
// Pins for DOGM SPI LCD Support
#define DOGLCD_A0 30
#define DOGLCD_CS 29
#define LCD_CONTRAST 1
#endif
// Uncomment screen orientation
#define LCD_SCREEN_ROT_0
// #define LCD_SCREEN_ROT_90
// #define LCD_SCREEN_ROT_180
// #define LCD_SCREEN_ROT_270
#else // standard Hitachi LCD controller
#define LCD_PINS_RS 4
#define LCD_PINS_ENABLE 17
#define LCD_PINS_D4 30
#define LCD_PINS_D5 29
#define LCD_PINS_D6 28
#define LCD_PINS_D7 27
#endif
//The encoder and click button
#define BTN_EN1 11
#define BTN_EN2 10
#ifdef LCD_I2C_PANELOLU2
#if MB(MELZI)
#define BTN_ENC 29 //the click switch
#define LCD_SDSS 30 //to use the SD card reader on the Panelolu2 rather than the melzi board
#else
#define BTN_ENC 30 //the click switch
#endif
#else
#define BTN_ENC 16 //the click switch
#define LCD_SDSS 28 //to use the SD card reader on the smart controller rather than the melzi board
#endif //Panelolu2
//not connected to a pin
#define SDCARDDETECT -1
#endif //NEWPANEL // No buzzer installed
#endif //ULTRA_LCD #define BEEPER -1
#ifdef MAKRPANEL // LCD Pins
#define BEEPER 29 #ifdef DOGLCD
#ifdef U8GLIB_ST7920 //SPI GLCD 12864 ST7920 ( like [www.digole.com] ) For Melzi V2.0
#if MB(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 BEEPER 27 // Pin 27 is take by LED_Pin, but Melzi LED do nothing with Marlin and I take this pin for BEEPER.... See here > [github.com] , If you want use this pin with Gcode M42 instead BEEPER
#else // Sanguinololu 1.3
#define LCD_PINS_RS 4
#define LCD_PINS_ENABLE 17
#define LCD_PINS_D4 30
#define LCD_PINS_D5 29
#define LCD_PINS_D6 28
#define LCD_PINS_D7 27
#endif
#else // DOGM SPI LCD Support
#define DOGLCD_A0 30
#define DOGLCD_CS 29
#define LCD_CONTRAST 1
#endif
// Uncomment screen orientation
#define LCD_SCREEN_ROT_0
// #define LCD_SCREEN_ROT_90
// #define LCD_SCREEN_ROT_180
// #define LCD_SCREEN_ROT_270
#else // !DOGLCD - Standard Hitachi LCD controller
#define LCD_PINS_RS 4
#define LCD_PINS_ENABLE 17
#define LCD_PINS_D4 30
#define LCD_PINS_D5 29
#define LCD_PINS_D6 28
#define LCD_PINS_D7 27
#endif // !DOGLCD
//The encoder and click button
#define BTN_EN1 11
#define BTN_EN2 10
#ifdef LCD_I2C_PANELOLU2
#if MB(MELZI)
#define BTN_ENC 29
#define LCD_SDSS 30 // Panelolu2 SD card reader rather than the Melzi
#else
#define BTN_ENC 30
#endif
#else
#define BTN_ENC 16
#define LCD_SDSS 28 // Smart Controller SD card reader rather than the Melzi
#endif //Panelolu2
#define SDCARDDETECT -1
#elif defined(MAKRPANEL)
#define BEEPER 29
// Pins for DOGM SPI LCD Support // Pins for DOGM SPI LCD Support
#define DOGLCD_A0 30 #define DOGLCD_A0 30
#define DOGLCD_CS 17 #define DOGLCD_CS 17
#define LCD_PIN_BL 28 // backlight LED on PA3 #define LCD_PIN_BL 28 // backlight LED on PA3
// GLCD features // GLCD features
#define LCD_CONTRAST 1 #define LCD_CONTRAST 1
// Uncomment screen orientation // Uncomment screen orientation
#define LCD_SCREEN_ROT_0 #define LCD_SCREEN_ROT_0
// #define LCD_SCREEN_ROT_90 // #define LCD_SCREEN_ROT_90
// #define LCD_SCREEN_ROT_180 // #define LCD_SCREEN_ROT_180
// #define LCD_SCREEN_ROT_270 // #define LCD_SCREEN_ROT_270
//The encoder and click button //The encoder and click button
#define BTN_EN1 11 #define BTN_EN1 11
#define BTN_EN2 10 #define BTN_EN2 10
#define BTN_ENC 16 //the click switch #define BTN_ENC 16
//not connected to a pin
#define SDCARDDETECT -1
#endif //Makrpanel
#define SDCARDDETECT -1
#endif // MAKRPANEL
// #if FAN_PIN == 12 || FAN_PIN ==13
// #define FAN_SOFT_PWM
// #endif