CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #292 from jothan/lcdfix

Browse Source 
Lcd fixes
This commit is contained in:
daid 2012-11-07 13:10:59 -08:00
commit ccd9fd0dc3
3 changed files with 43 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Marlin/Configuration.h
View File

@ -296,8 +296,13 @@ const bool Z_ENDSTOPS_INVERTING = true; // set to true to invert the logic of th
//#define ULTIMAKERCONTROLLER //as available from the ultimaker online store. //#define ULTIMAKERCONTROLLER //as available from the ultimaker online store.
//#define ULTIPANEL //the ultipanel as on thingiverse //#define ULTIPANEL //the ultipanel as on thingiverse
// The RepRapDiscount Smart Controller
// http://reprap.org/wiki/RepRapDiscount_Smart_Controller
//#define REPRAP_DISCOUNT_SMART_CONTROLLER
#ifdef ULTIMAKERCONTROLLER //automatic expansion
//automatic expansion
#if defined(ULTIMAKERCONTROLLER) || defined(REPRAP_DISCOUNT_SMART_CONTROLLER)
#define ULTIPANEL #define ULTIPANEL
#define NEWPANEL #define NEWPANEL
#endif #endif

8
Marlin/Makefile
View File

@ -89,10 +89,10 @@ SRC = pins_arduino.c wiring.c \
wiring_analog.c wiring_digital.c \ wiring_analog.c wiring_digital.c \
wiring_pulse.c \ wiring_pulse.c \
wiring_shift.c WInterrupts.c wiring_shift.c WInterrupts.c
CXXSRC = WMath.cpp WString.cpp Print.cpp \ CXXSRC = WMath.cpp WString.cpp Print.cpp Marlin.cpp Marlin_main.cpp \
Marlin.cpp MarlinSerial.cpp Sd2Card.cpp SdBaseFile.cpp \ MarlinSerial.cpp Sd2Card.cpp SdBaseFile.cpp SdFatUtil.cpp \
SdFatUtil.cpp SdFile.cpp SdVolume.cpp motion_control.cpp \ SdFile.cpp SdVolume.cpp motion_control.cpp planner.cpp \
planner.cpp stepper.cpp temperature.cpp cardreader.cpp stepper.cpp temperature.cpp cardreader.cpp
#CXXSRC += LiquidCrystal.cpp ultralcd.cpp #CXXSRC += LiquidCrystal.cpp ultralcd.cpp
#CXXSRC += ultralcd.cpp #CXXSRC += ultralcd.cpp
FORMAT = ihex FORMAT = ihex

45
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,8 +383,15 @@
#ifdef ULTRA_LCD #ifdef ULTRA_LCD
#ifdef NEWPANEL #ifdef NEWPANEL
//arduino pin which triggers an piezzo beeper //encoder rotation values
#define BEEPER 33 // Beeper on AUX-4 #define encrot0 0
#define encrot1 2
#define encrot2 3
#define encrot3 1
#define BLEN_A 0
#define BLEN_B 1
#define BLEN_C 2
#define LCD_PINS_RS 16 #define LCD_PINS_RS 16
#define LCD_PINS_ENABLE 17 #define LCD_PINS_ENABLE 17
@ -388,22 +400,25 @@
#define LCD_PINS_D6 27 #define LCD_PINS_D6 27
#define LCD_PINS_D7 29 #define LCD_PINS_D7 29
//buttons are directly attached using AUX-2 #ifdef REPRAP_DISCOUNT_SMART_CONTROLLER
#define BTN_EN1 37 #define BEEPER 37
#define BTN_EN2 35
#define BTN_ENC 31 //the click
#define BLEN_C 2 #define BTN_EN1 31
#define BLEN_B 1 #define BTN_EN2 33
#define BLEN_A 0 #define BTN_ENC 35
#define SDCARDDETECT -1 // Ramps does not use this port #define SDCARDDETECT 49
#else
//arduino pin which triggers an piezzo beeper
#define BEEPER 33 // Beeper on AUX-4
//encoder rotation values //buttons are directly attached using AUX-2
#define encrot0 0 #define BTN_EN1 37
#define encrot1 2 #define BTN_EN2 35
#define encrot2 3 #define BTN_ENC 31 //the click
#define encrot3 1
#define SDCARDDETECT -1 // Ramps does not use this port
#endif
#else //old style panel with shift register #else //old style panel with shift register
//arduino pin witch triggers an piezzo beeper //arduino pin witch triggers an piezzo beeper