SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Move definition of "blink" to main ultralcd file

Browse source
This commit is contained in:
Scott Lahteine 2016-03-16 03:57:58 -07:00
parent 8f24475e02
commit cc291aeb3c
4 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Marlin/dogm_lcd_implementation.h
View file

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

2
Marlin/ultralcd.cpp
View file

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

2
Marlin/ultralcd.h
View file

@ -54,6 +54,8 @@
extern bool cancel_heatup; extern bool cancel_heatup;
extern uint8_t blink; // Variable for animation
#if ENABLED(FILAMENT_LCD_DISPLAY) #if ENABLED(FILAMENT_LCD_DISPLAY)
extern millis_t previous_lcd_status_ms; extern millis_t previous_lcd_status_ms;
#endif #endif

1
Marlin/ultralcd_implementation_hitachi_HD44780.h
View file

@ -5,7 +5,6 @@
* Implementation of the LCD display routines for a Hitachi HD44780 display. These are common LCD character displays. * 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. extern volatile uint8_t buttons; //an extended version of the last checked buttons in a bit array.
//////////////////////////////////// ////////////////////////////////////