bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Added E-Jerk

Browse Source
This commit is contained in:
Erik van der Zalm
2012-03-04 16:34:58 +01:00
parent 4deeffbc88
commit e056bf8081
6 changed files with 24 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Marlin/EEPROMwrite.h
View File

@@ -38,7 +38,7 @@ template <class T> int EEPROM_readAnything(int &ee, T& value)
// the default values are used whenever there is a change to the data, to prevent
// wrong data being written to the variables.
// ALSO: always make sure the variables in the Store and retrieve sections are in the same order.
#define EEPROM_VERSION "V04"
#define EEPROM_VERSION "V05"
inline void EEPROM_StoreSettings()
{
@@ -56,6 +56,7 @@ inline void EEPROM_StoreSettings()
EEPROM_writeAnything(i,minsegmenttime);
EEPROM_writeAnything(i,max_xy_jerk);
EEPROM_writeAnything(i,max_z_jerk);
EEPROM_writeAnything(i,max_e_jerk);
#ifdef PIDTEMP
EEPROM_writeAnything(i,Kp);
EEPROM_writeAnything(i,Ki);
@@ -116,6 +117,7 @@ inline void EEPROM_printSettings()
SERIAL_ECHOPAIR(" B" ,minsegmenttime );
SERIAL_ECHOPAIR(" X" ,max_xy_jerk );
SERIAL_ECHOPAIR(" Z" ,max_z_jerk);
SERIAL_ECHOPAIR(" E" ,max_e_jerk);
SERIAL_ECHOLN("");
#ifdef PIDTEMP
SERIAL_ECHO_START;
@@ -150,6 +152,7 @@ inline void EEPROM_RetrieveSettings(bool def=false)
EEPROM_readAnything(i,minsegmenttime);
EEPROM_readAnything(i,max_xy_jerk);
EEPROM_readAnything(i,max_z_jerk);
EEPROM_readAnything(i,max_e_jerk);
#ifndef PIDTEMP
float Kp,Ki,Kd;
#endif
@@ -179,6 +182,7 @@ inline void EEPROM_RetrieveSettings(bool def=false)
mintravelfeedrate=DEFAULT_MINTRAVELFEEDRATE;
max_xy_jerk=DEFAULT_XYJERK;
max_z_jerk=DEFAULT_ZJERK;
max_e_jerk=DEFAULT_EJERK;
SERIAL_ECHO_START;
SERIAL_ECHOLN("Using Default settings:");
}