3d_print_resources/Marlin
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix the EEPROM storage, no longer inline it at multiple locations, and remove the template.

Browse source
This commit is contained in:
daid303 2012-11-07 10:02:45 +01:00
parent 5a998558a9
commit 12a4d60e18
4 changed files with 36 additions and 244 deletions
Download patch file Download diff file Expand all files Collapse all files

12
Marlin/Marlin_main.cpp
View file

@ -36,7 +36,7 @@
#include "motion_control.h"
#include "cardreader.h"
#include "watchdog.h"
#include "EEPROMwrite.h"
#include "ConfigurationStore.h"
#include "language.h"
#include "pins_arduino.h"
@ -322,7 +322,7 @@ void setup()
fromsd[i] = false;
}
EEPROM_RetrieveSettings(); // loads data from EEPROM if available
Config_RetrieveSettings(); // loads data from EEPROM if available
for(int8_t i=0; i < NUM_AXIS; i++)
{
@ -1457,22 +1457,22 @@ void process_commands()
break;
case 500: // Store settings in EEPROM
{
EEPROM_StoreSettings();
Config_StoreSettings();
}
break;
case 501: // Read settings from EEPROM
{
EEPROM_RetrieveSettings();
Config_RetrieveSettings();
}
break;
case 502: // Revert to default settings
{
EEPROM_RetrieveSettings(true);
Config_ResetDefault();
}
break;
case 503: // print settings currently in memory
{
EEPROM_printSettings();
Config_PrintSettings();
}
break;
case 999: // Restart after being stopped