CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1425 from clefranc/Development

Browse Source 
EEPROM data not aligned
This commit is contained in:
Scott Lahteine 2015-01-27 14:26:11 -08:00
commit ab1ddcd89d
1 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Marlin/ConfigurationStore.cpp
View File

@ -97,6 +97,7 @@ void Config_StoreSettings()
EEPROM_WRITE_VAR(i, dummy); EEPROM_WRITE_VAR(i, dummy);
dummy = 0.0f; dummy = 0.0f;
EEPROM_WRITE_VAR(i,dummy); EEPROM_WRITE_VAR(i,dummy);
EEPROM_WRITE_VAR(i,dummy);
EEPROM_WRITE_VAR(i,dummy); EEPROM_WRITE_VAR(i,dummy);
} }
} }
@ -106,6 +107,7 @@ void Config_StoreSettings()
dummy = 0.0f; dummy = 0.0f;
EEPROM_WRITE_VAR(i,dummy); EEPROM_WRITE_VAR(i,dummy);
EEPROM_WRITE_VAR(i,dummy); EEPROM_WRITE_VAR(i,dummy);
EEPROM_WRITE_VAR(i,dummy);
#endif//PIDTEMP #endif//PIDTEMP
#ifndef DOGLCD #ifndef DOGLCD
int lcd_contrast = 32; int lcd_contrast = 32;
@ -269,6 +271,7 @@ SERIAL_ECHOLNPGM("Scaling factors:");
SERIAL_ECHOPAIR(" Swap rec. addl. length (mm): ", retract_recover_length_swap); SERIAL_ECHOPAIR(" Swap rec. addl. length (mm): ", retract_recover_length_swap);
SERIAL_ECHOLN(""); SERIAL_ECHOLN("");
#endif//EXTRUDERS > 1 #endif//EXTRUDERS > 1
#endif//FWRETRACT
SERIAL_ECHO_START; SERIAL_ECHO_START;
if (volumetric_enabled) { if (volumetric_enabled) {
SERIAL_ECHOLNPGM("Filament settings:"); SERIAL_ECHOLNPGM("Filament settings:");
@ -293,7 +296,6 @@ SERIAL_ECHOLNPGM("Scaling factors:");
} else { } else {
SERIAL_ECHOLNPGM("Filament settings: Disabled"); SERIAL_ECHOLNPGM("Filament settings: Disabled");
} }
#endif//FWRETRACT
#ifdef CUSTOM_M_CODES #ifdef CUSTOM_M_CODES
SERIAL_ECHO_START; SERIAL_ECHO_START;
SERIAL_ECHOLNPGM("Z-Probe Offset (mm):"); SERIAL_ECHOLNPGM("Z-Probe Offset (mm):");