MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

Save ABL Planar Matrix to EEPROM

Browse Source
This commit is contained in:
Scott Lahteine 2016-12-13 23:50:06 -08:00
parent e2429a9da1
commit 8f0f225d10
2 changed files with 61 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/Marlin_main.cpp
View File

@ -2229,7 +2229,7 @@ static void clean_up_after_endstop_or_probe_move() {
* Disable: Current position = physical position * Disable: Current position = physical position
* Enable: Current position = "unleveled" physical position * Enable: Current position = "unleveled" physical position
*/ */
void set_bed_leveling_enabled(bool enable=true) { void set_bed_leveling_enabled(bool enable/*=true*/) {
#if ENABLED(MESH_BED_LEVELING) #if ENABLED(MESH_BED_LEVELING)
if (enable != mbl.active()) { if (enable != mbl.active()) {

95
Marlin/configuration_store.cpp
View File

@ -74,59 +74,62 @@
* AUTO BED LEVELING * AUTO BED LEVELING
* 262 M851 zprobe_zoffset (float) * 262 M851 zprobe_zoffset (float)
* *
* ABL_PLANAR (or placeholder): 36 bytes
* 266 planner.bed_level_matrix (matrix_3x3 = float x9)
*
* AUTO_BED_LEVELING_BILINEAR (or placeholder): 47 bytes * AUTO_BED_LEVELING_BILINEAR (or placeholder): 47 bytes
* 266 ABL_GRID_MAX_POINTS_X (uint8_t) * 302 ABL_GRID_MAX_POINTS_X (uint8_t)
* 267 ABL_GRID_MAX_POINTS_Y (uint8_t) * 303 ABL_GRID_MAX_POINTS_Y (uint8_t)
* 268 bilinear_grid_spacing (int x2) from G29: (B-F)/X, (R-L)/Y * 304 bilinear_grid_spacing (int x2) from G29: (B-F)/X, (R-L)/Y
* 272 G29 L F bilinear_start (int x2) * 308 G29 L F bilinear_start (int x2)
* 276 bed_level_grid[][] (float x9, up to float x256) +988 * 312 bed_level_grid[][] (float x9, up to float x256) +988
* *
* DELTA (if deltabot): 36 bytes * DELTA (if deltabot): 36 bytes
* 312 M666 XYZ endstop_adj (float x3) * 348 M666 XYZ endstop_adj (float x3)
* 324 M665 R delta_radius (float) * 360 M665 R delta_radius (float)
* 328 M665 L delta_diagonal_rod (float) * 364 M665 L delta_diagonal_rod (float)
* 332 M665 S delta_segments_per_second (float) * 368 M665 S delta_segments_per_second (float)
* 336 M665 A delta_diagonal_rod_trim_tower_1 (float) * 372 M665 A delta_diagonal_rod_trim_tower_1 (float)
* 340 M665 B delta_diagonal_rod_trim_tower_2 (float) * 376 M665 B delta_diagonal_rod_trim_tower_2 (float)
* 344 M665 C delta_diagonal_rod_trim_tower_3 (float) * 380 M665 C delta_diagonal_rod_trim_tower_3 (float)
* *
* Z_DUAL_ENDSTOPS: 4 bytes * Z_DUAL_ENDSTOPS: 4 bytes
* 348 M666 Z z_endstop_adj (float) * 384 M666 Z z_endstop_adj (float)
* *
* ULTIPANEL: 6 bytes * ULTIPANEL: 6 bytes
* 352 M145 S0 H lcd_preheat_hotend_temp (int x2) * 388 M145 S0 H lcd_preheat_hotend_temp (int x2)
* 356 M145 S0 B lcd_preheat_bed_temp (int x2) * 392 M145 S0 B lcd_preheat_bed_temp (int x2)
* 360 M145 S0 F lcd_preheat_fan_speed (int x2) * 396 M145 S0 F lcd_preheat_fan_speed (int x2)
* *
* PIDTEMP: 66 bytes * PIDTEMP: 66 bytes
* 364 M301 E0 PIDC Kp[0], Ki[0], Kd[0], Kc[0] (float x4) * 400 M301 E0 PIDC Kp[0], Ki[0], Kd[0], Kc[0] (float x4)
* 380 M301 E1 PIDC Kp[1], Ki[1], Kd[1], Kc[1] (float x4) * 416 M301 E1 PIDC Kp[1], Ki[1], Kd[1], Kc[1] (float x4)
* 396 M301 E2 PIDC Kp[2], Ki[2], Kd[2], Kc[2] (float x4) * 432 M301 E2 PIDC Kp[2], Ki[2], Kd[2], Kc[2] (float x4)
* 412 M301 E3 PIDC Kp[3], Ki[3], Kd[3], Kc[3] (float x4) * 448 M301 E3 PIDC Kp[3], Ki[3], Kd[3], Kc[3] (float x4)
* 428 M301 L lpq_len (int) * 464 M301 L lpq_len (int)
* *
* PIDTEMPBED: * PIDTEMPBED:
* 430 M304 PID thermalManager.bedKp, thermalManager.bedKi, thermalManager.bedKd (float x3) * 466 M304 PID thermalManager.bedKp, thermalManager.bedKi, thermalManager.bedKd (float x3)
* *
* DOGLCD: 2 bytes * DOGLCD: 2 bytes
* 442 M250 C lcd_contrast (int) * 478 M250 C lcd_contrast (int)
* *
* FWRETRACT: 29 bytes * FWRETRACT: 29 bytes
* 444 M209 S autoretract_enabled (bool) * 480 M209 S autoretract_enabled (bool)
* 445 M207 S retract_length (float) * 481 M207 S retract_length (float)
* 449 M207 W retract_length_swap (float) * 485 M207 W retract_length_swap (float)
* 453 M207 F retract_feedrate_mm_s (float) * 489 M207 F retract_feedrate_mm_s (float)
* 457 M207 Z retract_zlift (float) * 493 M207 Z retract_zlift (float)
* 461 M208 S retract_recover_length (float) * 497 M208 S retract_recover_length (float)
* 465 M208 W retract_recover_length_swap (float) * 501 M208 W retract_recover_length_swap (float)
* 469 M208 F retract_recover_feedrate_mm_s (float) * 505 M208 F retract_recover_feedrate_mm_s (float)
* *
* Volumetric Extrusion: 17 bytes * Volumetric Extrusion: 17 bytes
* 473 M200 D volumetric_enabled (bool) * 509 M200 D volumetric_enabled (bool)
* 474 M200 T D filament_size (float x4) (T0..3) * 510 M200 T D filament_size (float x4) (T0..3)
* *
* 490 Minimum end-point * 526 Minimum end-point
* 1811 (490 + 36 + 9 + 288 + 988) Maximum end-point * 1847 (526 + 36 + 9 + 288 + 988) Maximum end-point
* *
*/ */
#include "Marlin.h" #include "Marlin.h"
@ -287,6 +290,17 @@ void Config_Postprocess() {
#endif #endif
EEPROM_WRITE(zprobe_zoffset); EEPROM_WRITE(zprobe_zoffset);
//
// Planar Bed Leveling matrix
//
#if ABL_PLANAR
EEPROM_WRITE(planner.bed_level_matrix);
#else
dummy = 0.0;
for (uint8_t q = 9; q--;) EEPROM_WRITE(dummy);
#endif
// //
// Bilinear Auto Bed Leveling // Bilinear Auto Bed Leveling
// //
@ -525,6 +539,16 @@ void Config_Postprocess() {
#endif #endif
EEPROM_READ(zprobe_zoffset); EEPROM_READ(zprobe_zoffset);
//
// Planar Bed Leveling matrix
//
#if ABL_PLANAR
EEPROM_READ(planner.bed_level_matrix);
#else
for (uint8_t q = 9; q--;) EEPROM_READ(dummy);
#endif
// //
// Bilinear Auto Bed Leveling // Bilinear Auto Bed Leveling
// //
@ -542,6 +566,7 @@ void Config_Postprocess() {
bed_level_virt_prepare(); bed_level_virt_prepare();
bed_level_virt_interpolate(); bed_level_virt_interpolate();
#endif #endif
//set_bed_leveling_enabled(leveling_is_on);
} }
else // EEPROM data is stale else // EEPROM data is stale
#endif // AUTO_BED_LEVELING_BILINEAR #endif // AUTO_BED_LEVELING_BILINEAR