Browse Source

Formatting Changes

Fixes for some code formatting changes and commenting out the
ADAFRUIT_ST7565 define that was left defined.
Ed Boston 10 years ago
parent
commit
1999ac415c
4 changed files with 9 additions and 8 deletions
  1. 2
    2
      Marlin/Conditionals.h
  2. 2
    1
      Marlin/Configuration.h
  3. 1
    1
      Marlin/dogm_lcd_implementation.h
  4. 4
    4
      Marlin/pins_RAMPS_13.h

+ 2
- 2
Marlin/Conditionals.h View File

31
       #define DEFAULT_LCD_CONTRAST 95
31
       #define DEFAULT_LCD_CONTRAST 95
32
     #elif defined(VIKI2)
32
     #elif defined(VIKI2)
33
       #define DEFAULT_LCD_CONTRAST 40
33
       #define DEFAULT_LCD_CONTRAST 40
34
-	#elif defined(ADAFRUIT_ST7565)
35
-	  #define DEFAULT_LCD_CONTRAST 110
34
+    #elif defined(ADAFRUIT_ST7565)
35
+      #define DEFAULT_LCD_CONTRAST 110
36
     #endif
36
     #endif
37
 
37
 
38
     #define ENCODER_PULSES_PER_STEP 4
38
     #define ENCODER_PULSES_PER_STEP 4

+ 2
- 1
Marlin/Configuration.h View File

660
 //#define VIKI2
660
 //#define VIKI2
661
 //#define miniVIKI
661
 //#define miniVIKI
662
 
662
 
663
-#define ADAFRUIT_ST7565
663
+// The Adafruit ST7565 is a custom display.  More info will be posted as the project files are finialized.
664
+//#define ADAFRUIT_ST7565
664
 
665
 
665
 // The RepRapDiscount Smart Controller (white PCB)
666
 // The RepRapDiscount Smart Controller (white PCB)
666
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller
667
 // http://reprap.org/wiki/RepRapDiscount_Smart_Controller

+ 1
- 1
Marlin/dogm_lcd_implementation.h View File

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

+ 4
- 4
Marlin/pins_RAMPS_13.h View File

180
       #define BTN_ENC -1
180
       #define BTN_ENC -1
181
       #define LCD_SDSS 53
181
       #define LCD_SDSS 53
182
       #define SDCARDDETECT 49
182
       #define SDCARDDETECT 49
183
-	#elif defined(ADAFRUIT_ST7565)
183
+    #elif defined(ADAFRUIT_ST7565)
184
       #define BTN_EN1 35
184
       #define BTN_EN1 35
185
       #define BTN_EN2 37
185
       #define BTN_EN2 37
186
       #define BTN_ENC 31
186
       #define BTN_ENC 31
187
       #define SDCARDDETECT 49
187
       #define SDCARDDETECT 49
188
-	  #define SDCARDDETECTINVERTED
189
-	  #define SDSLOW
188
+      #define SDCARDDETECTINVERTED
189
+      #define SDSLOW
190
       #define LCD_SDSS 53
190
       #define LCD_SDSS 53
191
       #define KILL_PIN 41
191
       #define KILL_PIN 41
192
       #define BEEPER 23
192
       #define BEEPER 23
222
       #endif
222
       #endif
223
 
223
 
224
     #endif
224
     #endif
225
-	#else // Old-style panel with shift register
225
+  #else // Old-style panel with shift register
226
     // Arduino pin witch triggers an piezzo beeper
226
     // Arduino pin witch triggers an piezzo beeper
227
     #define BEEPER 33   // No Beeper added
227
     #define BEEPER 33   // No Beeper added
228
 
228
 

Loading…
Cancel
Save