Skip to content

M
MarlinKimbra
Commit a623de84 authored by MagoKimbra's avatar MagoKimbra
Browse files
Options

Fix Board MELZI

parent 74dd3e2d
Show whitespace changes
Inline Side-by-side
Showing with 141 additions and 127 deletions
MarlinKimbra/pins.h
View file @ a623de84
...@@ -2875,67 +2875,55 @@ ...@@ -2875,67 +2875,55 @@
* 66 - MELZI 1284 * 66 - MELZI 1284
****************************************************************************************/ ****************************************************************************************/
#if MB(SANGUINOLOLU_12) || MB(MELZI) || MB(STB_11) || MB(AZTEEG_X1) || MB(MELZI_1284) #if MB(SANGUINOLOLU_11) || MB(SANGUINOLOLU_12) || MB(MELZI) || MB(STB_11) || MB(AZTEEG_X1) || MB(MELZI_1284)
#if !defined(__AVR_ATmega644P__) && !defined(__AVR_ATmega1284P__) #if !defined(__AVR_ATmega644P__) && !defined(__AVR_ATmega1284P__)
#error Oops! Make sure you have 'Sanguino' selected from the 'Tools -> Boards' menu. #error Oops! Make sure you have 'Sanguino' selected from the 'Tools -> Boards' menu.
#endif #endif
#undef MOTHERBOARD #define KNOWN_BOARD 1
#define MOTHERBOARD BOARD_SANGUINOLOLU_11
#if !MB(SANGUINOLOLU_11)
#define SANGUINOLOLU_V_1_2 #define SANGUINOLOLU_V_1_2
#endif
#if defined(__AVR_ATmega1284P__) #if defined(__AVR_ATmega1284P__)
#define LARGE_FLASH true #define LARGE_FLASH true
#endif #endif
#endif
#if MB(SANGUINOLOLU_11) #define ORIG_X_STEP_PIN 15
#define KNOWN_BOARD 1 #define ORIG_X_DIR_PIN 21
#ifndef __AVR_ATmega644P__ #define X_STOP_PIN 18
#ifndef __AVR_ATmega1284P__
#error Oops! Make sure you have 'Sanguino' selected from the 'Tools -> Boards' menu.
#endif
#endif
#define ORIG_X_STEP_PIN 15 #define ORIG_Y_STEP_PIN 22
#define ORIG_X_DIR_PIN 21 #define ORIG_Y_DIR_PIN 23
#define X_STOP_PIN 18 #define Y_STOP_PIN 19
#define ORIG_Y_STEP_PIN 22 #define ORIG_Z_STEP_PIN 3
#define ORIG_Y_DIR_PIN 23 #define ORIG_Z_DIR_PIN 2
#define Y_STOP_PIN 19 #define Z_STOP_PIN 20
#define ORIG_Z_STEP_PIN 3 #define ORIG_E0_STEP_PIN 1
#define ORIG_Z_DIR_PIN 2 #define ORIG_E0_DIR_PIN 0
#define Z_STOP_PIN 20
#define ORIG_E0_STEP_PIN 1 #define LED_PIN -1
#define ORIG_E0_DIR_PIN 0
#define LED_PIN -1 #define ORIG_FAN_PIN -1
#define ORIG_FAN_PIN -1 #if ORIG_FAN_PIN == 12 || ORIG_FAN_PIN ==13
#if ORIG_FAN_PIN == 12 || ORIG_FAN_PIN ==13
#define FAN_SOFT_PWM #define FAN_SOFT_PWM
#endif #endif
#if MB(MELZI) #if MB(AZTEEG_X1) || MB(STB_11) || MB(MELZI)
#define LED_PIN 27
#define ORIG_FAN_PIN 4 // Works for Panelolu2 too #define ORIG_FAN_PIN 4 // Works for Panelolu2 too
#endif #if MB(MELZI)
#define LED_PIN 27
#if MB(STB_11) #elif MB(STB_11)
#define ORIG_FAN_PIN 4
// Uncomment this if you have the first generation (V1.10) of STBs board
#define LCD_PIN_BL 17 // LCD backlight LED #define LCD_PIN_BL 17 // LCD backlight LED
#endif #endif
#endif
#if MB(AZTEEG_X1)
#define ORIG_FAN_PIN 4
#endif
#if NUM_SERVOS > 0 #if NUM_SERVOS > 0
#define SERVO0_PIN -1 #define SERVO0_PIN -1
#if NUM_SERVOS > 1 #if NUM_SERVOS > 1
#define SERVO1_PIN -1 #define SERVO1_PIN -1
...@@ -2946,16 +2934,16 @@ ...@@ -2946,16 +2934,16 @@
#endif #endif
#endif #endif
#endif #endif
#endif #endif
#define PS_ON_PIN -1 #define PS_ON_PIN -1
#define KILL_PIN -1 #define KILL_PIN -1
#define ORIG_HEATER_0_PIN 13 // (extruder) #define ORIG_HEATER_0_PIN 13 // (extruder)
#define ORIG_HEATER_1_PIN -1 #define ORIG_HEATER_1_PIN -1
#define ORIG_HEATER_2_PIN -1 #define ORIG_HEATER_2_PIN -1
#if ENABLED(SANGUINOLOLU_V_1_2) #if ENABLED(SANGUINOLOLU_V_1_2)
#define ORIG_HEATER_BED_PIN 12 // (bed) #define ORIG_HEATER_BED_PIN 12 // (bed)
#define ORIG_X_ENABLE_PIN 14 #define ORIG_X_ENABLE_PIN 14
...@@ -2967,86 +2955,112 @@ ...@@ -2967,86 +2955,112 @@
#define ORIG_FAN_PIN 4 // Uses Transistor1 (PWM) on Panelolu2's Sanguino Adapter Board to drive the fan #define ORIG_FAN_PIN 4 // Uses Transistor1 (PWM) on Panelolu2's Sanguino Adapter Board to drive the fan
#endif #endif
#else #else
#define ORIG_HEATER_BED_PIN 14 // (bed) #define ORIG_HEATER_BED_PIN 14 // (bed)
#define ORIG_X_ENABLE_PIN -1 #define ORIG_X_ENABLE_PIN -1
#define ORIG_Y_ENABLE_PIN -1 #define ORIG_Y_ENABLE_PIN -1
#define ORIG_Z_ENABLE_PIN -1 #define ORIG_Z_ENABLE_PIN -1
#define ORIG_E0_ENABLE_PIN -1 #define ORIG_E0_ENABLE_PIN -1
#endif #endif
#define ORIG_TEMP_0_PIN 7 // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!! (pin 33 extruder) #define ORIG_TEMP_0_PIN 7 // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!! (pin 33 extruder)
#define ORIG_TEMP_1_PIN -1 #define ORIG_TEMP_1_PIN -1
#define ORIG_TEMP_2_PIN -1 #define ORIG_TEMP_2_PIN -1
#define ORIG_TEMP_BED_PIN 6 // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!! (pin 34 bed) #define ORIG_TEMP_BED_PIN 6 // MUST USE ANALOG INPUT NUMBERING NOT DIGITAL OUTPUT NUMBERING!!!!!!!!! (pin 34 bed)
#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 should upgrade your Sanguino libraries! See #368.
*/
//#define SDSS 24
/* 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. */ #if ENABLED(ULTRA_LCD) && ENABLED(NEWPANEL)
//#define SDSS 24
#if ENABLED(ULTRA_LCD) // No buzzer installed
#if ENABLED(NEWPANEL)
//we have no buzzer installed
#define BEEPER_PIN -1 #define BEEPER_PIN -1
//LCD Pins //LCD Pins
#if ENABLED(DOGLCD) #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 MB(MELZI) // Melzi board
#define LCD_PINS_RS 30 //CS chip select /SS chip slave select #define LCD_PINS_RS 30 //CS chip select /SS chip slave select
#define LCD_PINS_ENABLE 29 //SID (MOSI) #define LCD_PINS_ENABLE 29 //SID (MOSI)
#define LCD_PINS_D4 17 //SCK (CLK) clock #define LCD_PINS_D4 17 //SCK (CLK) clock
#define BEEPER_PIN 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 #define BEEPER_PIN 27 // 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.
#else #else // Sanguinololu 1.3
// Pins for DOGM SPI LCD Support #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_A0 30
#define DOGLCD_CS 29 #define DOGLCD_CS 29
#define LCD_CONTRAST 1 #define LCD_CONTRAST 1
#endif #endif
#else // standard Hitachi LCD controller
// 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_RS 4
#define LCD_PINS_ENABLE 17 #define LCD_PINS_ENABLE 17
#define LCD_PINS_D4 30 #define LCD_PINS_D4 30
#define LCD_PINS_D5 29 #define LCD_PINS_D5 29
#define LCD_PINS_D6 28 #define LCD_PINS_D6 28
#define LCD_PINS_D7 27 #define LCD_PINS_D7 27
#endif #endif // !DOGLCD
//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
#if ENABLED(LCD_I2C_PANELOLU2) #if ENABLED(LCD_I2C_PANELOLU2)
#if ENABLED(MELZI) #if MB(MELZI)
#define BTN_ENC 29 //the click switch #define BTN_ENC 29
#define LCD_SDSS 30 //to use the SD card reader on the Panelolu2 rather than the melzi board #define LCD_SDSS 30 // Panelolu2 SD card reader rather than the Melzi
#else #else
#define BTN_ENC 30 //the click switch #define BTN_ENC 30
#endif #endif
#else #else
#define BTN_ENC 16 //the click switch #define BTN_ENC 16
#define LCD_SDSS 28 //to use the SD card reader on the smart controller rather than the melzi board #define LCD_SDSS 28 // Smart Controller SD card reader rather than the Melzi
#endif //Panelolu2 #endif //Panelolu2
//not connected to a pin
#define SD_DETECT_PIN -1
#endif //Newpanel #define SD_DETECT_PIN -1
#endif //ULTRA_LCD
#if ENABLED(MAKRPANEL) #elif ENABLED(MAKRPANEL)
#define BEEPER_PIN 29 #define BEEPER_PIN 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
#define LCD_SCREEN_ROT_0
//#define LCD_SCREEN_ROT_90
//#define LCD_SCREEN_ROT_180
//#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 SD_DETECT_PIN -1 #define SD_DETECT_PIN -1
#endif //Makrpanel
#endif // MAKRPANEL
#endif // SANGUINOLOLU_11 #endif // SANGUINOLOLU_11
/****************************************************************************************/ /****************************************************************************************/
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment