SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Avoid defining overriding definitions for the RepRapDiscount Smart

Browse source 
Controller. Remove common definitions. Harmonize declaration order.
This commit is contained in:
Jonathan Bastien-Filiatrault 2012-11-07 16:04:28 -05:00
parent 36b452c7ac
commit 0f73afb0b0
1 changed files with 26 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

48
Marlin/pins.h
View file

@ -360,7 +360,12 @@
#define FAN_PIN 4 // IO pin. Buffer needed #define FAN_PIN 4 // IO pin. Buffer needed
#endif #endif
#define PS_ON_PIN 12 #define PS_ON_PIN 12
#ifdef REPRAP_DISCOUNT_SMART_CONTROLLER
#define KILL_PIN 41
#else
#define KILL_PIN -1 #define KILL_PIN -1
#endif
#define HEATER_0_PIN 10 // EXTRUDER 1 #define HEATER_0_PIN 10 // EXTRUDER 1
#if MOTHERBOARD == 33 #if MOTHERBOARD == 33
@ -378,36 +383,16 @@
#ifdef ULTRA_LCD #ifdef ULTRA_LCD
#ifdef NEWPANEL #ifdef NEWPANEL
//arduino pin which triggers an piezzo beeper
#define BEEPER 33 // Beeper on AUX-4
#define LCD_PINS_RS 16
#define LCD_PINS_ENABLE 17
#define LCD_PINS_D4 23
#define LCD_PINS_D5 25
#define LCD_PINS_D6 27
#define LCD_PINS_D7 29
//buttons are directly attached using AUX-2
#define BTN_EN1 37
#define BTN_EN2 35
#define BTN_ENC 31 //the click
#define BLEN_C 2
#define BLEN_B 1
#define BLEN_A 0
#define SDCARDDETECT -1 // Ramps does not use this port
//encoder rotation values //encoder rotation values
#define encrot0 0 #define encrot0 0
#define encrot1 2 #define encrot1 2
#define encrot2 3 #define encrot2 3
#define encrot3 1 #define encrot3 1
#ifdef REPRAP_DISCOUNT_SMART_CONTROLLER #define BLEN_A 0
// Override partially the above definitions #define BLEN_B 1
#define KILL_PIN 41 #define BLEN_C 2
#define LCD_PINS_RS 16 #define LCD_PINS_RS 16
#define LCD_PINS_ENABLE 17 #define LCD_PINS_ENABLE 17
#define LCD_PINS_D4 23 #define LCD_PINS_D4 23
@ -415,11 +400,24 @@
#define LCD_PINS_D6 27 #define LCD_PINS_D6 27
#define LCD_PINS_D7 29 #define LCD_PINS_D7 29
#ifdef REPRAP_DISCOUNT_SMART_CONTROLLER
#define BEEPER 37
#define BTN_EN1 31 #define BTN_EN1 31
#define BTN_EN2 33 #define BTN_EN2 33
#define BTN_ENC 35 #define BTN_ENC 35
#define BEEPER 37
#define SDCARDDETECT 49 #define SDCARDDETECT 49
#else
//arduino pin which triggers an piezzo beeper
#define BEEPER 33 // Beeper on AUX-4
//buttons are directly attached using AUX-2
#define BTN_EN1 37
#define BTN_EN2 35
#define BTN_ENC 31 //the click
#define SDCARDDETECT -1 // Ramps does not use this port
#endif #endif
#else //old style panel with shift register #else //old style panel with shift register