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

Fix cherry-pick

Browse Source
This commit is contained in:
3d-gussner 2022-11-20 11:14:06 +01:00
parent 6e330c11a7
commit 696117e73b
1 changed files with 0 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Firmware/ultralcd.cpp
View File

@ -4037,12 +4037,7 @@ void lcd_wizard(WizState state)
{ {
using S = WizState; using S = WizState;
bool end = false; bool end = false;
<<<<<<< HEAD
int8_t wizard_event;
const char *msg = NULL;
=======
uint8_t wizard_event; uint8_t wizard_event;
>>>>>>> b147fcee (XYZ calibration fixes)
// Make sure EEPROM_WIZARD_ACTIVE is true if entering using different entry point // Make sure EEPROM_WIZARD_ACTIVE is true if entering using different entry point
// other than WizState::Run - it is useful for debugging wizard. // other than WizState::Run - it is useful for debugging wizard.
if (state != S::Run) eeprom_update_byte((uint8_t*)EEPROM_WIZARD_ACTIVE, 1); if (state != S::Run) eeprom_update_byte((uint8_t*)EEPROM_WIZARD_ACTIVE, 1);