Skip to content

Commit

Permalink
Move variable blink from ultralcd.h to dogm_lcd_implementation.h
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
AnHardt committed Mar 28, 2015
1 parent f47fc87 commit c481c3b
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 4 deletions.
6 changes: 3 additions & 3 deletions Marlin/dogm_lcd_implementation.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand All @@ -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) {
Expand Down
1 change: 0 additions & 1 deletion Marlin/ultralcd.h
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand Down

0 comments on commit c481c3b

Please sign in to comment.