Browse Source

Move variable blink from ultralcd.h to dogm_lcd_implementation.h

to avoid warnings about unused blink.

Concentrate definitions of variables in dogm_lcd_implementation.h to one place.

Make only local used variable currentfont static.
AnHardt 9 years ago
parent
commit
c481c3b180
2 changed files with 3 additions and 4 deletions
  1. 3
    3
      Marlin/dogm_lcd_implementation.h
  2. 0
    1
      Marlin/ultralcd.h

+ 3
- 3
Marlin/dogm_lcd_implementation.h View File

@@ -124,8 +124,6 @@
124 124
 // Maximum here is 0x1f because 0x20 is ' ' (space) and the normal charsets begin.
125 125
 // Better stay below 0x10 because DISPLAY_CHARSET_HD44780_WESTERN begins here.
126 126
 
127
-int lcd_contrast;
128
-
129 127
 // LCD selection
130 128
 #ifdef U8GLIB_ST7920
131 129
 //U8GLIB_ST7920_128X64_RRD u8g(0,0,0);
@@ -143,7 +141,9 @@ U8GLIB_DOGM128 u8g(DOGLCD_CS, DOGLCD_A0);  // HW-SPI Com: CS, A0
143 141
 
144 142
 #include "utf_mapper.h"
145 143
 
146
-char currentfont = 0;
144
+int lcd_contrast;
145
+static unsigned char blink = 0; // Variable for visualization of fan rotation in GLCD
146
+static char currentfont = 0;
147 147
 
148 148
 static void lcd_setFont(char font_nr) {
149 149
   switch(font_nr) {

+ 0
- 1
Marlin/ultralcd.h View File

@@ -17,7 +17,6 @@
17 17
   #ifdef DOGLCD
18 18
     extern int lcd_contrast;
19 19
     void lcd_setcontrast(uint8_t value);
20
-    static unsigned char blink = 0; // Variable for visualization of fan rotation in GLCD
21 20
   #endif
22 21
 
23 22
   #define LCD_MESSAGEPGM(x) lcd_setstatuspgm(PSTR(x))

Loading…
Cancel
Save