sravan/Marlin-Firmware
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[2.0.x] LIN_ADVANCE v1.5 (#9712)

Browse Source
This commit is contained in:
Scott Lahteine
2018-02-23 00:53:29 -06:00
committed by GitHub
parent 90fa423737
commit 2bd252b501
52 changed files with 890 additions and 1671 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
Marlin/src/module/configuration_store.cpp
View File

@@ -37,7 +37,7 @@
*/
// Change EEPROM version if the structure changes
#define EEPROM_VERSION "V51"
#define EEPROM_VERSION "V52"
#define EEPROM_OFFSET 100
// Check the integrity of data offsets.
@@ -225,8 +225,7 @@ typedef struct SettingsDataStruct {
//
// LIN_ADVANCE
//
float planner_extruder_advance_k, // M900 K planner.extruder_advance_k
planner_advance_ed_ratio; // M900 WHD planner.advance_ed_ratio
float planner_extruder_advance_K; // M900 K planner.extruder_advance_K
//
// HAS_MOTOR_CURRENT_PWM
@@ -751,15 +750,13 @@ void MarlinSettings::postprocess() {
// Linear Advance
//
_FIELD_TEST(planner_extruder_advance_k);
_FIELD_TEST(planner_extruder_advance_K);
#if ENABLED(LIN_ADVANCE)
EEPROM_WRITE(planner.extruder_advance_k);
EEPROM_WRITE(planner.advance_ed_ratio);
EEPROM_WRITE(planner.extruder_advance_K);
#else
dummy = 0.0f;
EEPROM_WRITE(dummy);
EEPROM_WRITE(dummy);
#endif
_FIELD_TEST(motor_current_setting);
@@ -1301,14 +1298,12 @@ void MarlinSettings::postprocess() {
// Linear Advance
//
_FIELD_TEST(planner_extruder_advance_k);
_FIELD_TEST(planner_extruder_advance_K);
#if ENABLED(LIN_ADVANCE)
EEPROM_READ(planner.extruder_advance_k);
EEPROM_READ(planner.advance_ed_ratio);
EEPROM_READ(planner.extruder_advance_K);
#else
EEPROM_READ(dummy);
EEPROM_READ(dummy);
#endif
//
@@ -1832,8 +1827,7 @@ void MarlinSettings::reset(
#endif
#if ENABLED(LIN_ADVANCE)
planner.extruder_advance_k = LIN_ADVANCE_K;
planner.advance_ed_ratio = LIN_ADVANCE_E_D_RATIO;
planner.extruder_advance_K = LIN_ADVANCE_K;
#endif
#if HAS_MOTOR_CURRENT_PWM
@@ -2409,8 +2403,7 @@ void MarlinSettings::reset(
SERIAL_ECHOLNPGM_P(port, "Linear Advance:");
}
CONFIG_ECHO_START;
SERIAL_ECHOPAIR_P(port, " M900 K", planner.extruder_advance_k);
SERIAL_ECHOLNPAIR_P(port, " R", planner.advance_ed_ratio);
SERIAL_ECHOLNPAIR_P(port, " M900 K", planner.extruder_advance_K);
#endif
#if HAS_MOTOR_CURRENT_PWM