Browse Source

Move definition of "blink" to main ultralcd file

Scott Lahteine 9 years ago
parent
commit
cc291aeb3c

+ 0
- 1
Marlin/dogm_lcd_implementation.h View File

@@ -146,7 +146,6 @@
146 146
 #include "utf_mapper.h"
147 147
 
148 148
 int lcd_contrast;
149
-static unsigned char blink = 0; // Variable for visualization of fan rotation in GLCD
150 149
 static char currentfont = 0;
151 150
 
152 151
 static void lcd_setFont(char font_nr) {

+ 2
- 0
Marlin/ultralcd.cpp View File

@@ -26,6 +26,8 @@
26 26
   #define ENCODER_DIRECTION_MENUS() ;
27 27
 #endif
28 28
 
29
+uint8_t blink = 0; // Variable for animation
30
+
29 31
 int8_t encoderDiff; // updated from interrupt context and added to encoderPosition every LCD update
30 32
 
31 33
 bool encoderRateMultiplierEnabled;

+ 2
- 0
Marlin/ultralcd.h View File

@@ -54,6 +54,8 @@
54 54
 
55 55
   extern bool cancel_heatup;
56 56
 
57
+  extern uint8_t blink; // Variable for animation
58
+
57 59
   #if ENABLED(FILAMENT_LCD_DISPLAY)
58 60
     extern millis_t previous_lcd_status_ms;
59 61
   #endif

+ 0
- 1
Marlin/ultralcd_implementation_hitachi_HD44780.h View File

@@ -5,7 +5,6 @@
5 5
 * Implementation of the LCD display routines for a Hitachi HD44780 display. These are common LCD character displays.
6 6
 **/
7 7
 
8
-static unsigned char blink = 0; // Variable for animation
9 8
 extern volatile uint8_t buttons;  //an extended version of the last checked buttons in a bit array.
10 9
 
11 10
 ////////////////////////////////////

Loading…
Cancel
Save