From cc291aeb3ce0e5fbab652d400473190fcaaf5be3 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Wed, 16 Mar 2016 03:57:58 -0700 Subject: [PATCH] Move definition of "blink" to main ultralcd file --- Marlin/dogm_lcd_implementation.h | 1 - Marlin/ultralcd.cpp | 2 ++ Marlin/ultralcd.h | 2 ++ Marlin/ultralcd_implementation_hitachi_HD44780.h | 1 - 4 files changed, 4 insertions(+), 2 deletions(-) diff --git a/Marlin/dogm_lcd_implementation.h b/Marlin/dogm_lcd_implementation.h index 3f2e0d31d..7e85c1eee 100644 --- a/Marlin/dogm_lcd_implementation.h +++ b/Marlin/dogm_lcd_implementation.h @@ -146,7 +146,6 @@ #include "utf_mapper.h" int lcd_contrast; -static unsigned char blink = 0; // Variable for visualization of fan rotation in GLCD static char currentfont = 0; static void lcd_setFont(char font_nr) { diff --git a/Marlin/ultralcd.cpp b/Marlin/ultralcd.cpp index 8a2d74e5a..4835accf8 100644 --- a/Marlin/ultralcd.cpp +++ b/Marlin/ultralcd.cpp @@ -26,6 +26,8 @@ #define ENCODER_DIRECTION_MENUS() ; #endif +uint8_t blink = 0; // Variable for animation + int8_t encoderDiff; // updated from interrupt context and added to encoderPosition every LCD update bool encoderRateMultiplierEnabled; diff --git a/Marlin/ultralcd.h b/Marlin/ultralcd.h index ec18ac5cc..2d4075afc 100644 --- a/Marlin/ultralcd.h +++ b/Marlin/ultralcd.h @@ -54,6 +54,8 @@ extern bool cancel_heatup; + extern uint8_t blink; // Variable for animation + #if ENABLED(FILAMENT_LCD_DISPLAY) extern millis_t previous_lcd_status_ms; #endif diff --git a/Marlin/ultralcd_implementation_hitachi_HD44780.h b/Marlin/ultralcd_implementation_hitachi_HD44780.h index 7ef5d9054..97f401c1c 100644 --- a/Marlin/ultralcd_implementation_hitachi_HD44780.h +++ b/Marlin/ultralcd_implementation_hitachi_HD44780.h @@ -5,7 +5,6 @@ * Implementation of the LCD display routines for a Hitachi HD44780 display. These are common LCD character displays. **/ -static unsigned char blink = 0; // Variable for animation extern volatile uint8_t buttons; //an extended version of the last checked buttons in a bit array. ////////////////////////////////////