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

Merge pull request #2247 from mkbel/reset_live_Z+offset 

Show current Z offset in reset dialog before first layer calibration
This commit is contained in:
DRracer 2019-11-15 17:52:29 +01:00 committed by GitHub
parent 86ea24c364 460f6c3b5e
commit e2e32b455a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Firmware/ultralcd.cpp
View File

@ -4799,10 +4799,10 @@ void lcd_toshiba_flash_air_compatibility_toggle()
//! //!
//! @code{.unparsed} //! @code{.unparsed}
//! |01234567890123456789| //! |01234567890123456789|
//! |[Smooth1]Live adj. Z| c=11 //! |Sheet Smooth1 actual| c=a, c=b, a+b = 13
//! |value set, continue | c=20 //! |Z offset: -1.480 mm | c=a, c=b, a+b = 14
//! |or start from zero? | c=20 //! |>Continue | c=19
//! |>Continue Reset | c=a, c=b, a+b = 18 //! | Start from zero | c=19
//! ---------------------- //! ----------------------
//! @endcode //! @endcode
void lcd_first_layer_calibration_reset() void lcd_first_layer_calibration_reset()
@ -4840,8 +4840,9 @@ void lcd_first_layer_calibration_reset()
char sheet_name[sizeof(Sheet::name)]; char sheet_name[sizeof(Sheet::name)];
eeprom_read_block(sheet_name, &EEPROM_Sheets_base->s[(eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)))].name, sizeof(Sheet::name)); eeprom_read_block(sheet_name, &EEPROM_Sheets_base->s[(eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)))].name, sizeof(Sheet::name));
lcd_set_cursor(0, 0); lcd_set_cursor(0, 0);
lcd_printf_P(_i("[%.7s]Live adj. Z\nvalue set, continue\nor start from zero?\n%cContinue%cReset"), //// \n denotes line break, %.7s is replaced by 7 character long sheet name, %+1.3f is replaced by 6 character long floating point number, %c is replaced by > or white space (one character) based on whether first or second option is selected. % denoted place holders can not be reordered. r=4 float offset = static_cast<int16_t>(eeprom_read_word(reinterpret_cast<uint16_t*>(&EEPROM_Sheets_base->s[(eeprom_read_byte(&(EEPROM_Sheets_base->active_sheet)))].z_offset)))/cs.axis_steps_per_unit[Z_AXIS];
sheet_name, menuData->reset ? ' ' : '>', menuData->reset ? '>' : ' '); lcd_printf_P(_i("Sheet %.7s\nZ offset: %+1.3f mm\n%cContinue\n%cStart from zero"), //// \n denotes line break, %.7s is replaced by 7 character long sheet name, %+1.3f is replaced by 6 character long floating point number, %c is replaced by > or white space (one character) based on whether first or second option is selected. % denoted place holders can not be reordered. r=4
sheet_name, offset, menuData->reset ? ' ' : '>', menuData->reset ? '>' : ' ');
} }