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

Merge remote-tracking branch 'upstream/MK3' into MK3_PF-build_106

Browse Source
This commit is contained in:
3d-gussner 2019-07-22 13:08:50 +02:00
commit 2582aaff9b
3 changed files with 786 additions and 174 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

944
Firmware/Marlin_main.cpp
View File

File diff suppressed because it is too large Load Diff

2
Firmware/doxyfile
View File

@ -2050,7 +2050,7 @@ PERLMOD_MAKEVAR_PREFIX =
# C-preprocessor directives found in the sources and include files. # C-preprocessor directives found in the sources and include files.
# The default value is: YES. # The default value is: YES.
ENABLE_PREPROCESSING = YES ENABLE_PREPROCESSING = NO
# If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names # If the MACRO_EXPANSION tag is set to YES, doxygen will expand all macro names
# in the source code. If set to NO, only conditional compilation will be # in the source code. If set to NO, only conditional compilation will be

6
Firmware/eeprom.cpp
View File

@ -71,6 +71,12 @@ void eeprom_init()
} }
if(is_uninitialized) if(is_uninitialized)
{ {
// When upgrading from version older version (before multiple sheets were implemented in v3.8.0)
// Sheet 1 uses the previous Live adjust Z (@EEPROM_BABYSTEP_Z)
if(i == 0){
int last_babystep = eeprom_read_word((uint16_t *)EEPROM_BABYSTEP_Z);
eeprom_write_word(reinterpret_cast<uint16_t *>(&(EEPROM_Sheets_base->s[i].z_offset)), last_babystep);
}
eeprom_write(&(EEPROM_Sheets_base->s[i].name[0]), static_cast<char>(i + '1')); eeprom_write(&(EEPROM_Sheets_base->s[i].name[0]), static_cast<char>(i + '1'));
eeprom_write(&(EEPROM_Sheets_base->s[i].name[1]), '\0'); eeprom_write(&(EEPROM_Sheets_base->s[i].name[1]), '\0');
} }