|
@ -3,14 +3,17 @@ |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
extern volatile int feedmultiply; |
|
|
extern volatile int feedmultiply; |
|
|
|
|
|
extern volatile bool feedmultiplychanged; |
|
|
|
|
|
|
|
|
extern long position[4]; |
|
|
extern long position[4]; |
|
|
|
|
|
|
|
|
char messagetext[LCD_WIDTH]=""; |
|
|
static char messagetext[LCD_WIDTH]=""; |
|
|
|
|
|
|
|
|
#include <LiquidCrystal.h> |
|
|
#include <LiquidCrystal.h> |
|
|
LiquidCrystal lcd(LCD_PINS_RS, LCD_PINS_ENABLE, LCD_PINS_D4, LCD_PINS_D5,LCD_PINS_D6,LCD_PINS_D7); //RS,Enable,D4,D5,D6,D7 |
|
|
LiquidCrystal lcd(LCD_PINS_RS, LCD_PINS_ENABLE, LCD_PINS_D4, LCD_PINS_D5,LCD_PINS_D6,LCD_PINS_D7); //RS,Enable,D4,D5,D6,D7 |
|
|
|
|
|
|
|
|
unsigned long previous_millis_lcd=0; |
|
|
static unsigned long previous_millis_lcd=0; |
|
|
|
|
|
static long previous_millis_buttons=0; |
|
|
|
|
|
|
|
|
inline int intround(const float &x){return int(0.5+x);} |
|
|
inline int intround(const float &x){return int(0.5+x);} |
|
|
|
|
|
|
|
@ -18,9 +21,9 @@ volatile char buttons=0; //the last checked buttons in a bit array. |
|
|
int encoderpos=0; |
|
|
int encoderpos=0; |
|
|
short lastenc=0; |
|
|
short lastenc=0; |
|
|
#ifdef NEWPANEL |
|
|
#ifdef NEWPANEL |
|
|
long blocking=0; |
|
|
static long blocking=0; |
|
|
#else |
|
|
#else |
|
|
long blocking[8]={0,0,0,0,0,0,0,0}; |
|
|
static long blocking[8]={0,0,0,0,0,0,0,0}; |
|
|
#endif |
|
|
#endif |
|
|
MainMenu menu; |
|
|
MainMenu menu; |
|
|
|
|
|
|
|
@ -31,10 +34,9 @@ void lcd_status(const char* message) |
|
|
|
|
|
|
|
|
inline void clear() |
|
|
inline void clear() |
|
|
{ |
|
|
{ |
|
|
|
|
|
|
|
|
lcd.clear(); |
|
|
lcd.clear(); |
|
|
} |
|
|
} |
|
|
long previous_millis_buttons=0; |
|
|
|
|
|
|
|
|
|
|
|
void lcd_init() |
|
|
void lcd_init() |
|
|
{ |
|
|
{ |
|
@ -228,7 +230,6 @@ MainMenu::MainMenu() |
|
|
linechanging=false; |
|
|
linechanging=false; |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
extern volatile bool feedmultiplychanged; |
|
|
|
|
|
|
|
|
|
|
|
void MainMenu::showStatus() |
|
|
void MainMenu::showStatus() |
|
|
{ |
|
|
{ |
|
|