From c481c3b1808f281e0a7f8308238c339578f351d0 Mon Sep 17 00:00:00 2001
From: AnHardt <github@kitelab.de>
Date: Sat, 28 Mar 2015 13:14:38 +0100
Subject: [PATCH] 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.
---
Marlin/dogm_lcd_implementation.h | 6 +++---
Marlin/ultralcd.h | 1 -
2 files changed, 3 insertions(+), 4 deletions(-)
diff --git a/Marlin/dogm_lcd_implementation.h b/Marlin/dogm_lcd_implementation.h
index b9235145b9..ae3468582a 100644
--- a/Marlin/dogm_lcd_implementation.h
+++ b/Marlin/dogm_lcd_implementation.h
@@ -124,8 +124,6 @@
// Maximum here is 0x1f because 0x20 is ' ' (space) and the normal charsets begin.
// Better stay below 0x10 because DISPLAY_CHARSET_HD44780_WESTERN begins here.
-int lcd_contrast;
-
// LCD selection
#ifdef U8GLIB_ST7920
//U8GLIB_ST7920_128X64_RRD u8g(0,0,0);
@@ -143,7 +141,9 @@ U8GLIB_DOGM128 u8g(DOGLCD_CS, DOGLCD_A0); // HW-SPI Com: CS, A0
#include "utf_mapper.h"
-char currentfont = 0;
+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) {
switch(font_nr) {
diff --git a/Marlin/ultralcd.h b/Marlin/ultralcd.h
index b699b8a5d0..4cdecb8bd0 100644
--- a/Marlin/ultralcd.h
+++ b/Marlin/ultralcd.h
@@ -17,7 +17,6 @@
#ifdef DOGLCD
extern int lcd_contrast;
void lcd_setcontrast(uint8_t value);
- static unsigned char blink = 0; // Variable for visualization of fan rotation in GLCD
#endif
#define LCD_MESSAGEPGM(x) lcd_setstatuspgm(PSTR(x))