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

Formatting Changes

Browse Source 
Fixes for some code formatting changes and commenting out the
ADAFRUIT_ST7565 define that was left defined.
This commit is contained in:
Ed Boston 2015-05-17 13:39:24 -07:00
parent 41f8cdb3a6
commit 1999ac415c
4 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/Conditionals.h
View File

@ -31,8 +31,8 @@
#define DEFAULT_LCD_CONTRAST 95 #define DEFAULT_LCD_CONTRAST 95
#elif defined(VIKI2) #elif defined(VIKI2)
#define DEFAULT_LCD_CONTRAST 40 #define DEFAULT_LCD_CONTRAST 40
#elif defined(ADAFRUIT_ST7565) #elif defined(ADAFRUIT_ST7565)
#define DEFAULT_LCD_CONTRAST 110 #define DEFAULT_LCD_CONTRAST 110
#endif #endif
#define ENCODER_PULSES_PER_STEP 4 #define ENCODER_PULSES_PER_STEP 4

3
Marlin/Configuration.h
View File

@ -660,7 +660,8 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
//#define VIKI2 //#define VIKI2
//#define miniVIKI //#define miniVIKI
#define ADAFRUIT_ST7565 // The Adafruit ST7565 is a custom display. More info will be posted as the project files are finialized.
//#define ADAFRUIT_ST7565
// The RepRapDiscount Smart Controller (white PCB) // The RepRapDiscount Smart Controller (white PCB)
// http://reprap.org/wiki/RepRapDiscount_Smart_Controller // http://reprap.org/wiki/RepRapDiscount_Smart_Controller

2
Marlin/dogm_lcd_implementation.h
View File

@ -127,7 +127,7 @@
// Mini Viki and Viki 2.0 LCD, ST7565 controller as well // Mini Viki and Viki 2.0 LCD, ST7565 controller as well
U8GLIB_NHD_C12864 u8g(DOGLCD_CS, DOGLCD_A0); U8GLIB_NHD_C12864 u8g(DOGLCD_CS, DOGLCD_A0);
#elif defined(ADAFRUIT_ST7565) #elif defined(ADAFRUIT_ST7565)
U8GLIB_LM6059 u8g(DOGLCD_CS, DOGLCD_A0); U8GLIB_LM6059 u8g(DOGLCD_CS, DOGLCD_A0);
#else #else
// for regular DOGM128 display with HW-SPI // for regular DOGM128 display with HW-SPI
U8GLIB_DOGM128 u8g(DOGLCD_CS, DOGLCD_A0); // HW-SPI Com: CS, A0 U8GLIB_DOGM128 u8g(DOGLCD_CS, DOGLCD_A0); // HW-SPI Com: CS, A0

8
Marlin/pins_RAMPS_13.h
View File

@ -180,13 +180,13 @@
#define BTN_ENC -1 #define BTN_ENC -1
#define LCD_SDSS 53 #define LCD_SDSS 53
#define SDCARDDETECT 49 #define SDCARDDETECT 49
#elif defined(ADAFRUIT_ST7565) #elif defined(ADAFRUIT_ST7565)
#define BTN_EN1 35 #define BTN_EN1 35
#define BTN_EN2 37 #define BTN_EN2 37
#define BTN_ENC 31 #define BTN_ENC 31
#define SDCARDDETECT 49 #define SDCARDDETECT 49
#define SDCARDDETECTINVERTED #define SDCARDDETECTINVERTED
#define SDSLOW #define SDSLOW
#define LCD_SDSS 53 #define LCD_SDSS 53
#define KILL_PIN 41 #define KILL_PIN 41
#define BEEPER 23 #define BEEPER 23
@ -222,7 +222,7 @@
#endif #endif
#endif #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
#define BEEPER 33 // No Beeper added #define BEEPER 33 // No Beeper added