josh
/
Prusa-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make bFilament variables static and move to top of file

This commit is contained in:
Guðni Már Gilbert 2023-01-29 14:16:44 +00:00 committed by DRracer
parent 68d902c4e1
commit b9717b03e7
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Firmware/ultralcd.cpp
View File

@ -57,6 +57,11 @@ static void lcd_mesh_bed_leveling_settings();
static void lcd_backlight_menu(); static void lcd_backlight_menu();
#endif #endif
FilamentAction eFilamentAction=FilamentAction::None; // must be initialized as 'non-autoLoad'
static bool bFilamentPreheatState;
static bool bFilamentAction = false;
static bool bFilamentWaitingFlag = false;
int8_t ReInitLCD = 0; int8_t ReInitLCD = 0;
uint8_t scrollstuff = 0; uint8_t scrollstuff = 0;
@ -1756,11 +1761,6 @@ void lcd_cutter_enabled()
} }
#endif //MMU_HAS_CUTTER #endif //MMU_HAS_CUTTER
FilamentAction eFilamentAction=FilamentAction::None; // must be initialized as 'non-autoLoad'
bool bFilamentPreheatState;
bool bFilamentAction=false;
static bool bFilamentWaitingFlag=false;
bool shouldPreheatOnlyNozzle() { bool shouldPreheatOnlyNozzle() {
uint8_t eeprom_setting = eeprom_read_byte((uint8_t*)EEPROM_HEAT_BED_ON_LOAD_FILAMENT); uint8_t eeprom_setting = eeprom_read_byte((uint8_t*)EEPROM_HEAT_BED_ON_LOAD_FILAMENT);
if (eeprom_setting != 0) if (eeprom_setting != 0)

2
Firmware/ultralcd.h
View File

@ -194,8 +194,6 @@ enum class FilamentAction : uint_least8_t
}; };
extern FilamentAction eFilamentAction; extern FilamentAction eFilamentAction;
extern bool bFilamentPreheatState;
extern bool bFilamentAction;
void mFilamentItem(uint16_t nTemp,uint16_t nTempBed); void mFilamentItem(uint16_t nTemp,uint16_t nTempBed);
void lcd_generic_preheat_menu(); void lcd_generic_preheat_menu();
void unload_filament(float unloadLength); void unload_filament(float unloadLength);