bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

made many possible variables static, so they cannot be used extern.

Browse Source
This commit is contained in:
Bernhard Kubicek
2011-11-06 19:36:29 +01:00
parent 1d171e9e52
commit 79d1bfb5c0
3 changed files with 39 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
Marlin/ultralcd.pde
View File

@ -3,14 +3,17 @@
extern volatile int feedmultiply;
extern volatile bool feedmultiplychanged;
extern long position[4];
char messagetext[LCD_WIDTH]="";
static char messagetext[LCD_WIDTH]="";
#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
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);}
@ -18,9 +21,9 @@ volatile char buttons=0; //the last checked buttons in a bit array.
int encoderpos=0;
short lastenc=0;
#ifdef NEWPANEL
long blocking=0;
static long blocking=0;
#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
MainMenu menu;
@ -31,10 +34,9 @@ void lcd_status(const char* message)
inline void clear()
{
lcd.clear();
}
long previous_millis_buttons=0;
void lcd_init()
{
@ -228,7 +230,6 @@ MainMenu::MainMenu()
linechanging=false;
}
extern volatile bool feedmultiplychanged;
void MainMenu::showStatus()
{