Formatting Changes
Fixes for some code formatting changes and commenting out the ADAFRUIT_ST7565 define that was left defined.
This commit is contained in:
parent
41f8cdb3a6
commit
1999ac415c
@ -31,8 +31,8 @@
|
||||
#define DEFAULT_LCD_CONTRAST 95
|
||||
#elif defined(VIKI2)
|
||||
#define DEFAULT_LCD_CONTRAST 40
|
||||
#elif defined(ADAFRUIT_ST7565)
|
||||
#define DEFAULT_LCD_CONTRAST 110
|
||||
#elif defined(ADAFRUIT_ST7565)
|
||||
#define DEFAULT_LCD_CONTRAST 110
|
||||
#endif
|
||||
|
||||
#define ENCODER_PULSES_PER_STEP 4
|
||||
|
@ -660,7 +660,8 @@ const bool Z_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the logic
|
||||
//#define VIKI2
|
||||
//#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)
|
||||
// http://reprap.org/wiki/RepRapDiscount_Smart_Controller
|
||||
|
@ -127,7 +127,7 @@
|
||||
// Mini Viki and Viki 2.0 LCD, ST7565 controller as well
|
||||
U8GLIB_NHD_C12864 u8g(DOGLCD_CS, DOGLCD_A0);
|
||||
#elif defined(ADAFRUIT_ST7565)
|
||||
U8GLIB_LM6059 u8g(DOGLCD_CS, DOGLCD_A0);
|
||||
U8GLIB_LM6059 u8g(DOGLCD_CS, DOGLCD_A0);
|
||||
#else
|
||||
// for regular DOGM128 display with HW-SPI
|
||||
U8GLIB_DOGM128 u8g(DOGLCD_CS, DOGLCD_A0); // HW-SPI Com: CS, A0
|
||||
|
@ -180,13 +180,13 @@
|
||||
#define BTN_ENC -1
|
||||
#define LCD_SDSS 53
|
||||
#define SDCARDDETECT 49
|
||||
#elif defined(ADAFRUIT_ST7565)
|
||||
#elif defined(ADAFRUIT_ST7565)
|
||||
#define BTN_EN1 35
|
||||
#define BTN_EN2 37
|
||||
#define BTN_ENC 31
|
||||
#define SDCARDDETECT 49
|
||||
#define SDCARDDETECTINVERTED
|
||||
#define SDSLOW
|
||||
#define SDCARDDETECTINVERTED
|
||||
#define SDSLOW
|
||||
#define LCD_SDSS 53
|
||||
#define KILL_PIN 41
|
||||
#define BEEPER 23
|
||||
@ -222,7 +222,7 @@
|
||||
#endif
|
||||
|
||||
#endif
|
||||
#else // Old-style panel with shift register
|
||||
#else // Old-style panel with shift register
|
||||
// Arduino pin witch triggers an piezzo beeper
|
||||
#define BEEPER 33 // No Beeper added
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user