2016-03-25 06:19:46 +00:00
|
|
|
/**
|
2016-03-24 18:01:20 +00:00
|
|
|
* Marlin 3D Printer Firmware
|
|
|
|
* Copyright (C) 2016 MarlinFirmware [https://github.com/MarlinFirmware/Marlin]
|
|
|
|
*
|
|
|
|
* Based on Sprinter and grbl.
|
|
|
|
* Copyright (C) 2011 Camiel Gubbels / Erik van der Zalm
|
|
|
|
*
|
|
|
|
* This program is free software: you can redistribute it and/or modify
|
|
|
|
* it under the terms of the GNU General Public License as published by
|
|
|
|
* the Free Software Foundation, either version 3 of the License, or
|
|
|
|
* (at your option) any later version.
|
|
|
|
*
|
|
|
|
* This program is distributed in the hope that it will be useful,
|
|
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
|
|
* GNU General Public License for more details.
|
|
|
|
*
|
|
|
|
* You should have received a copy of the GNU General Public License
|
|
|
|
* along with this program. If not, see <http://www.gnu.org/licenses/>.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2016-03-25 06:19:46 +00:00
|
|
|
/**
|
2015-04-26 04:04:54 +00:00
|
|
|
* configuration_store.cpp
|
2015-01-28 09:08:48 +00:00
|
|
|
*
|
2017-04-10 02:47:49 +00:00
|
|
|
* Settings and EEPROM storage
|
2015-01-28 09:08:48 +00:00
|
|
|
*
|
2015-04-03 23:38:05 +00:00
|
|
|
* IMPORTANT: Whenever there are changes made to the variables stored in EEPROM
|
|
|
|
* in the functions below, also increment the version number. This makes sure that
|
|
|
|
* the default values are used whenever there is a change to the data, to prevent
|
|
|
|
* wrong data being written to the variables.
|
|
|
|
*
|
|
|
|
* ALSO: Variables in the Store and Retrieve sections must be in the same order.
|
|
|
|
* If a feature is disabled, some data must still be written that, when read,
|
|
|
|
* either sets a Sane Default, or results in No Change to the existing value.
|
|
|
|
*
|
|
|
|
*/
|
|
|
|
|
2018-01-04 11:06:34 +00:00
|
|
|
#define EEPROM_VERSION "V48"
|
2015-04-03 23:38:05 +00:00
|
|
|
|
2016-06-30 01:18:46 +00:00
|
|
|
// Change EEPROM version if these are changed:
|
|
|
|
#define EEPROM_OFFSET 100
|
|
|
|
|
2015-04-03 23:38:05 +00:00
|
|
|
/**
|
2018-01-04 11:06:34 +00:00
|
|
|
* V48 EEPROM Layout:
|
2015-01-28 09:08:48 +00:00
|
|
|
*
|
2017-04-06 21:46:52 +00:00
|
|
|
* 100 Version (char x4)
|
2017-05-07 01:00:56 +00:00
|
|
|
* 104 EEPROM CRC16 (uint16_t)
|
2016-02-17 21:05:12 +00:00
|
|
|
*
|
2017-03-31 19:58:40 +00:00
|
|
|
* 106 E_STEPPERS (uint8_t)
|
2017-12-01 04:45:17 +00:00
|
|
|
* 107 M92 XYZE planner.axis_steps_per_mm (float x4 ... x8) + 64
|
|
|
|
* 123 M203 XYZE planner.max_feedrate_mm_s (float x4 ... x8) + 64
|
|
|
|
* 139 M201 XYZE planner.max_acceleration_mm_per_s2 (uint32_t x4 ... x8) + 64
|
2017-04-06 21:46:52 +00:00
|
|
|
* 155 M204 P planner.acceleration (float)
|
|
|
|
* 159 M204 R planner.retract_acceleration (float)
|
|
|
|
* 163 M204 T planner.travel_acceleration (float)
|
|
|
|
* 167 M205 S planner.min_feedrate_mm_s (float)
|
2016-12-09 11:45:55 +00:00
|
|
|
* 171 M205 T planner.min_travel_feedrate_mm_s (float)
|
2017-10-29 23:21:15 +00:00
|
|
|
* 175 M205 B planner.min_segment_time_us (ulong)
|
2017-04-06 21:46:52 +00:00
|
|
|
* 179 M205 X planner.max_jerk[X_AXIS] (float)
|
|
|
|
* 183 M205 Y planner.max_jerk[Y_AXIS] (float)
|
|
|
|
* 187 M205 Z planner.max_jerk[Z_AXIS] (float)
|
|
|
|
* 191 M205 E planner.max_jerk[E_AXIS] (float)
|
|
|
|
* 195 M206 XYZ home_offset (float x3)
|
2017-12-01 04:45:17 +00:00
|
|
|
* 207 M218 XYZ hotend_offset (float x3 per additional hotend) +16
|
2015-01-28 09:08:48 +00:00
|
|
|
*
|
2017-11-07 04:57:05 +00:00
|
|
|
* Global Leveling: 4 bytes
|
2017-02-21 12:49:31 +00:00
|
|
|
* 219 z_fade_height (float)
|
|
|
|
*
|
2017-04-16 23:41:13 +00:00
|
|
|
* MESH_BED_LEVELING: 43 bytes
|
2017-10-29 08:43:44 +00:00
|
|
|
* 223 M420 S planner.leveling_active (bool)
|
2017-02-21 12:49:31 +00:00
|
|
|
* 224 mbl.z_offset (float)
|
|
|
|
* 228 GRID_MAX_POINTS_X (uint8_t)
|
|
|
|
* 229 GRID_MAX_POINTS_Y (uint8_t)
|
2017-04-22 21:04:28 +00:00
|
|
|
* 230 G29 S3 XYZ z_values[][] (float x9, up to float x81) +288
|
2016-03-24 21:16:09 +00:00
|
|
|
*
|
2017-04-16 23:41:13 +00:00
|
|
|
* HAS_BED_PROBE: 4 bytes
|
2017-02-21 12:49:31 +00:00
|
|
|
* 266 M851 zprobe_zoffset (float)
|
2015-03-15 22:18:11 +00:00
|
|
|
*
|
2017-04-16 23:41:13 +00:00
|
|
|
* ABL_PLANAR: 36 bytes
|
2017-02-21 12:49:31 +00:00
|
|
|
* 270 planner.bed_level_matrix (matrix_3x3 = float x9)
|
2016-02-17 21:05:12 +00:00
|
|
|
*
|
2017-11-07 04:57:05 +00:00
|
|
|
* AUTO_BED_LEVELING_BILINEAR: 46 bytes
|
2017-02-21 12:49:31 +00:00
|
|
|
* 306 GRID_MAX_POINTS_X (uint8_t)
|
|
|
|
* 307 GRID_MAX_POINTS_Y (uint8_t)
|
|
|
|
* 308 bilinear_grid_spacing (int x2)
|
|
|
|
* 312 G29 L F bilinear_start (int x2)
|
2017-04-22 03:46:19 +00:00
|
|
|
* 316 z_values[][] (float x9, up to float x256) +988
|
2015-01-28 09:08:48 +00:00
|
|
|
*
|
2017-10-13 03:20:02 +00:00
|
|
|
* AUTO_BED_LEVELING_UBL: 2 bytes
|
2017-12-01 04:45:17 +00:00
|
|
|
* 352 G29 A planner.leveling_active (bool)
|
|
|
|
* 353 G29 S ubl.storage_slot (int8_t)
|
2017-04-22 21:04:28 +00:00
|
|
|
*
|
2017-11-09 04:10:08 +00:00
|
|
|
* DELTA: 44 bytes
|
2017-12-01 04:45:17 +00:00
|
|
|
* 354 M666 H delta_height (float)
|
|
|
|
* 358 M666 XYZ delta_endstop_adj (float x3)
|
|
|
|
* 370 M665 R delta_radius (float)
|
|
|
|
* 374 M665 L delta_diagonal_rod (float)
|
|
|
|
* 378 M665 S delta_segments_per_second (float)
|
|
|
|
* 382 M665 B delta_calibration_radius (float)
|
|
|
|
* 386 M665 X delta_tower_angle_trim[A] (float)
|
|
|
|
* 390 M665 Y delta_tower_angle_trim[B] (float)
|
|
|
|
* 394 M665 Z delta_tower_angle_trim[C] (float)
|
2015-01-28 09:08:48 +00:00
|
|
|
*
|
2017-10-29 08:43:44 +00:00
|
|
|
* [XYZ]_DUAL_ENDSTOPS: 12 bytes
|
2017-12-01 04:45:17 +00:00
|
|
|
* 354 M666 X x_endstop_adj (float)
|
|
|
|
* 358 M666 Y y_endstop_adj (float)
|
|
|
|
* 362 M666 Z z_endstop_adj (float)
|
2015-01-28 09:08:48 +00:00
|
|
|
*
|
2017-04-06 21:46:52 +00:00
|
|
|
* ULTIPANEL: 6 bytes
|
2017-12-01 04:45:17 +00:00
|
|
|
* 398 M145 S0 H lcd_preheat_hotend_temp (int x2)
|
|
|
|
* 402 M145 S0 B lcd_preheat_bed_temp (int x2)
|
|
|
|
* 406 M145 S0 F lcd_preheat_fan_speed (int x2)
|
2016-12-10 06:17:49 +00:00
|
|
|
*
|
2017-10-29 08:43:44 +00:00
|
|
|
* PIDTEMP: 82 bytes
|
2017-12-01 04:45:17 +00:00
|
|
|
* 410 M301 E0 PIDC Kp[0], Ki[0], Kd[0], Kc[0] (float x4)
|
|
|
|
* 426 M301 E1 PIDC Kp[1], Ki[1], Kd[1], Kc[1] (float x4)
|
|
|
|
* 442 M301 E2 PIDC Kp[2], Ki[2], Kd[2], Kc[2] (float x4)
|
|
|
|
* 458 M301 E3 PIDC Kp[3], Ki[3], Kd[3], Kc[3] (float x4)
|
|
|
|
* 474 M301 E4 PIDC Kp[3], Ki[3], Kd[3], Kc[3] (float x4)
|
|
|
|
* 490 M301 L lpq_len (int)
|
2015-01-28 09:08:48 +00:00
|
|
|
*
|
2017-03-07 22:35:27 +00:00
|
|
|
* PIDTEMPBED: 12 bytes
|
2017-12-01 04:45:17 +00:00
|
|
|
* 492 M304 PID bedKp, .bedKi, .bedKd (float x3)
|
2015-04-03 23:38:05 +00:00
|
|
|
*
|
2016-12-10 06:17:49 +00:00
|
|
|
* DOGLCD: 2 bytes
|
2017-12-01 04:45:17 +00:00
|
|
|
* 504 M250 C lcd_contrast (uint16_t)
|
2015-01-28 09:08:48 +00:00
|
|
|
*
|
2017-07-18 03:01:41 +00:00
|
|
|
* FWRETRACT: 33 bytes
|
2017-12-01 04:45:17 +00:00
|
|
|
* 506 M209 S autoretract_enabled (bool)
|
|
|
|
* 507 M207 S retract_length (float)
|
|
|
|
* 511 M207 F retract_feedrate_mm_s (float)
|
|
|
|
* 515 M207 Z retract_zlift (float)
|
|
|
|
* 519 M208 S retract_recover_length (float)
|
|
|
|
* 523 M208 F retract_recover_feedrate_mm_s (float)
|
|
|
|
* 527 M207 W swap_retract_length (float)
|
|
|
|
* 531 M208 W swap_retract_recover_length (float)
|
|
|
|
* 535 M208 R swap_retract_recover_feedrate_mm_s (float)
|
2015-01-28 09:08:48 +00:00
|
|
|
*
|
2017-04-06 21:46:52 +00:00
|
|
|
* Volumetric Extrusion: 21 bytes
|
2017-12-01 04:45:17 +00:00
|
|
|
* 539 M200 D parser.volumetric_enabled (bool)
|
2018-01-04 11:06:34 +00:00
|
|
|
* 540 M200 T D planner.filament_size (float x5) (T0..4)
|
2015-01-28 09:08:48 +00:00
|
|
|
*
|
2017-12-25 09:32:31 +00:00
|
|
|
* HAS_TRINAMIC: 22 bytes
|
2017-12-01 04:45:17 +00:00
|
|
|
* 560 M906 X Stepper X current (uint16_t)
|
|
|
|
* 562 M906 Y Stepper Y current (uint16_t)
|
|
|
|
* 564 M906 Z Stepper Z current (uint16_t)
|
|
|
|
* 566 M906 X2 Stepper X2 current (uint16_t)
|
|
|
|
* 568 M906 Y2 Stepper Y2 current (uint16_t)
|
|
|
|
* 570 M906 Z2 Stepper Z2 current (uint16_t)
|
|
|
|
* 572 M906 E0 Stepper E0 current (uint16_t)
|
|
|
|
* 574 M906 E1 Stepper E1 current (uint16_t)
|
|
|
|
* 576 M906 E2 Stepper E2 current (uint16_t)
|
|
|
|
* 578 M906 E3 Stepper E3 current (uint16_t)
|
|
|
|
* 580 M906 E4 Stepper E4 current (uint16_t)
|
2017-03-07 05:00:43 +00:00
|
|
|
*
|
2018-01-04 11:06:34 +00:00
|
|
|
* SENSORLESS_HOMING: 4 bytes
|
2017-12-25 09:32:31 +00:00
|
|
|
* 582 M914 X Stepper X and X2 threshold (int16_t)
|
|
|
|
* 584 M914 Y Stepper Y and Y2 threshold (int16_t)
|
2017-12-15 21:03:14 +00:00
|
|
|
*
|
2017-04-16 03:18:10 +00:00
|
|
|
* LIN_ADVANCE: 8 bytes
|
2017-12-25 09:32:31 +00:00
|
|
|
* 586 M900 K extruder_advance_k (float)
|
|
|
|
* 590 M900 WHD advance_ed_ratio (float)
|
2017-04-16 03:18:10 +00:00
|
|
|
*
|
2017-06-03 05:38:07 +00:00
|
|
|
* HAS_MOTOR_CURRENT_PWM:
|
2017-12-25 09:32:31 +00:00
|
|
|
* 594 M907 X Stepper XY current (uint32_t)
|
|
|
|
* 598 M907 Z Stepper Z current (uint32_t)
|
|
|
|
* 602 M907 E Stepper E current (uint32_t)
|
2017-06-03 05:38:07 +00:00
|
|
|
*
|
2018-01-04 11:06:34 +00:00
|
|
|
* CNC_COORDINATE_SYSTEMS: 108 bytes
|
2017-12-25 09:32:31 +00:00
|
|
|
* 606 G54-G59.3 coordinate_system (float x 27)
|
2017-11-04 21:36:41 +00:00
|
|
|
*
|
2017-12-01 22:42:23 +00:00
|
|
|
* SKEW_CORRECTION: 12 bytes
|
2017-12-25 09:32:31 +00:00
|
|
|
* 714 M852 I planner.xy_skew_factor (float)
|
|
|
|
* 718 M852 J planner.xz_skew_factor (float)
|
|
|
|
* 722 M852 K planner.yz_skew_factor (float)
|
2017-12-01 22:42:23 +00:00
|
|
|
*
|
2018-01-04 11:06:34 +00:00
|
|
|
* ADVANCED_PAUSE_FEATURE: 40 bytes
|
|
|
|
* 726 M603 T U filament_change_unload_length (float x 5) (T0..4)
|
|
|
|
* 746 M603 T L filament_change_load_length (float x 5) (T0..4)
|
|
|
|
*
|
|
|
|
* 766 Minimum end-point
|
|
|
|
* 2295 (766 + 208 + 36 + 9 + 288 + 988) Maximum end-point
|
2017-05-07 01:00:56 +00:00
|
|
|
*
|
|
|
|
* ========================================================================
|
|
|
|
* meshes_begin (between max and min end-point, directly above)
|
|
|
|
* -- MESHES --
|
|
|
|
* meshes_end
|
|
|
|
* -- MAT (Mesh Allocation Table) -- 128 bytes (placeholder size)
|
|
|
|
* mat_end = E2END (0xFFF)
|
|
|
|
*
|
2015-01-28 09:08:48 +00:00
|
|
|
*/
|
2017-04-10 02:47:49 +00:00
|
|
|
#include "configuration_store.h"
|
|
|
|
|
|
|
|
MarlinSettings settings;
|
|
|
|
|
2016-07-14 23:12:20 +00:00
|
|
|
#include "endstops.h"
|
2012-11-07 22:16:43 +00:00
|
|
|
#include "planner.h"
|
2017-06-03 05:38:07 +00:00
|
|
|
#include "stepper.h"
|
2017-09-06 11:28:32 +00:00
|
|
|
#include "temperature.h"
|
|
|
|
#include "../lcd/ultralcd.h"
|
|
|
|
#include "../core/language.h"
|
|
|
|
#include "../Marlin.h"
|
Allow Edit menu to call fn after edit; Fix PID Ki and Kd display in menus; Actually use changed PID and Max Accel values
Add new 'callback' edit-menu types that call a function after the edit is done. Use this to display and edit Ki and Kd correctly (removing the scaling first and reapplying it after). Also use it to reset maximum stepwise acceleration rates, after updating mm/s^2 rates via menus. (Previously, changes did nothing to affect planner unless saved back to EEPROM, and the machine reset).
Add calls to updatePID() so that PID loop uses updated values whether set by gcode (it already did this), or by restoring defaults, or loading from EEPROM (it didn't do those last two). Similarly, update the maximum step/s^2 accel rates when the mm/s^2 values are changed - whether by menu edits, restore defaults, or EEPROM read.
Refactor the acceleration rate update logic, and the PID scaling logic, into new functions that can be called from wherever, including the callbacks.
Add menu items to allow the z jerk and e jerk to be viewed/edited in the Control->Motion menu, as per xy jerk.
Conflicts:
Marlin/language.h
2013-03-19 14:05:11 +00:00
|
|
|
|
2017-09-16 16:41:12 +00:00
|
|
|
#include "../gcode/parser.h"
|
2017-05-20 08:03:08 +00:00
|
|
|
|
2017-09-08 20:35:25 +00:00
|
|
|
#if HAS_LEVELING
|
|
|
|
#include "../feature/bedlevel/bedlevel.h"
|
|
|
|
#endif
|
|
|
|
|
2017-09-06 11:28:32 +00:00
|
|
|
#if HAS_BED_PROBE
|
|
|
|
#include "../module/probe.h"
|
2015-04-28 02:48:34 +00:00
|
|
|
#endif
|
2015-03-15 22:18:11 +00:00
|
|
|
|
2017-03-07 05:00:43 +00:00
|
|
|
#if ENABLED(HAVE_TMC2130)
|
|
|
|
#include "stepper_indirection.h"
|
|
|
|
#endif
|
|
|
|
|
2017-09-06 11:28:32 +00:00
|
|
|
#if ENABLED(FWRETRACT)
|
|
|
|
#include "../feature/fwretract.h"
|
2017-03-18 15:15:54 +00:00
|
|
|
#endif
|
|
|
|
|
2017-10-13 22:21:25 +00:00
|
|
|
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
|
|
|
|
float new_z_fade_height;
|
|
|
|
#endif
|
|
|
|
|
2015-04-27 01:44:01 +00:00
|
|
|
/**
|
2016-06-30 01:19:26 +00:00
|
|
|
* Post-process after Retrieve or Reset
|
2015-04-27 01:44:01 +00:00
|
|
|
*/
|
2017-04-10 02:47:49 +00:00
|
|
|
void MarlinSettings::postprocess() {
|
2017-12-11 04:57:24 +00:00
|
|
|
const float oldpos[] = { current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS] };
|
2017-12-11 03:39:07 +00:00
|
|
|
|
2016-06-30 01:19:26 +00:00
|
|
|
// steps per s2 needs to be updated to agree with units per s2
|
|
|
|
planner.reset_acceleration_rates();
|
|
|
|
|
2016-07-24 02:36:26 +00:00
|
|
|
// Make sure delta kinematics are updated before refreshing the
|
|
|
|
// planner position so the stepper counts will be set correctly.
|
2016-06-30 01:19:26 +00:00
|
|
|
#if ENABLED(DELTA)
|
2017-11-08 09:07:17 +00:00
|
|
|
recalc_delta_settings();
|
2016-06-30 01:19:26 +00:00
|
|
|
#endif
|
2012-11-07 22:16:43 +00:00
|
|
|
|
2016-06-30 01:19:26 +00:00
|
|
|
#if ENABLED(PIDTEMP)
|
|
|
|
thermalManager.updatePID();
|
|
|
|
#endif
|
2012-11-07 22:16:43 +00:00
|
|
|
|
2017-12-20 01:44:11 +00:00
|
|
|
#if DISABLED(NO_VOLUMETRICS)
|
|
|
|
planner.calculate_volumetric_multipliers();
|
2017-12-27 02:04:39 +00:00
|
|
|
#else
|
|
|
|
for (uint8_t i = COUNT(planner.e_factor); i--;)
|
|
|
|
planner.refresh_e_factor(i);
|
2017-12-20 01:44:11 +00:00
|
|
|
#endif
|
2016-08-19 06:00:46 +00:00
|
|
|
|
2017-04-15 02:41:21 +00:00
|
|
|
#if HAS_HOME_OFFSET || ENABLED(DUAL_X_CARRIAGE)
|
2017-03-05 00:01:33 +00:00
|
|
|
// Software endstops depend on home_offset
|
|
|
|
LOOP_XYZ(i) update_software_endstops((AxisEnum)i);
|
|
|
|
#endif
|
2017-02-21 12:49:31 +00:00
|
|
|
|
|
|
|
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
|
2017-12-11 03:39:07 +00:00
|
|
|
set_z_fade_height(new_z_fade_height, false); // false = no report
|
2017-02-21 12:49:31 +00:00
|
|
|
#endif
|
2017-04-11 10:05:23 +00:00
|
|
|
|
2017-04-22 03:45:02 +00:00
|
|
|
#if ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
|
|
|
refresh_bed_level();
|
|
|
|
//set_bed_leveling_enabled(leveling_is_on);
|
|
|
|
#endif
|
2017-06-03 05:38:07 +00:00
|
|
|
|
|
|
|
#if HAS_MOTOR_CURRENT_PWM
|
|
|
|
stepper.refresh_motor_power();
|
|
|
|
#endif
|
2017-09-29 13:03:28 +00:00
|
|
|
|
|
|
|
#if ENABLED(FWRETRACT)
|
|
|
|
fwretract.refresh_autoretract();
|
|
|
|
#endif
|
2017-12-20 01:11:07 +00:00
|
|
|
|
2017-12-11 03:39:07 +00:00
|
|
|
// Refresh steps_to_mm with the reciprocal of axis_steps_per_mm
|
|
|
|
// and init stepper.count[], planner.position[] with current_position
|
|
|
|
planner.refresh_positioning();
|
2017-11-04 21:36:41 +00:00
|
|
|
|
2017-12-11 03:39:07 +00:00
|
|
|
// Various factors can change the current position
|
|
|
|
if (memcmp(oldpos, current_position, sizeof(oldpos)))
|
|
|
|
report_current_position();
|
2016-06-30 01:19:26 +00:00
|
|
|
}
|
2012-11-07 22:16:43 +00:00
|
|
|
|
2015-07-31 05:31:45 +00:00
|
|
|
#if ENABLED(EEPROM_SETTINGS)
|
2017-09-06 11:28:32 +00:00
|
|
|
#include "../HAL/persistent_store_api.h"
|
2015-01-28 09:08:48 +00:00
|
|
|
|
2017-05-07 01:00:56 +00:00
|
|
|
#define DUMMY_PID_VALUE 3000.0f
|
2017-06-17 23:36:10 +00:00
|
|
|
#define EEPROM_START() int eeprom_index = EEPROM_OFFSET; HAL::PersistentStore::access_start()
|
|
|
|
#define EEPROM_FINISH() HAL::PersistentStore::access_finish()
|
2017-05-07 01:00:56 +00:00
|
|
|
#define EEPROM_SKIP(VAR) eeprom_index += sizeof(VAR)
|
2017-06-17 23:36:10 +00:00
|
|
|
#define EEPROM_WRITE(VAR) HAL::PersistentStore::write_data(eeprom_index, (uint8_t*)&VAR, sizeof(VAR), &working_crc)
|
2018-01-05 01:51:18 +00:00
|
|
|
#define EEPROM_READ(VAR) HAL::PersistentStore::read_data(eeprom_index, (uint8_t*)&VAR, sizeof(VAR), &working_crc, !validating)
|
|
|
|
#define EEPROM_READ_ALWAYS(VAR) HAL::PersistentStore::read_data(eeprom_index, (uint8_t*)&VAR, sizeof(VAR), &working_crc)
|
2017-06-09 15:51:23 +00:00
|
|
|
#define EEPROM_ASSERT(TST,ERR) if (!(TST)) do{ SERIAL_ERROR_START(); SERIAL_ERRORLNPGM(ERR); eeprom_read_error = true; }while(0)
|
2017-05-07 01:00:56 +00:00
|
|
|
|
2016-12-09 12:13:44 +00:00
|
|
|
const char version[4] = EEPROM_VERSION;
|
|
|
|
|
2018-01-05 01:51:18 +00:00
|
|
|
bool MarlinSettings::eeprom_error, MarlinSettings::validating;
|
2017-04-10 02:47:49 +00:00
|
|
|
|
2017-05-07 01:00:56 +00:00
|
|
|
#if ENABLED(AUTO_BED_LEVELING_UBL)
|
2017-12-25 09:32:31 +00:00
|
|
|
int16_t MarlinSettings::meshes_begin;
|
2017-05-07 01:00:56 +00:00
|
|
|
#endif
|
2016-12-09 12:13:44 +00:00
|
|
|
|
2016-10-28 23:55:42 +00:00
|
|
|
/**
|
|
|
|
* M500 - Store Configuration
|
|
|
|
*/
|
2017-04-10 02:47:49 +00:00
|
|
|
bool MarlinSettings::save() {
|
2016-10-28 23:55:42 +00:00
|
|
|
float dummy = 0.0f;
|
|
|
|
char ver[4] = "000";
|
2015-01-28 09:08:48 +00:00
|
|
|
|
2017-05-07 01:00:56 +00:00
|
|
|
uint16_t working_crc = 0;
|
|
|
|
|
2016-10-28 23:55:42 +00:00
|
|
|
EEPROM_START();
|
2015-01-28 09:08:48 +00:00
|
|
|
|
2017-05-07 01:00:56 +00:00
|
|
|
eeprom_error = false;
|
[2.0.x] Multiple updates to STM32F1 HAL (#8733)
* STM32F1 HAL
Adding files for STM32F1 HAL based on libmaple/stm32duino core.
Current persistent_store uses cardreader changes to be sent in separate
commit, but could be changed to use i2c eeprom.
There is another persistent_store implementation that uses the MCU flash memory
to emulate eeprom
Adding readme with some information about the stm32 HAL.
* Switch to Timer4 to avoid a hard reset on STM32F103C6 boards
On bluepill STM32F103C6 boards, using Timer5 results in a error() vector call. Switch to 4 since these are both general purpose, 16 bit timers.
* Add support for EEPROM emulation using Flash
Some low end machines doe not have EEPROM support. Simulate it using the last two pages of flash. Flash does not allow rewrite between erases, so skip writing the working version if that's enabled.
* Basic Pins for a malyan M200
This is a work in progress to go hand in hand with the STM32 work.
* Add support for ADC with DMA. This work has exposed a problem with the pin enumerations in STM boards vs what marlin expects (i.e, try defining PA0 as a temp pin). The hack can be removed with we go to fastio completely. To see this work, set something in adc_pins to a value like PA0 and connect your pullup resistor'd thermistor.
* Missing file - change HAL_adc_init to actually do something
We have an actual ADC init function now.
* Remove pinmode hack
Remove the pin mode hack that I was using to init PA0.
Updated Readme.md
* Several changes to timers and GPIO
Faster GPIO, and faster timer functions by accesing registers and
libmaple.
Still more changes pending for the Timer's code to skip using the
HardwareTimer class altogether.
Switch all enums to be within #defines
This change allows a user to have, for instance, TEMP_4 and TEMP_BED definied but nothing else. The enums which are not defined move "out", allowing the first ones to take the slots in the enum, and since the array is sized on ADC_PIN_COUNT, we always have the right size data and in order.
* Update Malyan M200 pins
Update Malyan M200 pins with correct fan values.
* Test all pins on actual hardware, update definitions
Some of the pin definitions were from knowlege base/pdfs. Now they've been tested against actual hardware. This should be very close to final.
* Update HAL_timers_Stm32f1.cpp
* Add sample configurations for Malyan M200
Add sample configuration for Malyan M200 without bed leveling, and move fan to auto cool E0 since this printer by default has only one fan.
Choose the timer based on MCU defintion. Timer5 is not valid on C8/CB class boards, so use Timer4 for the step timer.
readme.md update
* Updates to timers, and some stm32 boards definitiions
* Correct pin toggle macro.
* Remove duplicated Malyan M200 entry from pins.h
* Update configuration_store.cpp
* Formatting, indentation
* Formatting in HAL_Stm32f1.cpp
2017-12-11 05:12:45 +00:00
|
|
|
#if ENABLED(FLASH_EEPROM_EMULATION)
|
|
|
|
EEPROM_SKIP(ver); // Flash doesn't allow rewriting without erase
|
|
|
|
#else
|
|
|
|
EEPROM_WRITE(ver); // invalidate data first
|
|
|
|
#endif
|
2017-05-07 01:00:56 +00:00
|
|
|
EEPROM_SKIP(working_crc); // Skip the checksum slot
|
2016-06-30 01:12:23 +00:00
|
|
|
|
2017-12-11 03:39:07 +00:00
|
|
|
working_crc = 0; // clear before first "real data"
|
2016-07-24 17:19:49 +00:00
|
|
|
|
2016-12-16 05:15:12 +00:00
|
|
|
const uint8_t esteppers = COUNT(planner.axis_steps_per_mm) - XYZ;
|
2016-12-09 11:45:55 +00:00
|
|
|
EEPROM_WRITE(esteppers);
|
2016-12-14 13:13:25 +00:00
|
|
|
|
2016-10-28 23:55:42 +00:00
|
|
|
EEPROM_WRITE(planner.axis_steps_per_mm);
|
|
|
|
EEPROM_WRITE(planner.max_feedrate_mm_s);
|
|
|
|
EEPROM_WRITE(planner.max_acceleration_mm_per_s2);
|
2016-12-09 11:45:55 +00:00
|
|
|
|
2016-10-28 23:55:42 +00:00
|
|
|
EEPROM_WRITE(planner.acceleration);
|
|
|
|
EEPROM_WRITE(planner.retract_acceleration);
|
|
|
|
EEPROM_WRITE(planner.travel_acceleration);
|
|
|
|
EEPROM_WRITE(planner.min_feedrate_mm_s);
|
|
|
|
EEPROM_WRITE(planner.min_travel_feedrate_mm_s);
|
2017-10-29 23:21:15 +00:00
|
|
|
EEPROM_WRITE(planner.min_segment_time_us);
|
2016-10-28 23:55:42 +00:00
|
|
|
EEPROM_WRITE(planner.max_jerk);
|
2017-04-15 02:41:21 +00:00
|
|
|
#if !HAS_HOME_OFFSET
|
2017-03-31 19:58:40 +00:00
|
|
|
const float home_offset[XYZ] = { 0 };
|
|
|
|
#endif
|
2017-11-09 04:10:08 +00:00
|
|
|
EEPROM_WRITE(home_offset);
|
2015-01-28 09:08:48 +00:00
|
|
|
|
2016-10-28 23:39:23 +00:00
|
|
|
#if HOTENDS > 1
|
|
|
|
// Skip hotend 0 which must be 0
|
|
|
|
for (uint8_t e = 1; e < HOTENDS; e++)
|
2016-10-28 23:55:42 +00:00
|
|
|
LOOP_XYZ(i) EEPROM_WRITE(hotend_offset[i][e]);
|
2016-10-28 23:39:23 +00:00
|
|
|
#endif
|
|
|
|
|
2017-02-21 12:49:31 +00:00
|
|
|
//
|
2017-04-22 21:04:28 +00:00
|
|
|
// Global Leveling
|
2017-02-21 12:49:31 +00:00
|
|
|
//
|
|
|
|
|
|
|
|
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
|
2017-04-22 21:04:28 +00:00
|
|
|
const float zfh = planner.z_fade_height;
|
2017-02-21 12:49:31 +00:00
|
|
|
#else
|
2017-12-11 03:39:07 +00:00
|
|
|
const float zfh = 10.0;
|
2017-02-21 12:49:31 +00:00
|
|
|
#endif
|
2017-04-22 21:04:28 +00:00
|
|
|
EEPROM_WRITE(zfh);
|
2017-02-21 12:49:31 +00:00
|
|
|
|
2016-12-10 06:17:49 +00:00
|
|
|
//
|
|
|
|
// Mesh Bed Leveling
|
|
|
|
//
|
|
|
|
|
2015-07-31 05:31:45 +00:00
|
|
|
#if ENABLED(MESH_BED_LEVELING)
|
2016-10-28 23:55:42 +00:00
|
|
|
// Compile time test that sizeof(mbl.z_values) is as expected
|
2017-04-18 20:26:27 +00:00
|
|
|
static_assert(
|
2017-05-12 04:22:35 +00:00
|
|
|
sizeof(mbl.z_values) == GRID_MAX_POINTS * sizeof(mbl.z_values[0][0]),
|
2017-04-18 20:26:27 +00:00
|
|
|
"MBL Z array is the wrong size."
|
|
|
|
);
|
2017-04-06 03:29:44 +00:00
|
|
|
const uint8_t mesh_num_x = GRID_MAX_POINTS_X, mesh_num_y = GRID_MAX_POINTS_Y;
|
2017-11-16 22:53:55 +00:00
|
|
|
EEPROM_WRITE(mbl.has_mesh);
|
2016-10-28 23:55:42 +00:00
|
|
|
EEPROM_WRITE(mbl.z_offset);
|
|
|
|
EEPROM_WRITE(mesh_num_x);
|
|
|
|
EEPROM_WRITE(mesh_num_y);
|
|
|
|
EEPROM_WRITE(mbl.z_values);
|
2017-04-22 21:04:28 +00:00
|
|
|
#else // For disabled MBL write a default mesh
|
2016-12-14 07:44:39 +00:00
|
|
|
const bool leveling_is_on = false;
|
2016-10-28 23:55:42 +00:00
|
|
|
dummy = 0.0f;
|
2016-12-14 07:44:39 +00:00
|
|
|
const uint8_t mesh_num_x = 3, mesh_num_y = 3;
|
|
|
|
EEPROM_WRITE(leveling_is_on);
|
2016-12-10 06:17:49 +00:00
|
|
|
EEPROM_WRITE(dummy); // z_offset
|
2016-10-28 23:55:42 +00:00
|
|
|
EEPROM_WRITE(mesh_num_x);
|
|
|
|
EEPROM_WRITE(mesh_num_y);
|
2016-12-10 06:17:49 +00:00
|
|
|
for (uint8_t q = mesh_num_x * mesh_num_y; q--;) EEPROM_WRITE(dummy);
|
2015-04-27 04:06:04 +00:00
|
|
|
#endif // MESH_BED_LEVELING
|
2015-03-15 22:18:11 +00:00
|
|
|
|
2016-06-15 01:05:20 +00:00
|
|
|
#if !HAS_BED_PROBE
|
2017-04-11 10:05:23 +00:00
|
|
|
const float zprobe_zoffset = 0;
|
2015-03-26 04:14:00 +00:00
|
|
|
#endif
|
2016-10-28 23:55:42 +00:00
|
|
|
EEPROM_WRITE(zprobe_zoffset);
|
2015-03-26 04:14:00 +00:00
|
|
|
|
2016-12-14 07:50:06 +00:00
|
|
|
//
|
|
|
|
// 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
|
|
|
|
|
2016-12-10 06:17:49 +00:00
|
|
|
//
|
|
|
|
// Bilinear Auto Bed Leveling
|
|
|
|
//
|
|
|
|
|
|
|
|
#if ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
2017-04-22 03:46:19 +00:00
|
|
|
// Compile time test that sizeof(z_values) is as expected
|
2017-04-18 20:26:27 +00:00
|
|
|
static_assert(
|
2017-05-12 04:22:35 +00:00
|
|
|
sizeof(z_values) == GRID_MAX_POINTS * sizeof(z_values[0][0]),
|
2017-04-18 20:26:27 +00:00
|
|
|
"Bilinear Z array is the wrong size."
|
|
|
|
);
|
2017-04-06 03:29:44 +00:00
|
|
|
const uint8_t grid_max_x = GRID_MAX_POINTS_X, grid_max_y = GRID_MAX_POINTS_Y;
|
2016-12-10 06:17:49 +00:00
|
|
|
EEPROM_WRITE(grid_max_x); // 1 byte
|
|
|
|
EEPROM_WRITE(grid_max_y); // 1 byte
|
|
|
|
EEPROM_WRITE(bilinear_grid_spacing); // 2 ints
|
|
|
|
EEPROM_WRITE(bilinear_start); // 2 ints
|
2017-04-22 03:46:19 +00:00
|
|
|
EEPROM_WRITE(z_values); // 9-256 floats
|
2016-12-10 06:17:49 +00:00
|
|
|
#else
|
|
|
|
// For disabled Bilinear Grid write an empty 3x3 grid
|
|
|
|
const uint8_t grid_max_x = 3, grid_max_y = 3;
|
|
|
|
const int bilinear_start[2] = { 0 }, bilinear_grid_spacing[2] = { 0 };
|
|
|
|
dummy = 0.0f;
|
|
|
|
EEPROM_WRITE(grid_max_x);
|
|
|
|
EEPROM_WRITE(grid_max_y);
|
|
|
|
EEPROM_WRITE(bilinear_grid_spacing);
|
|
|
|
EEPROM_WRITE(bilinear_start);
|
|
|
|
for (uint16_t q = grid_max_x * grid_max_y; q--;) EEPROM_WRITE(dummy);
|
|
|
|
#endif // AUTO_BED_LEVELING_BILINEAR
|
|
|
|
|
2017-04-22 21:04:28 +00:00
|
|
|
#if ENABLED(AUTO_BED_LEVELING_UBL)
|
2017-10-13 22:21:25 +00:00
|
|
|
EEPROM_WRITE(planner.leveling_active);
|
2017-10-14 02:56:27 +00:00
|
|
|
EEPROM_WRITE(ubl.storage_slot);
|
2017-04-22 21:04:28 +00:00
|
|
|
#else
|
2017-05-16 07:34:36 +00:00
|
|
|
const bool ubl_active = false;
|
2017-05-07 01:00:56 +00:00
|
|
|
const int8_t storage_slot = -1;
|
2017-04-22 21:04:28 +00:00
|
|
|
EEPROM_WRITE(ubl_active);
|
2017-05-07 01:00:56 +00:00
|
|
|
EEPROM_WRITE(storage_slot);
|
2017-05-09 17:35:43 +00:00
|
|
|
#endif // AUTO_BED_LEVELING_UBL
|
2017-04-22 21:04:28 +00:00
|
|
|
|
2017-12-01 04:45:17 +00:00
|
|
|
// 11 floats for DELTA / [XYZ]_DUAL_ENDSTOPS
|
2015-07-31 05:31:45 +00:00
|
|
|
#if ENABLED(DELTA)
|
2017-11-09 04:10:08 +00:00
|
|
|
EEPROM_WRITE(delta_height); // 1 float
|
2017-09-24 07:18:15 +00:00
|
|
|
EEPROM_WRITE(delta_endstop_adj); // 3 floats
|
2016-10-28 23:55:42 +00:00
|
|
|
EEPROM_WRITE(delta_radius); // 1 float
|
|
|
|
EEPROM_WRITE(delta_diagonal_rod); // 1 float
|
|
|
|
EEPROM_WRITE(delta_segments_per_second); // 1 float
|
2017-04-29 14:36:33 +00:00
|
|
|
EEPROM_WRITE(delta_calibration_radius); // 1 float
|
2017-09-24 07:18:15 +00:00
|
|
|
EEPROM_WRITE(delta_tower_angle_trim); // 3 floats
|
2017-10-29 08:43:44 +00:00
|
|
|
|
|
|
|
#elif ENABLED(X_DUAL_ENDSTOPS) || ENABLED(Y_DUAL_ENDSTOPS) || ENABLED(Z_DUAL_ENDSTOPS)
|
|
|
|
// Write dual endstops in X, Y, Z order. Unused = 0.0
|
2017-04-29 14:36:33 +00:00
|
|
|
dummy = 0.0f;
|
2017-10-29 08:43:44 +00:00
|
|
|
#if ENABLED(X_DUAL_ENDSTOPS)
|
|
|
|
EEPROM_WRITE(endstops.x_endstop_adj); // 1 float
|
|
|
|
#else
|
|
|
|
EEPROM_WRITE(dummy);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if ENABLED(Y_DUAL_ENDSTOPS)
|
|
|
|
EEPROM_WRITE(endstops.y_endstop_adj); // 1 float
|
|
|
|
#else
|
|
|
|
EEPROM_WRITE(dummy);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if ENABLED(Z_DUAL_ENDSTOPS)
|
|
|
|
EEPROM_WRITE(endstops.z_endstop_adj); // 1 float
|
|
|
|
#else
|
|
|
|
EEPROM_WRITE(dummy);
|
|
|
|
#endif
|
|
|
|
|
2017-12-01 04:45:17 +00:00
|
|
|
for (uint8_t q = 8; q--;) EEPROM_WRITE(dummy);
|
2017-10-29 08:43:44 +00:00
|
|
|
|
2015-01-28 09:08:48 +00:00
|
|
|
#else
|
2015-03-24 17:06:44 +00:00
|
|
|
dummy = 0.0f;
|
2017-12-01 04:45:17 +00:00
|
|
|
for (uint8_t q = 11; q--;) EEPROM_WRITE(dummy);
|
2015-01-28 09:08:48 +00:00
|
|
|
#endif
|
|
|
|
|
2015-07-31 05:31:45 +00:00
|
|
|
#if DISABLED(ULTIPANEL)
|
2017-06-05 22:41:38 +00:00
|
|
|
constexpr int lcd_preheat_hotend_temp[2] = { PREHEAT_1_TEMP_HOTEND, PREHEAT_2_TEMP_HOTEND },
|
|
|
|
lcd_preheat_bed_temp[2] = { PREHEAT_1_TEMP_BED, PREHEAT_2_TEMP_BED },
|
|
|
|
lcd_preheat_fan_speed[2] = { PREHEAT_1_FAN_SPEED, PREHEAT_2_FAN_SPEED };
|
|
|
|
#endif
|
2016-10-28 23:55:42 +00:00
|
|
|
|
2016-10-27 07:40:37 +00:00
|
|
|
EEPROM_WRITE(lcd_preheat_hotend_temp);
|
|
|
|
EEPROM_WRITE(lcd_preheat_bed_temp);
|
|
|
|
EEPROM_WRITE(lcd_preheat_fan_speed);
|
2016-10-28 23:55:42 +00:00
|
|
|
|
|
|
|
for (uint8_t e = 0; e < MAX_EXTRUDERS; e++) {
|
|
|
|
|
|
|
|
#if ENABLED(PIDTEMP)
|
|
|
|
if (e < HOTENDS) {
|
|
|
|
EEPROM_WRITE(PID_PARAM(Kp, e));
|
|
|
|
EEPROM_WRITE(PID_PARAM(Ki, e));
|
|
|
|
EEPROM_WRITE(PID_PARAM(Kd, e));
|
2016-08-01 00:49:34 +00:00
|
|
|
#if ENABLED(PID_EXTRUSION_SCALING)
|
2016-10-28 23:55:42 +00:00
|
|
|
EEPROM_WRITE(PID_PARAM(Kc, e));
|
2015-01-28 09:08:48 +00:00
|
|
|
#else
|
2016-10-28 23:55:42 +00:00
|
|
|
dummy = 1.0f; // 1.0 = default kc
|
|
|
|
EEPROM_WRITE(dummy);
|
2015-01-28 09:08:48 +00:00
|
|
|
#endif
|
|
|
|
}
|
2016-10-28 23:55:42 +00:00
|
|
|
else
|
|
|
|
#endif // !PIDTEMP
|
|
|
|
{
|
|
|
|
dummy = DUMMY_PID_VALUE; // When read, will not change the existing value
|
|
|
|
EEPROM_WRITE(dummy); // Kp
|
|
|
|
dummy = 0.0f;
|
|
|
|
for (uint8_t q = 3; q--;) EEPROM_WRITE(dummy); // Ki, Kd, Kc
|
2015-01-28 09:08:48 +00:00
|
|
|
}
|
2016-10-28 23:55:42 +00:00
|
|
|
|
|
|
|
} // Hotends Loop
|
2015-01-28 09:08:48 +00:00
|
|
|
|
2016-08-01 00:49:34 +00:00
|
|
|
#if DISABLED(PID_EXTRUSION_SCALING)
|
2016-10-28 23:55:42 +00:00
|
|
|
int lpq_len = 20;
|
2015-08-31 02:04:30 +00:00
|
|
|
#endif
|
2016-10-28 23:55:42 +00:00
|
|
|
EEPROM_WRITE(lpq_len);
|
|
|
|
|
|
|
|
#if DISABLED(PIDTEMPBED)
|
|
|
|
dummy = DUMMY_PID_VALUE;
|
|
|
|
for (uint8_t q = 3; q--;) EEPROM_WRITE(dummy);
|
2016-04-29 01:18:13 +00:00
|
|
|
#else
|
2016-10-28 23:55:42 +00:00
|
|
|
EEPROM_WRITE(thermalManager.bedKp);
|
|
|
|
EEPROM_WRITE(thermalManager.bedKi);
|
|
|
|
EEPROM_WRITE(thermalManager.bedKd);
|
2015-04-03 23:38:05 +00:00
|
|
|
#endif
|
|
|
|
|
2016-05-31 18:47:02 +00:00
|
|
|
#if !HAS_LCD_CONTRAST
|
2017-05-21 00:54:23 +00:00
|
|
|
const uint16_t lcd_contrast = 32;
|
2015-01-28 09:08:48 +00:00
|
|
|
#endif
|
2016-10-28 23:55:42 +00:00
|
|
|
EEPROM_WRITE(lcd_contrast);
|
2015-01-28 09:08:48 +00:00
|
|
|
|
2017-07-18 03:01:41 +00:00
|
|
|
#if DISABLED(FWRETRACT)
|
|
|
|
const bool autoretract_enabled = false;
|
2017-09-08 03:40:32 +00:00
|
|
|
const float autoretract_defaults[] = { 3, 45, 0, 0, 0, 13, 0, 8 };
|
|
|
|
EEPROM_WRITE(autoretract_enabled);
|
|
|
|
EEPROM_WRITE(autoretract_defaults);
|
|
|
|
#else
|
|
|
|
EEPROM_WRITE(fwretract.autoretract_enabled);
|
|
|
|
EEPROM_WRITE(fwretract.retract_length);
|
|
|
|
EEPROM_WRITE(fwretract.retract_feedrate_mm_s);
|
|
|
|
EEPROM_WRITE(fwretract.retract_zlift);
|
|
|
|
EEPROM_WRITE(fwretract.retract_recover_length);
|
|
|
|
EEPROM_WRITE(fwretract.retract_recover_feedrate_mm_s);
|
|
|
|
EEPROM_WRITE(fwretract.swap_retract_length);
|
|
|
|
EEPROM_WRITE(fwretract.swap_retract_recover_length);
|
|
|
|
EEPROM_WRITE(fwretract.swap_retract_recover_feedrate_mm_s);
|
2017-07-18 03:01:41 +00:00
|
|
|
#endif
|
2015-01-28 09:08:48 +00:00
|
|
|
|
2017-12-20 01:44:11 +00:00
|
|
|
//
|
|
|
|
// Volumetric & Filament Size
|
|
|
|
//
|
|
|
|
#if DISABLED(NO_VOLUMETRICS)
|
|
|
|
|
|
|
|
EEPROM_WRITE(parser.volumetric_enabled);
|
2015-01-28 09:08:48 +00:00
|
|
|
|
2017-12-20 01:44:11 +00:00
|
|
|
// Save filament sizes
|
|
|
|
for (uint8_t q = 0; q < MAX_EXTRUDERS; q++) {
|
|
|
|
if (q < COUNT(planner.filament_size)) dummy = planner.filament_size[q];
|
|
|
|
EEPROM_WRITE(dummy);
|
|
|
|
}
|
|
|
|
|
2018-01-05 02:23:24 +00:00
|
|
|
#else
|
|
|
|
|
|
|
|
const bool volumetric_enabled = false;
|
|
|
|
dummy = DEFAULT_NOMINAL_FILAMENT_DIA;
|
|
|
|
EEPROM_WRITE(volumetric_enabled);
|
|
|
|
for (uint8_t q = MAX_EXTRUDERS; q--;) EEPROM_WRITE(dummy);
|
|
|
|
|
2017-12-20 01:44:11 +00:00
|
|
|
#endif
|
2015-01-28 09:08:48 +00:00
|
|
|
|
2018-01-05 01:47:42 +00:00
|
|
|
//
|
2017-12-15 21:03:14 +00:00
|
|
|
// Save TMC2130 or TMC2208 Configuration, and placeholder values
|
2018-01-05 01:47:42 +00:00
|
|
|
//
|
|
|
|
uint16_t currents[11] = {
|
|
|
|
#if HAS_TRINAMIC
|
|
|
|
#if X_IS_TRINAMIC
|
|
|
|
stepperX.getCurrent(),
|
|
|
|
#else
|
|
|
|
0,
|
|
|
|
#endif
|
|
|
|
#if Y_IS_TRINAMIC
|
|
|
|
stepperY.getCurrent(),
|
|
|
|
#else
|
|
|
|
0,
|
|
|
|
#endif
|
|
|
|
#if Z_IS_TRINAMIC
|
|
|
|
stepperZ.getCurrent(),
|
|
|
|
#else
|
|
|
|
0,
|
|
|
|
#endif
|
|
|
|
#if X2_IS_TRINAMIC
|
|
|
|
stepperX2.getCurrent(),
|
|
|
|
#else
|
|
|
|
0,
|
|
|
|
#endif
|
|
|
|
#if Y2_IS_TRINAMIC
|
|
|
|
stepperY2.getCurrent(),
|
|
|
|
#else
|
|
|
|
0,
|
|
|
|
#endif
|
|
|
|
#if Z2_IS_TRINAMIC
|
|
|
|
stepperZ2.getCurrent(),
|
|
|
|
#else
|
|
|
|
0,
|
|
|
|
#endif
|
|
|
|
#if E0_IS_TRINAMIC
|
|
|
|
stepperE0.getCurrent(),
|
|
|
|
#else
|
|
|
|
0,
|
|
|
|
#endif
|
|
|
|
#if E1_IS_TRINAMIC
|
|
|
|
stepperE1.getCurrent(),
|
|
|
|
#else
|
|
|
|
0,
|
|
|
|
#endif
|
|
|
|
#if E2_IS_TRINAMIC
|
|
|
|
stepperE2.getCurrent(),
|
|
|
|
#else
|
|
|
|
0,
|
|
|
|
#endif
|
|
|
|
#if E3_IS_TRINAMIC
|
|
|
|
stepperE3.getCurrent(),
|
|
|
|
#else
|
|
|
|
0,
|
|
|
|
#endif
|
|
|
|
#if E4_IS_TRINAMIC
|
|
|
|
stepperE4.getCurrent()
|
|
|
|
#else
|
|
|
|
0
|
|
|
|
#endif
|
2017-03-31 19:58:40 +00:00
|
|
|
#else
|
2018-01-05 01:47:42 +00:00
|
|
|
0
|
2017-03-31 19:58:40 +00:00
|
|
|
#endif
|
2018-01-05 01:47:42 +00:00
|
|
|
};
|
|
|
|
EEPROM_WRITE(currents);
|
2017-03-07 05:00:43 +00:00
|
|
|
|
2017-12-15 21:03:14 +00:00
|
|
|
//
|
|
|
|
// TMC2130 Sensorless homing threshold
|
|
|
|
//
|
|
|
|
int16_t thrs;
|
|
|
|
#if ENABLED(SENSORLESS_HOMING)
|
|
|
|
#if ENABLED(X_IS_TMC2130)
|
|
|
|
thrs = stepperX.sgt();
|
|
|
|
#else
|
|
|
|
thrs = 0;
|
|
|
|
#endif
|
|
|
|
EEPROM_WRITE(thrs);
|
|
|
|
#if ENABLED(Y_IS_TMC2130)
|
|
|
|
thrs = stepperY.sgt();
|
|
|
|
#else
|
|
|
|
thrs = 0;
|
|
|
|
#endif
|
|
|
|
EEPROM_WRITE(thrs);
|
|
|
|
#else
|
|
|
|
thrs = 0;
|
|
|
|
for (uint8_t q = 2; q--;) EEPROM_WRITE(thrs);
|
|
|
|
#endif
|
|
|
|
|
2017-04-16 03:18:10 +00:00
|
|
|
//
|
|
|
|
// Linear Advance
|
|
|
|
//
|
|
|
|
|
|
|
|
#if ENABLED(LIN_ADVANCE)
|
2017-04-22 03:30:36 +00:00
|
|
|
EEPROM_WRITE(planner.extruder_advance_k);
|
|
|
|
EEPROM_WRITE(planner.advance_ed_ratio);
|
|
|
|
#else
|
|
|
|
dummy = 0.0f;
|
|
|
|
EEPROM_WRITE(dummy);
|
|
|
|
EEPROM_WRITE(dummy);
|
2017-04-16 03:18:10 +00:00
|
|
|
#endif
|
|
|
|
|
2017-06-03 05:38:07 +00:00
|
|
|
#if HAS_MOTOR_CURRENT_PWM
|
|
|
|
for (uint8_t q = 3; q--;) EEPROM_WRITE(stepper.motor_current_setting[q]);
|
|
|
|
#else
|
|
|
|
const uint32_t dummyui32 = 0;
|
|
|
|
for (uint8_t q = 3; q--;) EEPROM_WRITE(dummyui32);
|
|
|
|
#endif
|
|
|
|
|
2017-12-01 22:42:23 +00:00
|
|
|
//
|
|
|
|
// CNC Coordinate Systems
|
|
|
|
//
|
|
|
|
|
2017-11-04 21:36:41 +00:00
|
|
|
#if ENABLED(CNC_COORDINATE_SYSTEMS)
|
|
|
|
EEPROM_WRITE(coordinate_system); // 27 floats
|
|
|
|
#else
|
|
|
|
dummy = 0.0f;
|
|
|
|
for (uint8_t q = 27; q--;) EEPROM_WRITE(dummy);
|
|
|
|
#endif
|
|
|
|
|
2017-12-01 22:42:23 +00:00
|
|
|
//
|
|
|
|
// Skew correction factors
|
|
|
|
//
|
|
|
|
|
|
|
|
#if ENABLED(SKEW_CORRECTION)
|
|
|
|
EEPROM_WRITE(planner.xy_skew_factor);
|
|
|
|
EEPROM_WRITE(planner.xz_skew_factor);
|
|
|
|
EEPROM_WRITE(planner.yz_skew_factor);
|
|
|
|
#else
|
|
|
|
dummy = 0.0f;
|
|
|
|
for (uint8_t q = 3; q--;) EEPROM_WRITE(dummy);
|
|
|
|
#endif
|
|
|
|
|
2018-01-04 11:06:34 +00:00
|
|
|
//
|
|
|
|
// Advanced Pause filament load & unload lengths
|
|
|
|
//
|
|
|
|
#if ENABLED(ADVANCED_PAUSE_FEATURE)
|
|
|
|
for (uint8_t q = 0; q < MAX_EXTRUDERS; q++) {
|
|
|
|
if (q < COUNT(filament_change_unload_length)) dummy = filament_change_unload_length[q];
|
|
|
|
EEPROM_WRITE(dummy);
|
|
|
|
}
|
|
|
|
for (uint8_t q = 0; q < MAX_EXTRUDERS; q++) {
|
|
|
|
if (q < COUNT(filament_change_load_length)) dummy = filament_change_load_length[q];
|
|
|
|
EEPROM_WRITE(dummy);
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
dummy = 0.0f;
|
|
|
|
for (uint8_t q = MAX_EXTRUDERS * 2; q--;) EEPROM_WRITE(dummy);
|
|
|
|
#endif
|
|
|
|
|
2018-01-05 01:51:18 +00:00
|
|
|
//
|
|
|
|
// Validate CRC
|
|
|
|
//
|
2017-05-07 01:00:56 +00:00
|
|
|
if (!eeprom_error) {
|
2017-09-23 13:31:51 +00:00
|
|
|
#if ENABLED(EEPROM_CHITCHAT)
|
|
|
|
const int eeprom_size = eeprom_index;
|
|
|
|
#endif
|
2016-10-28 23:55:42 +00:00
|
|
|
|
2017-05-17 21:16:38 +00:00
|
|
|
const uint16_t final_crc = working_crc;
|
2017-05-11 14:48:16 +00:00
|
|
|
|
2016-12-14 07:48:42 +00:00
|
|
|
// Write the EEPROM header
|
|
|
|
eeprom_index = EEPROM_OFFSET;
|
2017-05-11 14:48:16 +00:00
|
|
|
|
2016-12-14 07:48:42 +00:00
|
|
|
EEPROM_WRITE(version);
|
2017-05-17 21:16:38 +00:00
|
|
|
EEPROM_WRITE(final_crc);
|
2016-10-28 23:55:42 +00:00
|
|
|
|
2016-12-14 07:48:42 +00:00
|
|
|
// Report storage size
|
2017-07-02 02:48:18 +00:00
|
|
|
#if ENABLED(EEPROM_CHITCHAT)
|
|
|
|
SERIAL_ECHO_START();
|
|
|
|
SERIAL_ECHOPAIR("Settings Stored (", eeprom_size - (EEPROM_OFFSET));
|
2017-08-21 21:30:08 +00:00
|
|
|
SERIAL_ECHOPAIR(" bytes; crc ", (uint32_t)final_crc);
|
2017-07-02 02:48:18 +00:00
|
|
|
SERIAL_ECHOLNPGM(")");
|
|
|
|
#endif
|
2016-12-14 07:48:42 +00:00
|
|
|
}
|
2017-10-18 19:00:29 +00:00
|
|
|
EEPROM_FINISH();
|
2017-03-20 11:10:31 +00:00
|
|
|
|
2018-01-05 01:51:18 +00:00
|
|
|
//
|
|
|
|
// UBL Mesh
|
|
|
|
//
|
2017-04-22 21:04:28 +00:00
|
|
|
#if ENABLED(UBL_SAVE_ACTIVE_ON_M500)
|
2017-10-14 02:56:27 +00:00
|
|
|
if (ubl.storage_slot >= 0)
|
|
|
|
store_mesh(ubl.storage_slot);
|
2017-03-18 15:15:54 +00:00
|
|
|
#endif
|
2017-10-29 08:43:44 +00:00
|
|
|
|
2017-05-07 01:00:56 +00:00
|
|
|
return !eeprom_error;
|
2016-10-28 23:55:42 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* M501 - Retrieve Configuration
|
|
|
|
*/
|
2018-01-05 01:51:18 +00:00
|
|
|
bool MarlinSettings::_load() {
|
2017-05-07 01:00:56 +00:00
|
|
|
uint16_t working_crc = 0;
|
2016-10-28 23:55:42 +00:00
|
|
|
|
|
|
|
EEPROM_START();
|
|
|
|
|
|
|
|
char stored_ver[4];
|
2018-01-05 01:51:18 +00:00
|
|
|
EEPROM_READ_ALWAYS(stored_ver);
|
2016-10-28 23:55:42 +00:00
|
|
|
|
2017-05-07 01:00:56 +00:00
|
|
|
uint16_t stored_crc;
|
2018-01-05 01:51:18 +00:00
|
|
|
EEPROM_READ_ALWAYS(stored_crc);
|
2016-10-28 23:55:42 +00:00
|
|
|
|
2016-12-09 11:45:55 +00:00
|
|
|
// Version has to match or defaults are used
|
2016-10-28 23:55:42 +00:00
|
|
|
if (strncmp(version, stored_ver, 3) != 0) {
|
2017-03-04 07:20:36 +00:00
|
|
|
if (stored_ver[0] != 'V') {
|
|
|
|
stored_ver[0] = '?';
|
|
|
|
stored_ver[1] = '\0';
|
|
|
|
}
|
2017-07-02 02:48:18 +00:00
|
|
|
#if ENABLED(EEPROM_CHITCHAT)
|
|
|
|
SERIAL_ECHO_START();
|
|
|
|
SERIAL_ECHOPGM("EEPROM version mismatch ");
|
|
|
|
SERIAL_ECHOPAIR("(EEPROM=", stored_ver);
|
|
|
|
SERIAL_ECHOLNPGM(" Marlin=" EEPROM_VERSION ")");
|
|
|
|
#endif
|
2018-01-05 01:51:18 +00:00
|
|
|
if (!validating) reset();
|
|
|
|
eeprom_error = true;
|
2016-06-30 01:12:23 +00:00
|
|
|
}
|
2016-10-28 23:55:42 +00:00
|
|
|
else {
|
|
|
|
float dummy = 0;
|
2018-01-03 03:00:06 +00:00
|
|
|
#if DISABLED(AUTO_BED_LEVELING_UBL) || DISABLED(FWRETRACT)
|
|
|
|
bool dummyb;
|
|
|
|
#endif
|
2015-01-28 09:08:48 +00:00
|
|
|
|
2017-12-11 03:39:07 +00:00
|
|
|
working_crc = 0; // Init to 0. Accumulated by EEPROM_READ
|
2016-10-28 23:55:42 +00:00
|
|
|
|
2016-12-09 11:45:55 +00:00
|
|
|
// Number of esteppers may change
|
|
|
|
uint8_t esteppers;
|
2018-01-05 01:51:18 +00:00
|
|
|
EEPROM_READ_ALWAYS(esteppers);
|
2016-12-09 11:45:55 +00:00
|
|
|
|
2017-11-04 20:34:24 +00:00
|
|
|
//
|
|
|
|
// Planner Motion
|
|
|
|
//
|
|
|
|
|
2016-12-09 11:45:55 +00:00
|
|
|
// Get only the number of E stepper parameters previously stored
|
|
|
|
// Any steppers added later are set to their defaults
|
|
|
|
const float def1[] = DEFAULT_AXIS_STEPS_PER_UNIT, def2[] = DEFAULT_MAX_FEEDRATE;
|
2016-12-16 04:04:18 +00:00
|
|
|
const uint32_t def3[] = DEFAULT_MAX_ACCELERATION;
|
2016-12-09 11:45:55 +00:00
|
|
|
float tmp1[XYZ + esteppers], tmp2[XYZ + esteppers];
|
2016-12-16 04:04:18 +00:00
|
|
|
uint32_t tmp3[XYZ + esteppers];
|
2016-12-09 11:45:55 +00:00
|
|
|
EEPROM_READ(tmp1);
|
|
|
|
EEPROM_READ(tmp2);
|
|
|
|
EEPROM_READ(tmp3);
|
2018-01-05 01:51:18 +00:00
|
|
|
if (!validating) LOOP_XYZE_N(i) {
|
2016-12-09 11:45:55 +00:00
|
|
|
planner.axis_steps_per_mm[i] = i < XYZ + esteppers ? tmp1[i] : def1[i < COUNT(def1) ? i : COUNT(def1) - 1];
|
|
|
|
planner.max_feedrate_mm_s[i] = i < XYZ + esteppers ? tmp2[i] : def2[i < COUNT(def2) ? i : COUNT(def2) - 1];
|
|
|
|
planner.max_acceleration_mm_per_s2[i] = i < XYZ + esteppers ? tmp3[i] : def3[i < COUNT(def3) ? i : COUNT(def3) - 1];
|
|
|
|
}
|
2016-10-28 23:55:42 +00:00
|
|
|
|
|
|
|
EEPROM_READ(planner.acceleration);
|
|
|
|
EEPROM_READ(planner.retract_acceleration);
|
|
|
|
EEPROM_READ(planner.travel_acceleration);
|
|
|
|
EEPROM_READ(planner.min_feedrate_mm_s);
|
|
|
|
EEPROM_READ(planner.min_travel_feedrate_mm_s);
|
2017-10-29 23:21:15 +00:00
|
|
|
EEPROM_READ(planner.min_segment_time_us);
|
2016-10-28 23:55:42 +00:00
|
|
|
EEPROM_READ(planner.max_jerk);
|
2017-03-05 00:01:33 +00:00
|
|
|
|
2017-11-04 20:34:24 +00:00
|
|
|
//
|
|
|
|
// Home Offset (M206)
|
|
|
|
//
|
|
|
|
|
2017-04-15 02:41:21 +00:00
|
|
|
#if !HAS_HOME_OFFSET
|
2017-03-05 00:01:33 +00:00
|
|
|
float home_offset[XYZ];
|
|
|
|
#endif
|
2016-10-28 23:55:42 +00:00
|
|
|
EEPROM_READ(home_offset);
|
|
|
|
|
2017-11-04 20:34:24 +00:00
|
|
|
//
|
|
|
|
// Hotend Offsets, if any
|
|
|
|
//
|
|
|
|
|
2016-10-28 23:55:42 +00:00
|
|
|
#if HOTENDS > 1
|
|
|
|
// Skip hotend 0 which must be 0
|
|
|
|
for (uint8_t e = 1; e < HOTENDS; e++)
|
|
|
|
LOOP_XYZ(i) EEPROM_READ(hotend_offset[i][e]);
|
|
|
|
#endif
|
|
|
|
|
2017-02-21 12:49:31 +00:00
|
|
|
//
|
2017-04-22 21:04:28 +00:00
|
|
|
// Global Leveling
|
2017-02-21 12:49:31 +00:00
|
|
|
//
|
|
|
|
|
|
|
|
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
|
2017-10-13 22:21:25 +00:00
|
|
|
EEPROM_READ(new_z_fade_height);
|
2017-02-21 12:49:31 +00:00
|
|
|
#else
|
|
|
|
EEPROM_READ(dummy);
|
|
|
|
#endif
|
|
|
|
|
2016-12-10 06:17:49 +00:00
|
|
|
//
|
|
|
|
// Mesh (Manual) Bed Leveling
|
|
|
|
//
|
|
|
|
|
2016-12-14 07:44:39 +00:00
|
|
|
bool leveling_is_on;
|
|
|
|
uint8_t mesh_num_x, mesh_num_y;
|
2018-01-05 01:51:18 +00:00
|
|
|
EEPROM_READ_ALWAYS(leveling_is_on);
|
2016-10-28 23:55:42 +00:00
|
|
|
EEPROM_READ(dummy);
|
2018-01-05 01:51:18 +00:00
|
|
|
EEPROM_READ_ALWAYS(mesh_num_x);
|
|
|
|
EEPROM_READ_ALWAYS(mesh_num_y);
|
2016-12-14 07:44:39 +00:00
|
|
|
|
2016-10-28 23:55:42 +00:00
|
|
|
#if ENABLED(MESH_BED_LEVELING)
|
2018-01-05 01:51:18 +00:00
|
|
|
if (!validating) {
|
|
|
|
mbl.has_mesh = leveling_is_on;
|
|
|
|
mbl.z_offset = dummy;
|
|
|
|
}
|
2017-04-06 03:29:44 +00:00
|
|
|
if (mesh_num_x == GRID_MAX_POINTS_X && mesh_num_y == GRID_MAX_POINTS_Y) {
|
2016-10-28 23:55:42 +00:00
|
|
|
// EEPROM data fits the current mesh
|
|
|
|
EEPROM_READ(mbl.z_values);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
// EEPROM data is stale
|
2018-01-05 01:51:18 +00:00
|
|
|
if (!validating) mbl.reset();
|
2016-12-10 06:17:49 +00:00
|
|
|
for (uint16_t q = mesh_num_x * mesh_num_y; q--;) EEPROM_READ(dummy);
|
2016-10-28 23:55:42 +00:00
|
|
|
}
|
|
|
|
#else
|
|
|
|
// MBL is disabled - skip the stored data
|
2016-12-10 06:17:49 +00:00
|
|
|
for (uint16_t q = mesh_num_x * mesh_num_y; q--;) EEPROM_READ(dummy);
|
2016-10-28 23:55:42 +00:00
|
|
|
#endif // MESH_BED_LEVELING
|
|
|
|
|
|
|
|
#if !HAS_BED_PROBE
|
2017-04-11 10:05:23 +00:00
|
|
|
float zprobe_zoffset;
|
2016-10-28 23:55:42 +00:00
|
|
|
#endif
|
|
|
|
EEPROM_READ(zprobe_zoffset);
|
|
|
|
|
2016-12-14 07:50:06 +00:00
|
|
|
//
|
|
|
|
// Planar Bed Leveling matrix
|
|
|
|
//
|
|
|
|
|
|
|
|
#if ABL_PLANAR
|
|
|
|
EEPROM_READ(planner.bed_level_matrix);
|
|
|
|
#else
|
|
|
|
for (uint8_t q = 9; q--;) EEPROM_READ(dummy);
|
|
|
|
#endif
|
|
|
|
|
2016-12-10 06:17:49 +00:00
|
|
|
//
|
|
|
|
// Bilinear Auto Bed Leveling
|
|
|
|
//
|
|
|
|
|
|
|
|
uint8_t grid_max_x, grid_max_y;
|
2018-01-05 01:51:18 +00:00
|
|
|
EEPROM_READ_ALWAYS(grid_max_x); // 1 byte
|
|
|
|
EEPROM_READ_ALWAYS(grid_max_y); // 1 byte
|
2016-12-10 06:17:49 +00:00
|
|
|
#if ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
2017-04-06 03:29:44 +00:00
|
|
|
if (grid_max_x == GRID_MAX_POINTS_X && grid_max_y == GRID_MAX_POINTS_Y) {
|
2018-01-05 01:51:18 +00:00
|
|
|
if (!validating) set_bed_leveling_enabled(false);
|
2016-12-10 06:17:49 +00:00
|
|
|
EEPROM_READ(bilinear_grid_spacing); // 2 ints
|
|
|
|
EEPROM_READ(bilinear_start); // 2 ints
|
2017-04-22 03:46:19 +00:00
|
|
|
EEPROM_READ(z_values); // 9 to 256 floats
|
2016-12-10 06:17:49 +00:00
|
|
|
}
|
|
|
|
else // EEPROM data is stale
|
|
|
|
#endif // AUTO_BED_LEVELING_BILINEAR
|
|
|
|
{
|
|
|
|
// Skip past disabled (or stale) Bilinear Grid data
|
|
|
|
int bgs[2], bs[2];
|
|
|
|
EEPROM_READ(bgs);
|
|
|
|
EEPROM_READ(bs);
|
|
|
|
for (uint16_t q = grid_max_x * grid_max_y; q--;) EEPROM_READ(dummy);
|
|
|
|
}
|
|
|
|
|
2017-11-04 20:34:24 +00:00
|
|
|
//
|
|
|
|
// Unified Bed Leveling active state
|
|
|
|
//
|
|
|
|
|
2017-04-22 21:04:28 +00:00
|
|
|
#if ENABLED(AUTO_BED_LEVELING_UBL)
|
2017-10-13 22:21:25 +00:00
|
|
|
EEPROM_READ(planner.leveling_active);
|
2017-10-14 02:56:27 +00:00
|
|
|
EEPROM_READ(ubl.storage_slot);
|
2017-04-22 21:04:28 +00:00
|
|
|
#else
|
|
|
|
uint8_t dummyui8;
|
|
|
|
EEPROM_READ(dummyb);
|
|
|
|
EEPROM_READ(dummyui8);
|
2017-05-09 17:35:43 +00:00
|
|
|
#endif // AUTO_BED_LEVELING_UBL
|
2017-04-22 21:04:28 +00:00
|
|
|
|
2017-11-04 20:34:24 +00:00
|
|
|
//
|
|
|
|
// DELTA Geometry or Dual Endstops offsets
|
|
|
|
//
|
|
|
|
|
2016-10-28 23:55:42 +00:00
|
|
|
#if ENABLED(DELTA)
|
2017-11-09 04:10:08 +00:00
|
|
|
EEPROM_READ(delta_height); // 1 float
|
2017-09-24 07:18:15 +00:00
|
|
|
EEPROM_READ(delta_endstop_adj); // 3 floats
|
2017-03-07 23:42:04 +00:00
|
|
|
EEPROM_READ(delta_radius); // 1 float
|
|
|
|
EEPROM_READ(delta_diagonal_rod); // 1 float
|
|
|
|
EEPROM_READ(delta_segments_per_second); // 1 float
|
2017-04-29 14:36:33 +00:00
|
|
|
EEPROM_READ(delta_calibration_radius); // 1 float
|
2017-09-24 07:18:15 +00:00
|
|
|
EEPROM_READ(delta_tower_angle_trim); // 3 floats
|
2017-10-29 08:43:44 +00:00
|
|
|
|
|
|
|
#elif ENABLED(X_DUAL_ENDSTOPS) || ENABLED(Y_DUAL_ENDSTOPS) || ENABLED(Z_DUAL_ENDSTOPS)
|
|
|
|
|
|
|
|
#if ENABLED(X_DUAL_ENDSTOPS)
|
|
|
|
EEPROM_READ(endstops.x_endstop_adj); // 1 float
|
|
|
|
#else
|
|
|
|
EEPROM_READ(dummy);
|
|
|
|
#endif
|
|
|
|
#if ENABLED(Y_DUAL_ENDSTOPS)
|
|
|
|
EEPROM_READ(endstops.y_endstop_adj); // 1 float
|
|
|
|
#else
|
|
|
|
EEPROM_READ(dummy);
|
|
|
|
#endif
|
|
|
|
#if ENABLED(Z_DUAL_ENDSTOPS)
|
|
|
|
EEPROM_READ(endstops.z_endstop_adj); // 1 float
|
|
|
|
#else
|
|
|
|
EEPROM_READ(dummy);
|
|
|
|
#endif
|
|
|
|
|
2017-12-03 01:04:58 +00:00
|
|
|
for (uint8_t q=8; q--;) EEPROM_READ(dummy);
|
2017-10-29 08:43:44 +00:00
|
|
|
|
2016-10-28 23:55:42 +00:00
|
|
|
#else
|
2017-10-29 08:43:44 +00:00
|
|
|
|
2017-12-03 01:04:58 +00:00
|
|
|
for (uint8_t q=11; q--;) EEPROM_READ(dummy);
|
2017-10-29 08:43:44 +00:00
|
|
|
|
2016-10-28 23:55:42 +00:00
|
|
|
#endif
|
|
|
|
|
2017-11-04 20:34:24 +00:00
|
|
|
//
|
|
|
|
// LCD Preheat settings
|
|
|
|
//
|
|
|
|
|
2016-10-28 23:55:42 +00:00
|
|
|
#if DISABLED(ULTIPANEL)
|
2016-10-27 07:40:37 +00:00
|
|
|
int lcd_preheat_hotend_temp[2], lcd_preheat_bed_temp[2], lcd_preheat_fan_speed[2];
|
2016-10-28 23:55:42 +00:00
|
|
|
#endif
|
2017-11-04 20:34:24 +00:00
|
|
|
EEPROM_READ(lcd_preheat_hotend_temp); // 2 floats
|
|
|
|
EEPROM_READ(lcd_preheat_bed_temp); // 2 floats
|
|
|
|
EEPROM_READ(lcd_preheat_fan_speed); // 2 floats
|
2016-10-28 23:55:42 +00:00
|
|
|
|
2017-04-10 02:47:49 +00:00
|
|
|
//EEPROM_ASSERT(
|
|
|
|
// WITHIN(lcd_preheat_fan_speed, 0, 255),
|
|
|
|
// "lcd_preheat_fan_speed out of range"
|
|
|
|
//);
|
|
|
|
|
2017-11-04 20:34:24 +00:00
|
|
|
//
|
|
|
|
// Hotend PID
|
|
|
|
//
|
|
|
|
|
2016-10-28 23:55:42 +00:00
|
|
|
#if ENABLED(PIDTEMP)
|
|
|
|
for (uint8_t e = 0; e < MAX_EXTRUDERS; e++) {
|
|
|
|
EEPROM_READ(dummy); // Kp
|
|
|
|
if (e < HOTENDS && dummy != DUMMY_PID_VALUE) {
|
|
|
|
// do not need to scale PID values as the values in EEPROM are already scaled
|
2018-01-05 01:51:18 +00:00
|
|
|
if (!validating) PID_PARAM(Kp, e) = dummy;
|
2016-10-28 23:55:42 +00:00
|
|
|
EEPROM_READ(PID_PARAM(Ki, e));
|
|
|
|
EEPROM_READ(PID_PARAM(Kd, e));
|
|
|
|
#if ENABLED(PID_EXTRUSION_SCALING)
|
|
|
|
EEPROM_READ(PID_PARAM(Kc, e));
|
|
|
|
#else
|
|
|
|
EEPROM_READ(dummy);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
for (uint8_t q=3; q--;) EEPROM_READ(dummy); // Ki, Kd, Kc
|
|
|
|
}
|
|
|
|
}
|
|
|
|
#else // !PIDTEMP
|
|
|
|
// 4 x 4 = 16 slots for PID parameters
|
|
|
|
for (uint8_t q = MAX_EXTRUDERS * 4; q--;) EEPROM_READ(dummy); // Kp, Ki, Kd, Kc
|
|
|
|
#endif // !PIDTEMP
|
|
|
|
|
2017-11-04 20:34:24 +00:00
|
|
|
//
|
|
|
|
// PID Extrusion Scaling
|
|
|
|
//
|
|
|
|
|
2016-10-28 23:55:42 +00:00
|
|
|
#if DISABLED(PID_EXTRUSION_SCALING)
|
|
|
|
int lpq_len;
|
|
|
|
#endif
|
|
|
|
EEPROM_READ(lpq_len);
|
|
|
|
|
2017-11-04 20:34:24 +00:00
|
|
|
//
|
|
|
|
// Heated Bed PID
|
|
|
|
//
|
|
|
|
|
2016-10-28 23:55:42 +00:00
|
|
|
#if ENABLED(PIDTEMPBED)
|
|
|
|
EEPROM_READ(dummy); // bedKp
|
|
|
|
if (dummy != DUMMY_PID_VALUE) {
|
2018-01-05 01:51:18 +00:00
|
|
|
if (!validating) thermalManager.bedKp = dummy;
|
2016-10-28 23:55:42 +00:00
|
|
|
EEPROM_READ(thermalManager.bedKi);
|
|
|
|
EEPROM_READ(thermalManager.bedKd);
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
for (uint8_t q=3; q--;) EEPROM_READ(dummy); // bedKp, bedKi, bedKd
|
|
|
|
#endif
|
|
|
|
|
2017-11-04 20:34:24 +00:00
|
|
|
//
|
|
|
|
// LCD Contrast
|
|
|
|
//
|
|
|
|
|
2016-10-28 23:55:42 +00:00
|
|
|
#if !HAS_LCD_CONTRAST
|
2017-05-21 00:54:23 +00:00
|
|
|
uint16_t lcd_contrast;
|
2016-10-28 23:55:42 +00:00
|
|
|
#endif
|
|
|
|
EEPROM_READ(lcd_contrast);
|
|
|
|
|
2017-11-04 20:34:24 +00:00
|
|
|
//
|
|
|
|
// Firmware Retraction
|
|
|
|
//
|
|
|
|
|
2016-10-28 23:55:42 +00:00
|
|
|
#if ENABLED(FWRETRACT)
|
2017-09-08 03:40:32 +00:00
|
|
|
EEPROM_READ(fwretract.autoretract_enabled);
|
|
|
|
EEPROM_READ(fwretract.retract_length);
|
|
|
|
EEPROM_READ(fwretract.retract_feedrate_mm_s);
|
|
|
|
EEPROM_READ(fwretract.retract_zlift);
|
|
|
|
EEPROM_READ(fwretract.retract_recover_length);
|
|
|
|
EEPROM_READ(fwretract.retract_recover_feedrate_mm_s);
|
|
|
|
EEPROM_READ(fwretract.swap_retract_length);
|
|
|
|
EEPROM_READ(fwretract.swap_retract_recover_length);
|
|
|
|
EEPROM_READ(fwretract.swap_retract_recover_feedrate_mm_s);
|
2017-07-18 03:01:41 +00:00
|
|
|
#else
|
|
|
|
EEPROM_READ(dummyb);
|
|
|
|
for (uint8_t q=8; q--;) EEPROM_READ(dummy);
|
|
|
|
#endif
|
2016-10-28 23:55:42 +00:00
|
|
|
|
2017-11-04 20:34:24 +00:00
|
|
|
//
|
|
|
|
// Volumetric & Filament Size
|
|
|
|
//
|
2017-12-20 01:44:11 +00:00
|
|
|
#if DISABLED(NO_VOLUMETRICS)
|
2016-10-28 23:55:42 +00:00
|
|
|
|
2017-12-20 01:44:11 +00:00
|
|
|
EEPROM_READ(parser.volumetric_enabled);
|
|
|
|
|
|
|
|
for (uint8_t q = 0; q < MAX_EXTRUDERS; q++) {
|
|
|
|
EEPROM_READ(dummy);
|
2018-01-05 01:51:18 +00:00
|
|
|
if (!validating && q < COUNT(planner.filament_size))
|
|
|
|
planner.filament_size[q] = dummy;
|
2017-12-20 01:44:11 +00:00
|
|
|
}
|
|
|
|
|
2018-01-05 02:23:24 +00:00
|
|
|
#else
|
|
|
|
|
|
|
|
EEPROM_READ(dummyb);
|
|
|
|
for (uint8_t q=MAX_EXTRUDERS; q--;) EEPROM_READ(dummy);
|
|
|
|
|
2017-12-20 01:44:11 +00:00
|
|
|
#endif
|
2016-10-28 23:55:42 +00:00
|
|
|
|
2017-11-04 20:34:24 +00:00
|
|
|
//
|
|
|
|
// TMC2130 Stepper Current
|
|
|
|
//
|
2017-12-15 21:03:14 +00:00
|
|
|
#if HAS_TRINAMIC
|
2018-01-05 01:51:18 +00:00
|
|
|
#define SET_CURR(N,Q) stepper##Q.setCurrent(val[N], R_SENSE, HOLD_MULTIPLIER)
|
|
|
|
uint16_t val[11];
|
2017-03-07 05:00:43 +00:00
|
|
|
EEPROM_READ(val);
|
2018-01-05 01:51:18 +00:00
|
|
|
if (!validating) {
|
|
|
|
#if X_IS_TRINAMIC
|
|
|
|
SET_CURR(0, X);
|
|
|
|
#endif
|
|
|
|
#if Y_IS_TRINAMIC
|
|
|
|
SET_CURR(1, Y);
|
|
|
|
#endif
|
|
|
|
#if Z_IS_TRINAMIC
|
|
|
|
SET_CURR(2, Z);
|
|
|
|
#endif
|
|
|
|
#if X2_IS_TRINAMIC
|
|
|
|
SET_CURR(3, X2);
|
|
|
|
#endif
|
|
|
|
#if Y2_IS_TRINAMIC
|
|
|
|
SET_CURR(4, Y2);
|
|
|
|
#endif
|
|
|
|
#if Z2_IS_TRINAMIC
|
|
|
|
SET_CURR(5, Z2);
|
|
|
|
#endif
|
|
|
|
#if E0_IS_TRINAMIC
|
|
|
|
SET_CURR(6, E0);
|
|
|
|
#endif
|
|
|
|
#if E1_IS_TRINAMIC
|
|
|
|
SET_CURR(7, E1);
|
|
|
|
#endif
|
|
|
|
#if E2_IS_TRINAMIC
|
|
|
|
SET_CURR(8, E2);
|
|
|
|
#endif
|
|
|
|
#if E3_IS_TRINAMIC
|
|
|
|
SET_CURR(9, E3);
|
|
|
|
#endif
|
|
|
|
#if E4_IS_TRINAMIC
|
|
|
|
SET_CURR(10, E4);
|
|
|
|
#endif
|
|
|
|
}
|
2017-03-07 05:00:43 +00:00
|
|
|
#else
|
2018-01-05 01:51:18 +00:00
|
|
|
uint16_t val;
|
|
|
|
for (uint8_t q=11; q--;) EEPROM_READ(val);
|
2017-03-07 05:00:43 +00:00
|
|
|
#endif
|
|
|
|
|
2017-12-15 21:03:14 +00:00
|
|
|
/*
|
|
|
|
* TMC2130 Sensorless homing threshold.
|
|
|
|
* X and X2 use the same value
|
|
|
|
* Y and Y2 use the same value
|
|
|
|
*/
|
|
|
|
int16_t thrs;
|
|
|
|
#if ENABLED(SENSORLESS_HOMING)
|
|
|
|
EEPROM_READ(thrs);
|
2018-01-05 01:51:18 +00:00
|
|
|
if (!validating) {
|
|
|
|
#if ENABLED(X_IS_TMC2130)
|
|
|
|
stepperX.sgt(thrs);
|
|
|
|
#endif
|
|
|
|
#if ENABLED(X2_IS_TMC2130)
|
|
|
|
stepperX2.sgt(thrs);
|
|
|
|
#endif
|
|
|
|
}
|
2017-12-15 21:03:14 +00:00
|
|
|
EEPROM_READ(thrs);
|
2018-01-05 01:51:18 +00:00
|
|
|
if (!validating) {
|
|
|
|
#if ENABLED(Y_IS_TMC2130)
|
|
|
|
stepperY.sgt(thrs);
|
|
|
|
#endif
|
|
|
|
#if ENABLED(Y2_IS_TMC2130)
|
|
|
|
stepperY2.sgt(thrs);
|
|
|
|
#endif
|
|
|
|
}
|
2017-12-15 21:03:14 +00:00
|
|
|
#else
|
|
|
|
for (uint8_t q = 0; q < 2; q++) EEPROM_READ(thrs);
|
|
|
|
#endif
|
|
|
|
|
2017-04-16 03:18:10 +00:00
|
|
|
//
|
|
|
|
// Linear Advance
|
|
|
|
//
|
|
|
|
|
|
|
|
#if ENABLED(LIN_ADVANCE)
|
2017-04-22 03:30:36 +00:00
|
|
|
EEPROM_READ(planner.extruder_advance_k);
|
|
|
|
EEPROM_READ(planner.advance_ed_ratio);
|
|
|
|
#else
|
|
|
|
EEPROM_READ(dummy);
|
|
|
|
EEPROM_READ(dummy);
|
2017-04-16 03:18:10 +00:00
|
|
|
#endif
|
|
|
|
|
2017-11-04 20:34:24 +00:00
|
|
|
//
|
|
|
|
// Motor Current PWM
|
|
|
|
//
|
|
|
|
|
2017-06-03 05:38:07 +00:00
|
|
|
#if HAS_MOTOR_CURRENT_PWM
|
|
|
|
for (uint8_t q = 3; q--;) EEPROM_READ(stepper.motor_current_setting[q]);
|
|
|
|
#else
|
|
|
|
uint32_t dummyui32;
|
|
|
|
for (uint8_t q = 3; q--;) EEPROM_READ(dummyui32);
|
|
|
|
#endif
|
|
|
|
|
2017-11-04 21:36:41 +00:00
|
|
|
//
|
|
|
|
// CNC Coordinate System
|
|
|
|
//
|
|
|
|
|
|
|
|
#if ENABLED(CNC_COORDINATE_SYSTEMS)
|
2018-01-05 01:51:18 +00:00
|
|
|
if (!validating) (void)gcode.select_coordinate_system(-1); // Go back to machine space
|
2017-11-04 21:36:41 +00:00
|
|
|
EEPROM_READ(gcode.coordinate_system); // 27 floats
|
|
|
|
#else
|
|
|
|
for (uint8_t q = 27; q--;) EEPROM_READ(dummy);
|
|
|
|
#endif
|
|
|
|
|
2017-12-01 22:42:23 +00:00
|
|
|
//
|
|
|
|
// Skew correction factors
|
|
|
|
//
|
|
|
|
|
|
|
|
#if ENABLED(SKEW_CORRECTION_GCODE)
|
|
|
|
EEPROM_READ(planner.xy_skew_factor);
|
|
|
|
#if ENABLED(SKEW_CORRECTION_FOR_Z)
|
|
|
|
EEPROM_READ(planner.xz_skew_factor);
|
|
|
|
EEPROM_READ(planner.yz_skew_factor);
|
|
|
|
#else
|
|
|
|
EEPROM_READ(dummy);
|
|
|
|
EEPROM_READ(dummy);
|
|
|
|
#endif
|
|
|
|
#else
|
|
|
|
for (uint8_t q = 3; q--;) EEPROM_READ(dummy);
|
|
|
|
#endif
|
|
|
|
|
2018-01-04 11:06:34 +00:00
|
|
|
//
|
|
|
|
// Advanced Pause filament load & unload lengths
|
|
|
|
//
|
|
|
|
|
|
|
|
#if ENABLED(ADVANCED_PAUSE_FEATURE)
|
|
|
|
for (uint8_t q = 0; q < MAX_EXTRUDERS; q++) {
|
|
|
|
EEPROM_READ(dummy);
|
2018-01-05 01:51:18 +00:00
|
|
|
if (!validating && q < COUNT(filament_change_unload_length)) filament_change_unload_length[q] = dummy;
|
2018-01-04 11:06:34 +00:00
|
|
|
}
|
|
|
|
for (uint8_t q = 0; q < MAX_EXTRUDERS; q++) {
|
|
|
|
EEPROM_READ(dummy);
|
2018-01-05 01:51:18 +00:00
|
|
|
if (!validating && q < COUNT(filament_change_load_length)) filament_change_load_length[q] = dummy;
|
2018-01-04 11:06:34 +00:00
|
|
|
}
|
|
|
|
#else
|
|
|
|
for (uint8_t q = MAX_EXTRUDERS * 2; q--;) EEPROM_READ(dummy);
|
|
|
|
#endif
|
|
|
|
|
2017-05-07 01:00:56 +00:00
|
|
|
if (working_crc == stored_crc) {
|
2018-01-05 01:51:18 +00:00
|
|
|
if (!validating) {
|
|
|
|
postprocess();
|
|
|
|
#if ENABLED(EEPROM_CHITCHAT)
|
|
|
|
SERIAL_ECHO_START();
|
|
|
|
SERIAL_ECHO(version);
|
|
|
|
SERIAL_ECHOPAIR(" stored settings retrieved (", eeprom_index - (EEPROM_OFFSET));
|
|
|
|
SERIAL_ECHOPAIR(" bytes; crc ", (uint32_t)working_crc);
|
|
|
|
SERIAL_ECHOLNPGM(")");
|
|
|
|
#endif
|
|
|
|
}
|
2016-10-28 23:55:42 +00:00
|
|
|
}
|
|
|
|
else {
|
2017-07-02 02:48:18 +00:00
|
|
|
#if ENABLED(EEPROM_CHITCHAT)
|
|
|
|
SERIAL_ERROR_START();
|
|
|
|
SERIAL_ERRORPGM("EEPROM CRC mismatch - (stored) ");
|
|
|
|
SERIAL_ERROR(stored_crc);
|
|
|
|
SERIAL_ERRORPGM(" != ");
|
|
|
|
SERIAL_ERROR(working_crc);
|
|
|
|
SERIAL_ERRORLNPGM(" (calculated)!");
|
|
|
|
#endif
|
2017-04-10 02:47:49 +00:00
|
|
|
reset();
|
2016-10-28 23:55:42 +00:00
|
|
|
}
|
|
|
|
|
2017-03-18 15:15:54 +00:00
|
|
|
#if ENABLED(AUTO_BED_LEVELING_UBL)
|
2017-05-16 07:34:36 +00:00
|
|
|
meshes_begin = (eeprom_index + 32) & 0xFFF8; // Pad the end of configuration data so it
|
|
|
|
// can float up or down a little bit without
|
|
|
|
// disrupting the mesh data
|
|
|
|
ubl.report_state();
|
2017-03-18 15:15:54 +00:00
|
|
|
|
2018-01-05 01:51:18 +00:00
|
|
|
if (!validating) {
|
|
|
|
if (!ubl.sanity_check()) {
|
|
|
|
SERIAL_EOL();
|
|
|
|
#if ENABLED(EEPROM_CHITCHAT)
|
|
|
|
ubl.echo_name();
|
|
|
|
SERIAL_ECHOLNPGM(" initialized.\n");
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
eeprom_error = true;
|
|
|
|
#if ENABLED(EEPROM_CHITCHAT)
|
|
|
|
SERIAL_PROTOCOLPGM("?Can't enable ");
|
|
|
|
ubl.echo_name();
|
|
|
|
SERIAL_PROTOCOLLNPGM(".");
|
|
|
|
#endif
|
|
|
|
ubl.reset();
|
|
|
|
}
|
2017-03-18 15:15:54 +00:00
|
|
|
|
2018-01-05 01:51:18 +00:00
|
|
|
if (ubl.storage_slot >= 0) {
|
|
|
|
load_mesh(ubl.storage_slot);
|
|
|
|
#if ENABLED(EEPROM_CHITCHAT)
|
|
|
|
SERIAL_ECHOPAIR("Mesh ", ubl.storage_slot);
|
|
|
|
SERIAL_ECHOLNPGM(" loaded from storage.");
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
ubl.reset();
|
|
|
|
#if ENABLED(EEPROM_CHITCHAT)
|
|
|
|
SERIAL_ECHOLNPGM("UBL System reset()");
|
|
|
|
#endif
|
|
|
|
}
|
2017-03-18 15:15:54 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
2017-04-22 21:04:28 +00:00
|
|
|
|
2017-07-02 02:30:46 +00:00
|
|
|
#if ENABLED(EEPROM_CHITCHAT) && DISABLED(DISABLE_M503)
|
2018-01-05 01:51:18 +00:00
|
|
|
if (!validating) report();
|
2016-10-28 23:55:42 +00:00
|
|
|
#endif
|
2017-06-17 23:36:10 +00:00
|
|
|
EEPROM_FINISH();
|
2017-03-20 11:10:31 +00:00
|
|
|
|
2017-05-07 01:00:56 +00:00
|
|
|
return !eeprom_error;
|
2016-10-28 23:55:42 +00:00
|
|
|
}
|
2015-01-28 09:08:48 +00:00
|
|
|
|
2018-01-05 01:51:18 +00:00
|
|
|
bool MarlinSettings::validate() {
|
|
|
|
validating = true;
|
|
|
|
const bool success = _load();
|
|
|
|
validating = false;
|
|
|
|
return success;
|
|
|
|
}
|
|
|
|
|
|
|
|
bool MarlinSettings::load() {
|
|
|
|
if (validate()) return _load();
|
|
|
|
reset();
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2017-05-07 01:00:56 +00:00
|
|
|
#if ENABLED(AUTO_BED_LEVELING_UBL)
|
|
|
|
|
2017-07-02 02:48:18 +00:00
|
|
|
#if ENABLED(EEPROM_CHITCHAT)
|
|
|
|
void ubl_invalid_slot(const int s) {
|
|
|
|
SERIAL_PROTOCOLLNPGM("?Invalid slot.");
|
|
|
|
SERIAL_PROTOCOL(s);
|
|
|
|
SERIAL_PROTOCOLLNPGM(" mesh slots available.");
|
|
|
|
}
|
|
|
|
#endif
|
2017-05-16 07:34:36 +00:00
|
|
|
|
2017-12-25 09:32:31 +00:00
|
|
|
uint16_t MarlinSettings::calc_num_meshes() {
|
2017-05-07 01:00:56 +00:00
|
|
|
//obviously this will get more sophisticated once we've added an actual MAT
|
|
|
|
|
|
|
|
if (meshes_begin <= 0) return 0;
|
|
|
|
|
|
|
|
return (meshes_end - meshes_begin) / sizeof(ubl.z_values);
|
|
|
|
}
|
|
|
|
|
2017-12-25 09:32:31 +00:00
|
|
|
void MarlinSettings::store_mesh(const int8_t slot) {
|
2017-05-07 01:00:56 +00:00
|
|
|
|
|
|
|
#if ENABLED(AUTO_BED_LEVELING_UBL)
|
2017-12-25 09:32:31 +00:00
|
|
|
const int16_t a = calc_num_meshes();
|
2017-05-07 01:00:56 +00:00
|
|
|
if (!WITHIN(slot, 0, a - 1)) {
|
2017-07-02 02:48:18 +00:00
|
|
|
#if ENABLED(EEPROM_CHITCHAT)
|
|
|
|
ubl_invalid_slot(a);
|
|
|
|
SERIAL_PROTOCOLPAIR("E2END=", E2END);
|
|
|
|
SERIAL_PROTOCOLPAIR(" meshes_end=", meshes_end);
|
|
|
|
SERIAL_PROTOCOLLNPAIR(" slot=", slot);
|
|
|
|
SERIAL_EOL();
|
|
|
|
#endif
|
2017-05-07 01:00:56 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
uint16_t crc = 0;
|
|
|
|
int pos = meshes_end - (slot + 1) * sizeof(ubl.z_values);
|
|
|
|
|
2017-10-18 19:00:29 +00:00
|
|
|
HAL::PersistentStore::access_start();
|
2017-12-25 09:32:31 +00:00
|
|
|
const bool status = HAL::PersistentStore::write_data(pos, (uint8_t *)&ubl.z_values, sizeof(ubl.z_values), &crc);
|
2017-10-18 19:00:29 +00:00
|
|
|
HAL::PersistentStore::access_finish();
|
|
|
|
|
|
|
|
if (status)
|
|
|
|
SERIAL_PROTOCOL("?Unable to save mesh data.\n");
|
2017-05-07 01:00:56 +00:00
|
|
|
|
|
|
|
// Write crc to MAT along with other data, or just tack on to the beginning or end
|
|
|
|
|
2017-07-02 02:48:18 +00:00
|
|
|
#if ENABLED(EEPROM_CHITCHAT)
|
2017-10-18 19:00:29 +00:00
|
|
|
if (!status)
|
|
|
|
SERIAL_PROTOCOLLNPAIR("Mesh saved in slot ", slot);
|
2017-07-02 02:48:18 +00:00
|
|
|
#endif
|
2017-05-07 01:00:56 +00:00
|
|
|
|
|
|
|
#else
|
|
|
|
|
|
|
|
// Other mesh types
|
|
|
|
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2017-12-25 09:32:31 +00:00
|
|
|
void MarlinSettings::load_mesh(const int8_t slot, void * const into/*=NULL*/) {
|
2017-05-07 01:00:56 +00:00
|
|
|
|
|
|
|
#if ENABLED(AUTO_BED_LEVELING_UBL)
|
|
|
|
|
|
|
|
const int16_t a = settings.calc_num_meshes();
|
|
|
|
|
|
|
|
if (!WITHIN(slot, 0, a - 1)) {
|
2017-07-02 02:48:18 +00:00
|
|
|
#if ENABLED(EEPROM_CHITCHAT)
|
|
|
|
ubl_invalid_slot(a);
|
|
|
|
#endif
|
2017-05-07 01:00:56 +00:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
|
|
|
uint16_t crc = 0;
|
|
|
|
int pos = meshes_end - (slot + 1) * sizeof(ubl.z_values);
|
|
|
|
uint8_t * const dest = into ? (uint8_t*)into : (uint8_t*)&ubl.z_values;
|
2017-10-18 19:00:29 +00:00
|
|
|
|
|
|
|
HAL::PersistentStore::access_start();
|
2017-12-25 09:32:31 +00:00
|
|
|
const uint16_t status = HAL::PersistentStore::read_data(pos, dest, sizeof(ubl.z_values), &crc);
|
2017-10-18 19:00:29 +00:00
|
|
|
HAL::PersistentStore::access_finish();
|
2017-05-07 01:00:56 +00:00
|
|
|
|
2017-10-18 19:00:29 +00:00
|
|
|
if (status)
|
|
|
|
SERIAL_PROTOCOL("?Unable to load mesh data.\n");
|
2017-05-07 01:00:56 +00:00
|
|
|
|
2017-07-02 02:48:18 +00:00
|
|
|
#if ENABLED(EEPROM_CHITCHAT)
|
2017-10-18 19:00:29 +00:00
|
|
|
else
|
|
|
|
SERIAL_PROTOCOLLNPAIR("Mesh loaded from slot ", slot);
|
2017-07-02 02:48:18 +00:00
|
|
|
#endif
|
2017-10-18 19:00:29 +00:00
|
|
|
EEPROM_FINISH();
|
2017-05-07 01:00:56 +00:00
|
|
|
|
|
|
|
#else
|
|
|
|
|
|
|
|
// Other mesh types
|
|
|
|
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
//void MarlinSettings::delete_mesh() { return; }
|
|
|
|
//void MarlinSettings::defrag_meshes() { return; }
|
|
|
|
|
|
|
|
#endif // AUTO_BED_LEVELING_UBL
|
|
|
|
|
2016-10-28 23:53:48 +00:00
|
|
|
#else // !EEPROM_SETTINGS
|
|
|
|
|
2017-04-10 02:47:49 +00:00
|
|
|
bool MarlinSettings::save() {
|
2017-06-09 15:51:23 +00:00
|
|
|
SERIAL_ERROR_START();
|
2016-10-28 23:53:48 +00:00
|
|
|
SERIAL_ERRORLNPGM("EEPROM disabled");
|
2017-03-20 11:10:31 +00:00
|
|
|
return false;
|
2016-10-28 23:53:48 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
#endif // !EEPROM_SETTINGS
|
2015-01-28 09:08:48 +00:00
|
|
|
|
2015-04-27 01:44:01 +00:00
|
|
|
/**
|
2016-06-30 01:18:46 +00:00
|
|
|
* M502 - Reset Configuration
|
2015-04-27 01:44:01 +00:00
|
|
|
*/
|
2017-04-10 02:47:49 +00:00
|
|
|
void MarlinSettings::reset() {
|
2017-06-06 09:03:01 +00:00
|
|
|
static const float tmp1[] PROGMEM = DEFAULT_AXIS_STEPS_PER_UNIT, tmp2[] PROGMEM = DEFAULT_MAX_FEEDRATE;
|
|
|
|
static const uint32_t tmp3[] PROGMEM = DEFAULT_MAX_ACCELERATION;
|
2016-12-04 04:02:27 +00:00
|
|
|
LOOP_XYZE_N(i) {
|
2017-06-06 09:03:01 +00:00
|
|
|
planner.axis_steps_per_mm[i] = pgm_read_float(&tmp1[i < COUNT(tmp1) ? i : COUNT(tmp1) - 1]);
|
|
|
|
planner.max_feedrate_mm_s[i] = pgm_read_float(&tmp2[i < COUNT(tmp2) ? i : COUNT(tmp2) - 1]);
|
2017-06-08 21:15:02 +00:00
|
|
|
planner.max_acceleration_mm_per_s2[i] = pgm_read_dword_near(&tmp3[i < COUNT(tmp3) ? i : COUNT(tmp3) - 1]);
|
2015-01-28 09:08:48 +00:00
|
|
|
}
|
|
|
|
|
2016-04-28 01:06:32 +00:00
|
|
|
planner.acceleration = DEFAULT_ACCELERATION;
|
|
|
|
planner.retract_acceleration = DEFAULT_RETRACT_ACCELERATION;
|
|
|
|
planner.travel_acceleration = DEFAULT_TRAVEL_ACCELERATION;
|
2016-07-16 01:49:34 +00:00
|
|
|
planner.min_feedrate_mm_s = DEFAULT_MINIMUMFEEDRATE;
|
|
|
|
planner.min_travel_feedrate_mm_s = DEFAULT_MINTRAVELFEEDRATE;
|
2017-12-25 09:32:31 +00:00
|
|
|
planner.min_segment_time_us = DEFAULT_MINSEGMENTTIME;
|
2016-10-02 09:37:13 +00:00
|
|
|
planner.max_jerk[X_AXIS] = DEFAULT_XJERK;
|
|
|
|
planner.max_jerk[Y_AXIS] = DEFAULT_YJERK;
|
|
|
|
planner.max_jerk[Z_AXIS] = DEFAULT_ZJERK;
|
|
|
|
planner.max_jerk[E_AXIS] = DEFAULT_EJERK;
|
2017-02-21 12:49:31 +00:00
|
|
|
|
2017-04-15 02:41:21 +00:00
|
|
|
#if HAS_HOME_OFFSET
|
2017-03-05 00:01:33 +00:00
|
|
|
ZERO(home_offset);
|
|
|
|
#endif
|
2015-01-28 09:08:48 +00:00
|
|
|
|
2016-10-28 23:39:23 +00:00
|
|
|
#if HOTENDS > 1
|
|
|
|
constexpr float tmp4[XYZ][HOTENDS] = {
|
|
|
|
HOTEND_OFFSET_X,
|
|
|
|
HOTEND_OFFSET_Y
|
|
|
|
#ifdef HOTEND_OFFSET_Z
|
|
|
|
, HOTEND_OFFSET_Z
|
|
|
|
#else
|
|
|
|
, { 0 }
|
|
|
|
#endif
|
|
|
|
};
|
|
|
|
static_assert(
|
|
|
|
tmp4[X_AXIS][0] == 0 && tmp4[Y_AXIS][0] == 0 && tmp4[Z_AXIS][0] == 0,
|
|
|
|
"Offsets for the first hotend must be 0.0."
|
|
|
|
);
|
|
|
|
LOOP_XYZ(i) HOTEND_LOOP() hotend_offset[i][e] = tmp4[i][e];
|
|
|
|
#endif
|
|
|
|
|
2017-12-25 09:32:31 +00:00
|
|
|
//
|
|
|
|
// Global Leveling
|
|
|
|
//
|
|
|
|
|
|
|
|
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
|
|
|
|
new_z_fade_height = 0.0;
|
|
|
|
#endif
|
|
|
|
|
2017-05-01 21:13:09 +00:00
|
|
|
#if HAS_LEVELING
|
2016-12-10 06:17:49 +00:00
|
|
|
reset_bed_level();
|
2015-03-26 06:06:33 +00:00
|
|
|
#endif
|
|
|
|
|
2016-06-15 01:05:20 +00:00
|
|
|
#if HAS_BED_PROBE
|
2015-05-27 00:47:04 +00:00
|
|
|
zprobe_zoffset = Z_PROBE_OFFSET_FROM_EXTRUDER;
|
2015-03-26 06:06:33 +00:00
|
|
|
#endif
|
2015-03-15 22:18:11 +00:00
|
|
|
|
2015-07-31 05:31:45 +00:00
|
|
|
#if ENABLED(DELTA)
|
2017-03-07 23:42:04 +00:00
|
|
|
const float adj[ABC] = DELTA_ENDSTOP_ADJ,
|
2017-04-29 14:36:33 +00:00
|
|
|
dta[ABC] = DELTA_TOWER_ANGLE_TRIM;
|
2017-11-09 04:10:08 +00:00
|
|
|
delta_height = DELTA_HEIGHT;
|
2017-09-08 20:35:25 +00:00
|
|
|
COPY(delta_endstop_adj, adj);
|
2016-12-10 06:17:49 +00:00
|
|
|
delta_radius = DELTA_RADIUS;
|
|
|
|
delta_diagonal_rod = DELTA_DIAGONAL_ROD;
|
|
|
|
delta_segments_per_second = DELTA_SEGMENTS_PER_SECOND;
|
2017-04-18 12:43:25 +00:00
|
|
|
delta_calibration_radius = DELTA_CALIBRATION_RADIUS;
|
2017-09-24 07:18:15 +00:00
|
|
|
COPY(delta_tower_angle_trim, dta);
|
2017-04-15 02:41:21 +00:00
|
|
|
|
2017-10-29 08:43:44 +00:00
|
|
|
#elif ENABLED(X_DUAL_ENDSTOPS) || ENABLED(Y_DUAL_ENDSTOPS) || ENABLED(Z_DUAL_ENDSTOPS)
|
2017-04-15 02:41:21 +00:00
|
|
|
|
2017-10-29 08:43:44 +00:00
|
|
|
#if ENABLED(X_DUAL_ENDSTOPS)
|
|
|
|
endstops.x_endstop_adj = (
|
|
|
|
#ifdef X_DUAL_ENDSTOPS_ADJUSTMENT
|
|
|
|
X_DUAL_ENDSTOPS_ADJUSTMENT
|
|
|
|
#else
|
|
|
|
0
|
|
|
|
#endif
|
|
|
|
);
|
|
|
|
#endif
|
|
|
|
#if ENABLED(Y_DUAL_ENDSTOPS)
|
|
|
|
endstops.y_endstop_adj = (
|
|
|
|
#ifdef Y_DUAL_ENDSTOPS_ADJUSTMENT
|
|
|
|
Y_DUAL_ENDSTOPS_ADJUSTMENT
|
|
|
|
#else
|
|
|
|
0
|
|
|
|
#endif
|
|
|
|
);
|
|
|
|
#endif
|
|
|
|
#if ENABLED(Z_DUAL_ENDSTOPS)
|
|
|
|
endstops.z_endstop_adj = (
|
|
|
|
#ifdef Z_DUAL_ENDSTOPS_ADJUSTMENT
|
|
|
|
Z_DUAL_ENDSTOPS_ADJUSTMENT
|
|
|
|
#else
|
|
|
|
0
|
|
|
|
#endif
|
|
|
|
);
|
|
|
|
#endif
|
2017-04-15 02:41:21 +00:00
|
|
|
|
2015-01-28 09:08:48 +00:00
|
|
|
#endif
|
|
|
|
|
2015-07-31 05:31:45 +00:00
|
|
|
#if ENABLED(ULTIPANEL)
|
2016-10-27 07:40:37 +00:00
|
|
|
lcd_preheat_hotend_temp[0] = PREHEAT_1_TEMP_HOTEND;
|
|
|
|
lcd_preheat_hotend_temp[1] = PREHEAT_2_TEMP_HOTEND;
|
|
|
|
lcd_preheat_bed_temp[0] = PREHEAT_1_TEMP_BED;
|
|
|
|
lcd_preheat_bed_temp[1] = PREHEAT_2_TEMP_BED;
|
|
|
|
lcd_preheat_fan_speed[0] = PREHEAT_1_FAN_SPEED;
|
|
|
|
lcd_preheat_fan_speed[1] = PREHEAT_2_FAN_SPEED;
|
2015-01-28 09:08:48 +00:00
|
|
|
#endif
|
|
|
|
|
2015-07-31 05:31:45 +00:00
|
|
|
#if ENABLED(PIDTEMP)
|
2016-07-13 13:11:23 +00:00
|
|
|
#if ENABLED(PID_PARAMS_PER_HOTEND) && HOTENDS > 1
|
2016-07-11 18:48:15 +00:00
|
|
|
HOTEND_LOOP()
|
2015-01-28 09:08:48 +00:00
|
|
|
#endif
|
|
|
|
{
|
|
|
|
PID_PARAM(Kp, e) = DEFAULT_Kp;
|
|
|
|
PID_PARAM(Ki, e) = scalePID_i(DEFAULT_Ki);
|
|
|
|
PID_PARAM(Kd, e) = scalePID_d(DEFAULT_Kd);
|
2016-08-01 00:49:34 +00:00
|
|
|
#if ENABLED(PID_EXTRUSION_SCALING)
|
2015-01-28 09:08:48 +00:00
|
|
|
PID_PARAM(Kc, e) = DEFAULT_Kc;
|
|
|
|
#endif
|
|
|
|
}
|
2016-08-01 00:49:34 +00:00
|
|
|
#if ENABLED(PID_EXTRUSION_SCALING)
|
2015-08-31 02:04:30 +00:00
|
|
|
lpq_len = 20; // default last-position-queue size
|
|
|
|
#endif
|
2015-01-28 09:08:48 +00:00
|
|
|
#endif // PIDTEMP
|
|
|
|
|
2015-07-31 05:31:45 +00:00
|
|
|
#if ENABLED(PIDTEMPBED)
|
2016-04-29 01:18:13 +00:00
|
|
|
thermalManager.bedKp = DEFAULT_bedKp;
|
|
|
|
thermalManager.bedKi = scalePID_i(DEFAULT_bedKi);
|
|
|
|
thermalManager.bedKd = scalePID_d(DEFAULT_bedKd);
|
2015-04-03 23:38:05 +00:00
|
|
|
#endif
|
|
|
|
|
2017-12-25 09:32:31 +00:00
|
|
|
#if HAS_LCD_CONTRAST
|
|
|
|
lcd_contrast = DEFAULT_LCD_CONTRAST;
|
|
|
|
#endif
|
|
|
|
|
2015-07-31 05:31:45 +00:00
|
|
|
#if ENABLED(FWRETRACT)
|
2017-09-08 03:40:32 +00:00
|
|
|
fwretract.reset();
|
|
|
|
#endif
|
2015-01-28 09:08:48 +00:00
|
|
|
|
2017-12-20 01:44:11 +00:00
|
|
|
#if DISABLED(NO_VOLUMETRICS)
|
|
|
|
|
|
|
|
parser.volumetric_enabled =
|
|
|
|
#if ENABLED(VOLUMETRIC_DEFAULT_ON)
|
|
|
|
true
|
|
|
|
#else
|
|
|
|
false
|
|
|
|
#endif
|
|
|
|
;
|
|
|
|
for (uint8_t q = 0; q < COUNT(planner.filament_size); q++)
|
|
|
|
planner.filament_size[q] = DEFAULT_NOMINAL_FILAMENT_DIA;
|
|
|
|
|
|
|
|
#endif
|
2016-06-30 01:19:26 +00:00
|
|
|
|
2016-07-14 23:12:20 +00:00
|
|
|
endstops.enable_globally(
|
|
|
|
#if ENABLED(ENDSTOPS_ALWAYS_ON_DEFAULT)
|
2017-06-06 09:03:01 +00:00
|
|
|
true
|
2016-07-14 23:12:20 +00:00
|
|
|
#else
|
2017-06-06 09:03:01 +00:00
|
|
|
false
|
2016-07-14 23:12:20 +00:00
|
|
|
#endif
|
|
|
|
);
|
|
|
|
|
2017-12-15 21:03:14 +00:00
|
|
|
#if X_IS_TRINAMIC
|
|
|
|
stepperX.setCurrent(X_CURRENT, R_SENSE, HOLD_MULTIPLIER);
|
|
|
|
#endif
|
|
|
|
#if Y_IS_TRINAMIC
|
|
|
|
stepperY.setCurrent(Y_CURRENT, R_SENSE, HOLD_MULTIPLIER);
|
|
|
|
#endif
|
|
|
|
#if Z_IS_TRINAMIC
|
|
|
|
stepperZ.setCurrent(Z_CURRENT, R_SENSE, HOLD_MULTIPLIER);
|
|
|
|
#endif
|
|
|
|
#if X2_IS_TRINAMIC
|
|
|
|
stepperX2.setCurrent(X2_CURRENT, R_SENSE, HOLD_MULTIPLIER);
|
|
|
|
#endif
|
|
|
|
#if Y2_IS_TRINAMIC
|
|
|
|
stepperY2.setCurrent(Y2_CURRENT, R_SENSE, HOLD_MULTIPLIER);
|
|
|
|
#endif
|
|
|
|
#if Z2_IS_TRINAMIC
|
|
|
|
stepperZ2.setCurrent(Z2_CURRENT, R_SENSE, HOLD_MULTIPLIER);
|
|
|
|
#endif
|
|
|
|
#if E0_IS_TRINAMIC
|
|
|
|
stepperE0.setCurrent(E0_CURRENT, R_SENSE, HOLD_MULTIPLIER);
|
|
|
|
#endif
|
|
|
|
#if E1_IS_TRINAMIC
|
|
|
|
stepperE1.setCurrent(E1_CURRENT, R_SENSE, HOLD_MULTIPLIER);
|
|
|
|
#endif
|
|
|
|
#if E2_IS_TRINAMIC
|
|
|
|
stepperE2.setCurrent(E2_CURRENT, R_SENSE, HOLD_MULTIPLIER);
|
|
|
|
#endif
|
|
|
|
#if E3_IS_TRINAMIC
|
|
|
|
stepperE3.setCurrent(E3_CURRENT, R_SENSE, HOLD_MULTIPLIER);
|
|
|
|
#endif
|
|
|
|
#if E4_IS_TRINAMIC
|
|
|
|
stepperE4.setCurrent(E4_CURRENT, R_SENSE, HOLD_MULTIPLIER);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if ENABLED(SENSORLESS_HOMING)
|
2017-03-07 05:00:43 +00:00
|
|
|
#if ENABLED(X_IS_TMC2130)
|
2017-12-15 21:03:14 +00:00
|
|
|
stepperX.sgt(X_HOMING_SENSITIVITY);
|
2017-03-07 05:00:43 +00:00
|
|
|
#endif
|
|
|
|
#if ENABLED(X2_IS_TMC2130)
|
2017-12-15 21:03:14 +00:00
|
|
|
stepperX2.sgt(X_HOMING_SENSITIVITY);
|
2017-03-07 05:00:43 +00:00
|
|
|
#endif
|
2017-12-15 21:03:14 +00:00
|
|
|
#if ENABLED(Y_IS_TMC2130)
|
|
|
|
stepperY.sgt(Y_HOMING_SENSITIVITY);
|
2017-03-07 05:00:43 +00:00
|
|
|
#endif
|
2017-12-15 21:03:14 +00:00
|
|
|
#if ENABLED(Y2_IS_TMC2130)
|
|
|
|
stepperY2.sgt(Y_HOMING_SENSITIVITY);
|
2017-03-07 05:00:43 +00:00
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
2017-04-16 03:18:10 +00:00
|
|
|
#if ENABLED(LIN_ADVANCE)
|
2017-04-22 03:30:36 +00:00
|
|
|
planner.extruder_advance_k = LIN_ADVANCE_K;
|
|
|
|
planner.advance_ed_ratio = LIN_ADVANCE_E_D_RATIO;
|
2017-04-16 03:18:10 +00:00
|
|
|
#endif
|
|
|
|
|
2017-06-03 05:38:07 +00:00
|
|
|
#if HAS_MOTOR_CURRENT_PWM
|
|
|
|
uint32_t tmp_motor_current_setting[3] = PWM_MOTOR_CURRENT;
|
|
|
|
for (uint8_t q = 3; q--;)
|
|
|
|
stepper.digipot_current(q, (stepper.motor_current_setting[q] = tmp_motor_current_setting[q]));
|
|
|
|
#endif
|
|
|
|
|
2017-12-01 22:42:23 +00:00
|
|
|
#if ENABLED(SKEW_CORRECTION_GCODE)
|
|
|
|
planner.xy_skew_factor = XY_SKEW_FACTOR;
|
|
|
|
#if ENABLED(SKEW_CORRECTION_FOR_Z)
|
|
|
|
planner.xz_skew_factor = XZ_SKEW_FACTOR;
|
|
|
|
planner.yz_skew_factor = YZ_SKEW_FACTOR;
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
2018-01-04 11:06:34 +00:00
|
|
|
#if ENABLED(ADVANCED_PAUSE_FEATURE)
|
|
|
|
for (uint8_t e = 0; e < E_STEPPERS; e++) {
|
|
|
|
filament_change_unload_length[e] = FILAMENT_CHANGE_UNLOAD_LENGTH;
|
|
|
|
filament_change_load_length[e] = FILAMENT_CHANGE_LOAD_LENGTH;
|
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2017-04-10 02:47:49 +00:00
|
|
|
postprocess();
|
2015-01-28 09:08:48 +00:00
|
|
|
|
2017-07-02 02:48:18 +00:00
|
|
|
#if ENABLED(EEPROM_CHITCHAT)
|
|
|
|
SERIAL_ECHO_START();
|
|
|
|
SERIAL_ECHOLNPGM("Hardcoded Default Settings Loaded");
|
|
|
|
#endif
|
2015-01-28 09:08:48 +00:00
|
|
|
}
|
|
|
|
|
2015-07-31 05:31:45 +00:00
|
|
|
#if DISABLED(DISABLE_M503)
|
2015-01-28 09:08:48 +00:00
|
|
|
|
2017-06-09 15:51:23 +00:00
|
|
|
#define CONFIG_ECHO_START do{ if (!forReplay) SERIAL_ECHO_START(); }while(0)
|
2015-04-27 01:44:01 +00:00
|
|
|
|
2016-10-28 23:55:42 +00:00
|
|
|
/**
|
2017-04-10 02:47:49 +00:00
|
|
|
* M503 - Report current settings in RAM
|
2017-03-31 19:58:40 +00:00
|
|
|
*
|
2017-04-10 02:47:49 +00:00
|
|
|
* Unless specifically disabled, M503 is available even without EEPROM
|
2016-10-28 23:55:42 +00:00
|
|
|
*/
|
2017-12-07 03:16:00 +00:00
|
|
|
void MarlinSettings::report(const bool forReplay) {
|
2015-01-28 09:08:48 +00:00
|
|
|
|
2017-04-17 04:24:30 +00:00
|
|
|
/**
|
|
|
|
* Announce current units, in case inches are being displayed
|
|
|
|
*/
|
2015-04-27 01:44:01 +00:00
|
|
|
CONFIG_ECHO_START;
|
2017-04-17 04:24:30 +00:00
|
|
|
#if ENABLED(INCH_MODE_SUPPORT)
|
2017-11-24 23:27:56 +00:00
|
|
|
#define LINEAR_UNIT(N) (float(N) / parser.linear_unit_factor)
|
|
|
|
#define VOLUMETRIC_UNIT(N) (float(N) / (parser.volumetric_enabled ? parser.volumetric_unit_factor : parser.linear_unit_factor))
|
2017-05-07 00:41:50 +00:00
|
|
|
SERIAL_ECHOPGM(" G2");
|
2017-05-20 08:03:08 +00:00
|
|
|
SERIAL_CHAR(parser.linear_unit_factor == 1.0 ? '1' : '0');
|
2017-05-07 00:41:50 +00:00
|
|
|
SERIAL_ECHOPGM(" ; Units in ");
|
2017-05-20 08:03:08 +00:00
|
|
|
serialprintPGM(parser.linear_unit_factor == 1.0 ? PSTR("mm\n") : PSTR("inches\n"));
|
2017-04-17 04:24:30 +00:00
|
|
|
#else
|
2017-11-24 23:27:56 +00:00
|
|
|
#define LINEAR_UNIT(N) (N)
|
|
|
|
#define VOLUMETRIC_UNIT(N) (N)
|
2017-05-25 23:02:29 +00:00
|
|
|
SERIAL_ECHOLNPGM(" G21 ; Units in mm");
|
2017-04-17 04:24:30 +00:00
|
|
|
#endif
|
2015-01-28 09:08:48 +00:00
|
|
|
|
2017-05-07 00:41:50 +00:00
|
|
|
#if ENABLED(ULTIPANEL)
|
|
|
|
|
|
|
|
// Temperature units - for Ultipanel temperature options
|
|
|
|
|
|
|
|
CONFIG_ECHO_START;
|
|
|
|
#if ENABLED(TEMPERATURE_UNITS_SUPPORT)
|
2017-05-20 08:03:08 +00:00
|
|
|
#define TEMP_UNIT(N) parser.to_temp_units(N)
|
2017-05-07 00:41:50 +00:00
|
|
|
SERIAL_ECHOPGM(" M149 ");
|
2017-05-20 08:03:08 +00:00
|
|
|
SERIAL_CHAR(parser.temp_units_code());
|
2017-05-07 00:41:50 +00:00
|
|
|
SERIAL_ECHOPGM(" ; Units in ");
|
2017-05-20 08:03:08 +00:00
|
|
|
serialprintPGM(parser.temp_units_name());
|
2017-05-07 00:41:50 +00:00
|
|
|
#else
|
2017-11-24 23:27:56 +00:00
|
|
|
#define TEMP_UNIT(N) (N)
|
2017-05-25 23:02:29 +00:00
|
|
|
SERIAL_ECHOLNPGM(" M149 C ; Units in Celsius");
|
2017-05-07 00:41:50 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
2017-06-09 15:51:23 +00:00
|
|
|
SERIAL_EOL();
|
2017-05-25 23:02:29 +00:00
|
|
|
|
2017-12-20 01:44:11 +00:00
|
|
|
#if DISABLED(NO_VOLUMETRICS)
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Volumetric extrusion M200
|
|
|
|
*/
|
|
|
|
if (!forReplay) {
|
|
|
|
CONFIG_ECHO_START;
|
|
|
|
SERIAL_ECHOPGM("Filament settings:");
|
|
|
|
if (parser.volumetric_enabled)
|
|
|
|
SERIAL_EOL();
|
|
|
|
else
|
|
|
|
SERIAL_ECHOLNPGM(" Disabled");
|
|
|
|
}
|
2017-04-17 04:24:30 +00:00
|
|
|
|
|
|
|
CONFIG_ECHO_START;
|
2017-12-20 01:44:11 +00:00
|
|
|
SERIAL_ECHOPAIR(" M200 D", LINEAR_UNIT(planner.filament_size[0]));
|
2017-06-09 15:51:23 +00:00
|
|
|
SERIAL_EOL();
|
2017-12-20 01:44:11 +00:00
|
|
|
#if EXTRUDERS > 1
|
2017-04-17 04:24:30 +00:00
|
|
|
CONFIG_ECHO_START;
|
2017-12-20 01:44:11 +00:00
|
|
|
SERIAL_ECHOPAIR(" M200 T1 D", LINEAR_UNIT(planner.filament_size[1]));
|
2017-06-09 15:51:23 +00:00
|
|
|
SERIAL_EOL();
|
2017-12-20 01:44:11 +00:00
|
|
|
#if EXTRUDERS > 2
|
2017-04-17 04:24:30 +00:00
|
|
|
CONFIG_ECHO_START;
|
2017-12-20 01:44:11 +00:00
|
|
|
SERIAL_ECHOPAIR(" M200 T2 D", LINEAR_UNIT(planner.filament_size[2]));
|
2017-06-09 15:51:23 +00:00
|
|
|
SERIAL_EOL();
|
2017-12-20 01:44:11 +00:00
|
|
|
#if EXTRUDERS > 3
|
2017-04-17 04:24:30 +00:00
|
|
|
CONFIG_ECHO_START;
|
2017-12-20 01:44:11 +00:00
|
|
|
SERIAL_ECHOPAIR(" M200 T3 D", LINEAR_UNIT(planner.filament_size[3]));
|
2017-06-09 15:51:23 +00:00
|
|
|
SERIAL_EOL();
|
2017-12-20 01:44:11 +00:00
|
|
|
#if EXTRUDERS > 4
|
|
|
|
CONFIG_ECHO_START;
|
|
|
|
SERIAL_ECHOPAIR(" M200 T4 D", LINEAR_UNIT(planner.filament_size[4]));
|
|
|
|
SERIAL_EOL();
|
|
|
|
#endif // EXTRUDERS > 4
|
|
|
|
#endif // EXTRUDERS > 3
|
|
|
|
#endif // EXTRUDERS > 2
|
|
|
|
#endif // EXTRUDERS > 1
|
|
|
|
|
|
|
|
if (!parser.volumetric_enabled) {
|
|
|
|
CONFIG_ECHO_START;
|
|
|
|
SERIAL_ECHOLNPGM(" M200 D0");
|
|
|
|
}
|
2017-04-17 04:24:30 +00:00
|
|
|
|
2017-12-20 01:44:11 +00:00
|
|
|
#endif // !NO_VOLUMETRICS
|
2017-04-17 04:24:30 +00:00
|
|
|
|
|
|
|
if (!forReplay) {
|
|
|
|
CONFIG_ECHO_START;
|
|
|
|
SERIAL_ECHOLNPGM("Steps per unit:");
|
|
|
|
}
|
|
|
|
CONFIG_ECHO_START;
|
|
|
|
SERIAL_ECHOPAIR(" M92 X", LINEAR_UNIT(planner.axis_steps_per_mm[X_AXIS]));
|
|
|
|
SERIAL_ECHOPAIR(" Y", LINEAR_UNIT(planner.axis_steps_per_mm[Y_AXIS]));
|
|
|
|
SERIAL_ECHOPAIR(" Z", LINEAR_UNIT(planner.axis_steps_per_mm[Z_AXIS]));
|
2016-12-12 01:37:29 +00:00
|
|
|
#if DISABLED(DISTINCT_E_FACTORS)
|
2017-04-17 04:24:30 +00:00
|
|
|
SERIAL_ECHOPAIR(" E", VOLUMETRIC_UNIT(planner.axis_steps_per_mm[E_AXIS]));
|
2016-12-04 04:02:27 +00:00
|
|
|
#endif
|
2017-06-09 15:51:23 +00:00
|
|
|
SERIAL_EOL();
|
2016-12-04 04:02:27 +00:00
|
|
|
#if ENABLED(DISTINCT_E_FACTORS)
|
2017-04-17 04:24:30 +00:00
|
|
|
CONFIG_ECHO_START;
|
2016-12-04 04:02:27 +00:00
|
|
|
for (uint8_t i = 0; i < E_STEPPERS; i++) {
|
|
|
|
SERIAL_ECHOPAIR(" M92 T", (int)i);
|
2017-04-17 04:24:30 +00:00
|
|
|
SERIAL_ECHOLNPAIR(" E", VOLUMETRIC_UNIT(planner.axis_steps_per_mm[E_AXIS + i]));
|
2016-12-04 04:02:27 +00:00
|
|
|
}
|
|
|
|
#endif
|
2016-10-28 23:55:42 +00:00
|
|
|
|
2015-04-27 01:44:01 +00:00
|
|
|
if (!forReplay) {
|
|
|
|
CONFIG_ECHO_START;
|
2017-04-17 04:24:30 +00:00
|
|
|
SERIAL_ECHOLNPGM("Maximum feedrates (units/s):");
|
2015-04-27 01:44:01 +00:00
|
|
|
}
|
2017-04-17 04:24:30 +00:00
|
|
|
CONFIG_ECHO_START;
|
|
|
|
SERIAL_ECHOPAIR(" M203 X", LINEAR_UNIT(planner.max_feedrate_mm_s[X_AXIS]));
|
|
|
|
SERIAL_ECHOPAIR(" Y", LINEAR_UNIT(planner.max_feedrate_mm_s[Y_AXIS]));
|
|
|
|
SERIAL_ECHOPAIR(" Z", LINEAR_UNIT(planner.max_feedrate_mm_s[Z_AXIS]));
|
2016-12-12 01:37:29 +00:00
|
|
|
#if DISABLED(DISTINCT_E_FACTORS)
|
2017-04-17 04:24:30 +00:00
|
|
|
SERIAL_ECHOPAIR(" E", VOLUMETRIC_UNIT(planner.max_feedrate_mm_s[E_AXIS]));
|
2016-12-04 04:02:27 +00:00
|
|
|
#endif
|
2017-06-09 15:51:23 +00:00
|
|
|
SERIAL_EOL();
|
2016-12-04 04:02:27 +00:00
|
|
|
#if ENABLED(DISTINCT_E_FACTORS)
|
2017-04-17 04:24:30 +00:00
|
|
|
CONFIG_ECHO_START;
|
2016-12-04 04:02:27 +00:00
|
|
|
for (uint8_t i = 0; i < E_STEPPERS; i++) {
|
|
|
|
SERIAL_ECHOPAIR(" M203 T", (int)i);
|
2017-04-17 04:24:30 +00:00
|
|
|
SERIAL_ECHOLNPAIR(" E", VOLUMETRIC_UNIT(planner.max_feedrate_mm_s[E_AXIS + i]));
|
2016-12-04 04:02:27 +00:00
|
|
|
}
|
|
|
|
#endif
|
2015-04-27 01:44:01 +00:00
|
|
|
|
2015-01-28 09:08:48 +00:00
|
|
|
if (!forReplay) {
|
2015-04-27 01:44:01 +00:00
|
|
|
CONFIG_ECHO_START;
|
2017-04-17 04:24:30 +00:00
|
|
|
SERIAL_ECHOLNPGM("Maximum Acceleration (units/s2):");
|
2015-01-28 09:08:48 +00:00
|
|
|
}
|
2017-04-17 04:24:30 +00:00
|
|
|
CONFIG_ECHO_START;
|
|
|
|
SERIAL_ECHOPAIR(" M201 X", LINEAR_UNIT(planner.max_acceleration_mm_per_s2[X_AXIS]));
|
|
|
|
SERIAL_ECHOPAIR(" Y", LINEAR_UNIT(planner.max_acceleration_mm_per_s2[Y_AXIS]));
|
|
|
|
SERIAL_ECHOPAIR(" Z", LINEAR_UNIT(planner.max_acceleration_mm_per_s2[Z_AXIS]));
|
2016-12-12 01:37:29 +00:00
|
|
|
#if DISABLED(DISTINCT_E_FACTORS)
|
2017-04-17 04:24:30 +00:00
|
|
|
SERIAL_ECHOPAIR(" E", VOLUMETRIC_UNIT(planner.max_acceleration_mm_per_s2[E_AXIS]));
|
2016-12-04 04:02:27 +00:00
|
|
|
#endif
|
2017-06-09 15:51:23 +00:00
|
|
|
SERIAL_EOL();
|
2016-12-04 04:02:27 +00:00
|
|
|
#if ENABLED(DISTINCT_E_FACTORS)
|
2017-05-24 21:56:36 +00:00
|
|
|
CONFIG_ECHO_START;
|
2016-12-04 04:02:27 +00:00
|
|
|
for (uint8_t i = 0; i < E_STEPPERS; i++) {
|
|
|
|
SERIAL_ECHOPAIR(" M201 T", (int)i);
|
2017-04-17 04:24:30 +00:00
|
|
|
SERIAL_ECHOLNPAIR(" E", VOLUMETRIC_UNIT(planner.max_acceleration_mm_per_s2[E_AXIS + i]));
|
2016-12-04 04:02:27 +00:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2016-02-17 21:05:12 +00:00
|
|
|
if (!forReplay) {
|
|
|
|
CONFIG_ECHO_START;
|
2017-04-17 04:24:30 +00:00
|
|
|
SERIAL_ECHOLNPGM("Acceleration (units/s2): P<print_accel> R<retract_accel> T<travel_accel>");
|
2016-02-17 21:05:12 +00:00
|
|
|
}
|
2015-04-27 01:44:01 +00:00
|
|
|
CONFIG_ECHO_START;
|
2017-04-17 04:24:30 +00:00
|
|
|
SERIAL_ECHOPAIR(" M204 P", LINEAR_UNIT(planner.acceleration));
|
|
|
|
SERIAL_ECHOPAIR(" R", LINEAR_UNIT(planner.retract_acceleration));
|
|
|
|
SERIAL_ECHOLNPAIR(" T", LINEAR_UNIT(planner.travel_acceleration));
|
|
|
|
|
2015-03-24 17:06:44 +00:00
|
|
|
if (!forReplay) {
|
2015-04-27 01:44:01 +00:00
|
|
|
CONFIG_ECHO_START;
|
2017-10-29 23:21:15 +00:00
|
|
|
SERIAL_ECHOLNPGM("Advanced: S<min_feedrate> T<min_travel_feedrate> B<min_segment_time_us> X<max_xy_jerk> Z<max_z_jerk> E<max_e_jerk>");
|
2015-03-24 17:06:44 +00:00
|
|
|
}
|
2017-04-17 04:24:30 +00:00
|
|
|
CONFIG_ECHO_START;
|
|
|
|
SERIAL_ECHOPAIR(" M205 S", LINEAR_UNIT(planner.min_feedrate_mm_s));
|
|
|
|
SERIAL_ECHOPAIR(" T", LINEAR_UNIT(planner.min_travel_feedrate_mm_s));
|
2017-10-29 23:21:15 +00:00
|
|
|
SERIAL_ECHOPAIR(" B", planner.min_segment_time_us);
|
2017-04-17 04:24:30 +00:00
|
|
|
SERIAL_ECHOPAIR(" X", LINEAR_UNIT(planner.max_jerk[X_AXIS]));
|
|
|
|
SERIAL_ECHOPAIR(" Y", LINEAR_UNIT(planner.max_jerk[Y_AXIS]));
|
|
|
|
SERIAL_ECHOPAIR(" Z", LINEAR_UNIT(planner.max_jerk[Z_AXIS]));
|
|
|
|
SERIAL_ECHOLNPAIR(" E", LINEAR_UNIT(planner.max_jerk[E_AXIS]));
|
2015-01-28 09:08:48 +00:00
|
|
|
|
2017-04-15 02:41:21 +00:00
|
|
|
#if HAS_M206_COMMAND
|
2017-03-05 00:01:33 +00:00
|
|
|
if (!forReplay) {
|
|
|
|
CONFIG_ECHO_START;
|
2017-04-17 04:24:30 +00:00
|
|
|
SERIAL_ECHOLNPGM("Home offset:");
|
2017-03-05 00:01:33 +00:00
|
|
|
}
|
2017-04-17 04:24:30 +00:00
|
|
|
CONFIG_ECHO_START;
|
|
|
|
SERIAL_ECHOPAIR(" M206 X", LINEAR_UNIT(home_offset[X_AXIS]));
|
|
|
|
SERIAL_ECHOPAIR(" Y", LINEAR_UNIT(home_offset[Y_AXIS]));
|
|
|
|
SERIAL_ECHOLNPAIR(" Z", LINEAR_UNIT(home_offset[Z_AXIS]));
|
2017-03-05 00:01:33 +00:00
|
|
|
#endif
|
2015-04-27 01:44:01 +00:00
|
|
|
|
2016-10-28 23:55:42 +00:00
|
|
|
#if HOTENDS > 1
|
|
|
|
if (!forReplay) {
|
2015-04-27 01:44:01 +00:00
|
|
|
CONFIG_ECHO_START;
|
2017-04-17 04:24:30 +00:00
|
|
|
SERIAL_ECHOLNPGM("Hotend offsets:");
|
2016-10-28 23:55:42 +00:00
|
|
|
}
|
2017-04-17 04:24:30 +00:00
|
|
|
CONFIG_ECHO_START;
|
2016-10-28 23:55:42 +00:00
|
|
|
for (uint8_t e = 1; e < HOTENDS; e++) {
|
|
|
|
SERIAL_ECHOPAIR(" M218 T", (int)e);
|
2017-04-17 04:24:30 +00:00
|
|
|
SERIAL_ECHOPAIR(" X", LINEAR_UNIT(hotend_offset[X_AXIS][e]));
|
|
|
|
SERIAL_ECHOPAIR(" Y", LINEAR_UNIT(hotend_offset[Y_AXIS][e]));
|
2017-08-13 21:35:59 +00:00
|
|
|
#if ENABLED(DUAL_X_CARRIAGE) || ENABLED(SWITCHING_NOZZLE) ||ENABLED(PARKING_EXTRUDER)
|
2017-04-17 04:24:30 +00:00
|
|
|
SERIAL_ECHOPAIR(" Z", LINEAR_UNIT(hotend_offset[Z_AXIS][e]));
|
2015-08-31 02:04:30 +00:00
|
|
|
#endif
|
2017-06-09 15:51:23 +00:00
|
|
|
SERIAL_EOL();
|
2015-04-27 01:44:01 +00:00
|
|
|
}
|
2016-10-28 23:55:42 +00:00
|
|
|
#endif
|
2015-04-27 01:44:01 +00:00
|
|
|
|
2018-01-04 03:55:07 +00:00
|
|
|
/**
|
|
|
|
* Bed Leveling
|
|
|
|
*/
|
|
|
|
#if HAS_LEVELING
|
2017-03-24 05:53:37 +00:00
|
|
|
|
2018-01-04 03:55:07 +00:00
|
|
|
#if ENABLED(MESH_BED_LEVELING)
|
|
|
|
|
|
|
|
if (!forReplay) {
|
2016-10-28 23:55:42 +00:00
|
|
|
CONFIG_ECHO_START;
|
2018-01-04 03:55:07 +00:00
|
|
|
SERIAL_ECHOLNPGM("Mesh Bed Leveling:");
|
2016-10-28 23:55:42 +00:00
|
|
|
}
|
2017-03-24 05:53:37 +00:00
|
|
|
|
2018-01-04 03:55:07 +00:00
|
|
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
|
|
|
|
|
|
|
if (!forReplay) {
|
|
|
|
CONFIG_ECHO_START;
|
|
|
|
ubl.echo_name();
|
|
|
|
SERIAL_ECHOLNPGM(":");
|
|
|
|
}
|
|
|
|
|
|
|
|
#elif HAS_ABL
|
|
|
|
|
|
|
|
if (!forReplay) {
|
|
|
|
CONFIG_ECHO_START;
|
|
|
|
SERIAL_ECHOLNPGM("Auto Bed Leveling:");
|
|
|
|
}
|
|
|
|
|
|
|
|
#endif
|
2017-03-24 05:53:37 +00:00
|
|
|
|
2017-04-17 04:24:30 +00:00
|
|
|
CONFIG_ECHO_START;
|
2017-10-13 22:21:25 +00:00
|
|
|
SERIAL_ECHOPAIR(" M420 S", planner.leveling_active ? 1 : 0);
|
2017-04-20 22:45:58 +00:00
|
|
|
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
|
2017-10-13 22:21:25 +00:00
|
|
|
SERIAL_ECHOPAIR(" Z", LINEAR_UNIT(planner.z_fade_height));
|
2017-04-20 22:45:58 +00:00
|
|
|
#endif
|
2017-06-09 15:51:23 +00:00
|
|
|
SERIAL_EOL();
|
2017-03-24 05:53:37 +00:00
|
|
|
|
2018-01-04 03:55:07 +00:00
|
|
|
#if ENABLED(MESH_BED_LEVELING)
|
2017-05-16 07:34:36 +00:00
|
|
|
|
2018-01-04 03:55:07 +00:00
|
|
|
for (uint8_t py = 0; py < GRID_MAX_POINTS_Y; py++) {
|
|
|
|
for (uint8_t px = 0; px < GRID_MAX_POINTS_X; px++) {
|
|
|
|
CONFIG_ECHO_START;
|
|
|
|
SERIAL_ECHOPAIR(" G29 S3 X", (int)px + 1);
|
|
|
|
SERIAL_ECHOPAIR(" Y", (int)py + 1);
|
|
|
|
SERIAL_ECHOPGM(" Z");
|
|
|
|
SERIAL_PROTOCOL_F(LINEAR_UNIT(mbl.z_values[px][py]), 5);
|
|
|
|
SERIAL_EOL();
|
|
|
|
}
|
|
|
|
}
|
2017-03-24 05:53:37 +00:00
|
|
|
|
2018-01-04 03:55:07 +00:00
|
|
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
|
|
|
|
|
|
|
if (!forReplay) {
|
|
|
|
SERIAL_EOL();
|
|
|
|
ubl.report_state();
|
|
|
|
SERIAL_ECHOLNPAIR("\nActive Mesh Slot: ", ubl.storage_slot);
|
|
|
|
SERIAL_ECHOPAIR("EEPROM can hold ", calc_num_meshes());
|
|
|
|
SERIAL_ECHOLNPGM(" meshes.\n");
|
|
|
|
}
|
2017-03-24 05:53:37 +00:00
|
|
|
|
2017-02-21 12:49:31 +00:00
|
|
|
#endif
|
2017-03-24 05:53:37 +00:00
|
|
|
|
2018-01-04 03:55:07 +00:00
|
|
|
#endif // HAS_LEVELING
|
2015-04-27 01:44:01 +00:00
|
|
|
|
2016-10-28 23:55:42 +00:00
|
|
|
#if ENABLED(DELTA)
|
|
|
|
if (!forReplay) {
|
|
|
|
CONFIG_ECHO_START;
|
2017-04-17 04:24:30 +00:00
|
|
|
SERIAL_ECHOLNPGM("Endstop adjustment:");
|
2016-10-28 23:55:42 +00:00
|
|
|
}
|
|
|
|
CONFIG_ECHO_START;
|
2017-09-08 20:35:25 +00:00
|
|
|
SERIAL_ECHOPAIR(" M666 X", LINEAR_UNIT(delta_endstop_adj[X_AXIS]));
|
|
|
|
SERIAL_ECHOPAIR(" Y", LINEAR_UNIT(delta_endstop_adj[Y_AXIS]));
|
|
|
|
SERIAL_ECHOLNPAIR(" Z", LINEAR_UNIT(delta_endstop_adj[Z_AXIS]));
|
2016-10-28 23:55:42 +00:00
|
|
|
if (!forReplay) {
|
|
|
|
CONFIG_ECHO_START;
|
2017-04-18 12:43:25 +00:00
|
|
|
SERIAL_ECHOLNPGM("Delta settings: L<diagonal_rod> R<radius> H<height> S<segments_per_s> B<calibration radius> XYZ<tower angle corrections>");
|
2016-10-28 23:55:42 +00:00
|
|
|
}
|
2017-04-17 04:24:30 +00:00
|
|
|
CONFIG_ECHO_START;
|
|
|
|
SERIAL_ECHOPAIR(" M665 L", LINEAR_UNIT(delta_diagonal_rod));
|
|
|
|
SERIAL_ECHOPAIR(" R", LINEAR_UNIT(delta_radius));
|
2017-11-09 04:10:08 +00:00
|
|
|
SERIAL_ECHOPAIR(" H", LINEAR_UNIT(delta_height));
|
2016-10-28 23:55:42 +00:00
|
|
|
SERIAL_ECHOPAIR(" S", delta_segments_per_second);
|
2017-04-18 14:49:33 +00:00
|
|
|
SERIAL_ECHOPAIR(" B", LINEAR_UNIT(delta_calibration_radius));
|
2017-04-18 12:43:25 +00:00
|
|
|
SERIAL_ECHOPAIR(" X", LINEAR_UNIT(delta_tower_angle_trim[A_AXIS]));
|
|
|
|
SERIAL_ECHOPAIR(" Y", LINEAR_UNIT(delta_tower_angle_trim[B_AXIS]));
|
2017-09-24 07:18:15 +00:00
|
|
|
SERIAL_ECHOPAIR(" Z", LINEAR_UNIT(delta_tower_angle_trim[C_AXIS]));
|
2017-06-09 15:51:23 +00:00
|
|
|
SERIAL_EOL();
|
2017-10-29 08:43:44 +00:00
|
|
|
|
|
|
|
#elif ENABLED(X_DUAL_ENDSTOPS) || ENABLED(Y_DUAL_ENDSTOPS) || ENABLED(Z_DUAL_ENDSTOPS)
|
2016-10-28 23:55:42 +00:00
|
|
|
if (!forReplay) {
|
|
|
|
CONFIG_ECHO_START;
|
2017-10-29 08:43:44 +00:00
|
|
|
SERIAL_ECHOLNPGM("Endstop adjustment:");
|
2016-10-28 23:55:42 +00:00
|
|
|
}
|
2017-04-17 04:24:30 +00:00
|
|
|
CONFIG_ECHO_START;
|
2017-10-29 08:43:44 +00:00
|
|
|
SERIAL_ECHOPGM(" M666");
|
|
|
|
#if ENABLED(X_DUAL_ENDSTOPS)
|
|
|
|
SERIAL_ECHOPAIR(" X", LINEAR_UNIT(endstops.x_endstop_adj));
|
|
|
|
#endif
|
|
|
|
#if ENABLED(Y_DUAL_ENDSTOPS)
|
|
|
|
SERIAL_ECHOPAIR(" Y", LINEAR_UNIT(endstops.y_endstop_adj));
|
|
|
|
#endif
|
|
|
|
#if ENABLED(Z_DUAL_ENDSTOPS)
|
|
|
|
SERIAL_ECHOPAIR(" Z", LINEAR_UNIT(endstops.z_endstop_adj));
|
|
|
|
#endif
|
|
|
|
SERIAL_EOL();
|
2016-10-28 23:55:42 +00:00
|
|
|
#endif // DELTA
|
2015-04-27 01:44:01 +00:00
|
|
|
|
2016-10-28 23:55:42 +00:00
|
|
|
#if ENABLED(ULTIPANEL)
|
|
|
|
if (!forReplay) {
|
|
|
|
CONFIG_ECHO_START;
|
2017-04-17 04:24:30 +00:00
|
|
|
SERIAL_ECHOLNPGM("Material heatup parameters:");
|
2016-10-28 23:55:42 +00:00
|
|
|
}
|
2016-10-27 07:40:37 +00:00
|
|
|
for (uint8_t i = 0; i < COUNT(lcd_preheat_hotend_temp); i++) {
|
2017-11-15 09:58:43 +00:00
|
|
|
CONFIG_ECHO_START;
|
2016-10-27 07:40:37 +00:00
|
|
|
SERIAL_ECHOPAIR(" M145 S", (int)i);
|
2017-05-07 00:41:50 +00:00
|
|
|
SERIAL_ECHOPAIR(" H", TEMP_UNIT(lcd_preheat_hotend_temp[i]));
|
|
|
|
SERIAL_ECHOPAIR(" B", TEMP_UNIT(lcd_preheat_bed_temp[i]));
|
2017-04-17 04:24:30 +00:00
|
|
|
SERIAL_ECHOLNPAIR(" F", lcd_preheat_fan_speed[i]);
|
2016-10-27 07:40:37 +00:00
|
|
|
}
|
2016-10-28 23:55:42 +00:00
|
|
|
#endif // ULTIPANEL
|
2015-01-28 09:08:48 +00:00
|
|
|
|
2016-10-28 23:55:42 +00:00
|
|
|
#if HAS_PID_HEATING
|
2015-01-28 09:08:48 +00:00
|
|
|
|
2016-10-28 23:55:42 +00:00
|
|
|
if (!forReplay) {
|
2017-04-17 04:24:30 +00:00
|
|
|
CONFIG_ECHO_START;
|
2016-10-28 23:55:42 +00:00
|
|
|
SERIAL_ECHOLNPGM("PID settings:");
|
|
|
|
}
|
|
|
|
#if ENABLED(PIDTEMP)
|
|
|
|
#if HOTENDS > 1
|
|
|
|
if (forReplay) {
|
|
|
|
HOTEND_LOOP() {
|
|
|
|
CONFIG_ECHO_START;
|
|
|
|
SERIAL_ECHOPAIR(" M301 E", e);
|
|
|
|
SERIAL_ECHOPAIR(" P", PID_PARAM(Kp, e));
|
|
|
|
SERIAL_ECHOPAIR(" I", unscalePID_i(PID_PARAM(Ki, e)));
|
|
|
|
SERIAL_ECHOPAIR(" D", unscalePID_d(PID_PARAM(Kd, e)));
|
|
|
|
#if ENABLED(PID_EXTRUSION_SCALING)
|
|
|
|
SERIAL_ECHOPAIR(" C", PID_PARAM(Kc, e));
|
|
|
|
if (e == 0) SERIAL_ECHOPAIR(" L", lpq_len);
|
|
|
|
#endif
|
2017-06-09 15:51:23 +00:00
|
|
|
SERIAL_EOL();
|
2016-10-28 23:55:42 +00:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
#endif // HOTENDS > 1
|
|
|
|
// !forReplay || HOTENDS == 1
|
|
|
|
{
|
|
|
|
CONFIG_ECHO_START;
|
|
|
|
SERIAL_ECHOPAIR(" M301 P", PID_PARAM(Kp, 0)); // for compatibility with hosts, only echo values for E0
|
|
|
|
SERIAL_ECHOPAIR(" I", unscalePID_i(PID_PARAM(Ki, 0)));
|
|
|
|
SERIAL_ECHOPAIR(" D", unscalePID_d(PID_PARAM(Kd, 0)));
|
|
|
|
#if ENABLED(PID_EXTRUSION_SCALING)
|
|
|
|
SERIAL_ECHOPAIR(" C", PID_PARAM(Kc, 0));
|
|
|
|
SERIAL_ECHOPAIR(" L", lpq_len);
|
|
|
|
#endif
|
2017-06-09 15:51:23 +00:00
|
|
|
SERIAL_EOL();
|
2016-10-28 23:55:42 +00:00
|
|
|
}
|
|
|
|
#endif // PIDTEMP
|
|
|
|
|
|
|
|
#if ENABLED(PIDTEMPBED)
|
|
|
|
CONFIG_ECHO_START;
|
|
|
|
SERIAL_ECHOPAIR(" M304 P", thermalManager.bedKp);
|
|
|
|
SERIAL_ECHOPAIR(" I", unscalePID_i(thermalManager.bedKi));
|
|
|
|
SERIAL_ECHOPAIR(" D", unscalePID_d(thermalManager.bedKd));
|
2017-06-09 15:51:23 +00:00
|
|
|
SERIAL_EOL();
|
2016-10-28 23:55:42 +00:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#endif // PIDTEMP || PIDTEMPBED
|
|
|
|
|
|
|
|
#if HAS_LCD_CONTRAST
|
|
|
|
if (!forReplay) {
|
|
|
|
CONFIG_ECHO_START;
|
2017-04-17 04:24:30 +00:00
|
|
|
SERIAL_ECHOLNPGM("LCD Contrast:");
|
2016-10-28 23:55:42 +00:00
|
|
|
}
|
2017-04-17 04:24:30 +00:00
|
|
|
CONFIG_ECHO_START;
|
|
|
|
SERIAL_ECHOLNPAIR(" M250 C", lcd_contrast);
|
2015-04-27 01:44:01 +00:00
|
|
|
#endif
|
2015-01-28 09:08:48 +00:00
|
|
|
|
2016-10-28 23:55:42 +00:00
|
|
|
#if ENABLED(FWRETRACT)
|
2012-11-07 22:16:43 +00:00
|
|
|
|
2016-10-28 23:55:42 +00:00
|
|
|
if (!forReplay) {
|
|
|
|
CONFIG_ECHO_START;
|
2017-04-17 04:24:30 +00:00
|
|
|
SERIAL_ECHOLNPGM("Retract: S<length> F<units/m> Z<lift>");
|
2016-10-28 23:55:42 +00:00
|
|
|
}
|
2017-04-17 04:24:30 +00:00
|
|
|
CONFIG_ECHO_START;
|
2017-09-08 03:40:32 +00:00
|
|
|
SERIAL_ECHOPAIR(" M207 S", LINEAR_UNIT(fwretract.retract_length));
|
|
|
|
SERIAL_ECHOPAIR(" W", LINEAR_UNIT(fwretract.swap_retract_length));
|
|
|
|
SERIAL_ECHOPAIR(" F", MMS_TO_MMM(LINEAR_UNIT(fwretract.retract_feedrate_mm_s)));
|
|
|
|
SERIAL_ECHOLNPAIR(" Z", LINEAR_UNIT(fwretract.retract_zlift));
|
2017-04-17 04:24:30 +00:00
|
|
|
|
2016-10-28 23:55:42 +00:00
|
|
|
if (!forReplay) {
|
|
|
|
CONFIG_ECHO_START;
|
2017-04-17 04:24:30 +00:00
|
|
|
SERIAL_ECHOLNPGM("Recover: S<length> F<units/m>");
|
2016-10-28 23:55:42 +00:00
|
|
|
}
|
2017-04-17 04:24:30 +00:00
|
|
|
CONFIG_ECHO_START;
|
2017-09-08 03:40:32 +00:00
|
|
|
SERIAL_ECHOPAIR(" M208 S", LINEAR_UNIT(fwretract.retract_recover_length));
|
|
|
|
SERIAL_ECHOPAIR(" W", LINEAR_UNIT(fwretract.swap_retract_recover_length));
|
|
|
|
SERIAL_ECHOLNPAIR(" F", MMS_TO_MMM(LINEAR_UNIT(fwretract.retract_recover_feedrate_mm_s)));
|
2017-04-17 04:24:30 +00:00
|
|
|
|
2016-10-28 23:55:42 +00:00
|
|
|
if (!forReplay) {
|
|
|
|
CONFIG_ECHO_START;
|
2017-07-23 23:56:56 +00:00
|
|
|
SERIAL_ECHOLNPGM("Auto-Retract: S=0 to disable, 1 to interpret E-only moves as retract/recover");
|
2016-10-28 23:55:42 +00:00
|
|
|
}
|
2015-04-27 01:44:01 +00:00
|
|
|
CONFIG_ECHO_START;
|
2017-09-08 03:40:32 +00:00
|
|
|
SERIAL_ECHOLNPAIR(" M209 S", fwretract.autoretract_enabled ? 1 : 0);
|
2015-01-28 09:08:48 +00:00
|
|
|
|
2017-04-17 04:24:30 +00:00
|
|
|
#endif // FWRETRACT
|
2016-10-28 23:55:42 +00:00
|
|
|
|
|
|
|
/**
|
2017-10-29 08:43:44 +00:00
|
|
|
* Probe Offset
|
2016-10-28 23:55:42 +00:00
|
|
|
*/
|
|
|
|
#if HAS_BED_PROBE
|
|
|
|
if (!forReplay) {
|
2017-03-07 05:00:43 +00:00
|
|
|
CONFIG_ECHO_START;
|
2017-04-17 04:24:30 +00:00
|
|
|
SERIAL_ECHOLNPGM("Z-Probe Offset (mm):");
|
2016-10-28 23:55:42 +00:00
|
|
|
}
|
2017-04-17 04:24:30 +00:00
|
|
|
CONFIG_ECHO_START;
|
|
|
|
SERIAL_ECHOLNPAIR(" M851 Z", LINEAR_UNIT(zprobe_zoffset));
|
2016-10-28 23:55:42 +00:00
|
|
|
#endif
|
2017-12-01 22:42:23 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Bed Skew Correction
|
|
|
|
*/
|
|
|
|
#if ENABLED(SKEW_CORRECTION_GCODE)
|
|
|
|
if (!forReplay) {
|
|
|
|
CONFIG_ECHO_START;
|
|
|
|
SERIAL_ECHOLNPGM("Skew Factor: ");
|
|
|
|
}
|
|
|
|
CONFIG_ECHO_START;
|
|
|
|
#if ENABLED(SKEW_CORRECTION_FOR_Z)
|
2018-01-04 22:02:22 +00:00
|
|
|
SERIAL_ECHO(" M852 I");
|
2018-01-05 16:10:55 +00:00
|
|
|
SERIAL_ECHO_F(LINEAR_UNIT(planner.xy_skew_factor), 6);
|
2017-12-01 22:42:23 +00:00
|
|
|
SERIAL_ECHOPAIR(" J", LINEAR_UNIT(planner.xz_skew_factor));
|
|
|
|
SERIAL_ECHOLNPAIR(" K", LINEAR_UNIT(planner.yz_skew_factor));
|
|
|
|
#else
|
2018-01-04 22:02:22 +00:00
|
|
|
SERIAL_ECHO(" M852 S");
|
|
|
|
SERIAL_ECHO_F(planner.xy_skew_factor, 6);
|
2018-01-04 22:20:18 +00:00
|
|
|
SERIAL_EOL();
|
2017-12-01 22:42:23 +00:00
|
|
|
#endif
|
|
|
|
#endif
|
2017-03-07 05:00:43 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* TMC2130 stepper driver current
|
|
|
|
*/
|
2018-01-04 03:55:07 +00:00
|
|
|
#if HAS_TRINAMIC
|
2017-03-07 05:00:43 +00:00
|
|
|
if (!forReplay) {
|
|
|
|
CONFIG_ECHO_START;
|
2017-04-17 04:24:30 +00:00
|
|
|
SERIAL_ECHOLNPGM("Stepper driver current:");
|
2017-03-07 05:00:43 +00:00
|
|
|
}
|
2017-04-17 04:24:30 +00:00
|
|
|
CONFIG_ECHO_START;
|
2017-03-07 05:00:43 +00:00
|
|
|
SERIAL_ECHO(" M906");
|
2017-12-15 21:03:14 +00:00
|
|
|
#if ENABLED(X_IS_TMC2130) || ENABLED(X_IS_TMC2208)
|
|
|
|
SERIAL_ECHOPAIR(" X ", stepperX.getCurrent());
|
2017-03-07 05:00:43 +00:00
|
|
|
#endif
|
2017-12-15 21:03:14 +00:00
|
|
|
#if ENABLED(Y_IS_TMC2130) || ENABLED(Y_IS_TMC2208)
|
|
|
|
SERIAL_ECHOPAIR(" Y ", stepperY.getCurrent());
|
2017-03-07 05:00:43 +00:00
|
|
|
#endif
|
2017-12-15 21:03:14 +00:00
|
|
|
#if ENABLED(Z_IS_TMC2130) || ENABLED(Z_IS_TMC2208)
|
|
|
|
SERIAL_ECHOPAIR(" Z ", stepperZ.getCurrent());
|
2017-03-07 05:00:43 +00:00
|
|
|
#endif
|
2017-12-15 21:03:14 +00:00
|
|
|
#if ENABLED(X2_IS_TMC2130) || ENABLED(X2_IS_TMC2208)
|
|
|
|
SERIAL_ECHOPAIR(" X2 ", stepperX2.getCurrent());
|
2017-03-07 05:00:43 +00:00
|
|
|
#endif
|
2017-12-15 21:03:14 +00:00
|
|
|
#if ENABLED(Y2_IS_TMC2130) || ENABLED(Y2_IS_TMC2208)
|
|
|
|
SERIAL_ECHOPAIR(" Y2 ", stepperY2.getCurrent());
|
2017-03-07 05:00:43 +00:00
|
|
|
#endif
|
2017-12-15 21:03:14 +00:00
|
|
|
#if ENABLED(Z2_IS_TMC2130) || ENABLED(Z2_IS_TMC2208)
|
|
|
|
SERIAL_ECHOPAIR(" Z2 ", stepperZ2.getCurrent());
|
2017-03-07 05:00:43 +00:00
|
|
|
#endif
|
2017-12-15 21:03:14 +00:00
|
|
|
#if ENABLED(E0_IS_TMC2130) || ENABLED(E0_IS_TMC2208)
|
|
|
|
SERIAL_ECHOPAIR(" E0 ", stepperE0.getCurrent());
|
2017-03-07 05:00:43 +00:00
|
|
|
#endif
|
2017-12-15 21:03:14 +00:00
|
|
|
#if ENABLED(E1_IS_TMC2130) || ENABLED(E1_IS_TMC2208)
|
|
|
|
SERIAL_ECHOPAIR(" E1 ", stepperE1.getCurrent());
|
2017-03-07 05:00:43 +00:00
|
|
|
#endif
|
2017-12-15 21:03:14 +00:00
|
|
|
#if ENABLED(E2_IS_TMC2130) || ENABLED(E2_IS_TMC2208)
|
|
|
|
SERIAL_ECHOPAIR(" E2 ", stepperE2.getCurrent());
|
2017-03-07 05:00:43 +00:00
|
|
|
#endif
|
2017-12-15 21:03:14 +00:00
|
|
|
#if ENABLED(E3_IS_TMC2130) || ENABLED(E3_IS_TMC2208)
|
|
|
|
SERIAL_ECHOPAIR(" E3 ", stepperE3.getCurrent());
|
|
|
|
#endif
|
|
|
|
#if ENABLED(E4_IS_TMC2130) || ENABLED(E4_IS_TMC2208)
|
|
|
|
SERIAL_ECHOPAIR(" E4 ", stepperE4.getCurrent());
|
|
|
|
#endif
|
|
|
|
SERIAL_EOL();
|
|
|
|
#endif
|
|
|
|
|
|
|
|
/**
|
|
|
|
* TMC2130 Sensorless homing thresholds
|
|
|
|
*/
|
2018-01-04 03:55:07 +00:00
|
|
|
#if ENABLED(SENSORLESS_HOMING)
|
2017-12-15 21:03:14 +00:00
|
|
|
if (!forReplay) {
|
|
|
|
CONFIG_ECHO_START;
|
|
|
|
SERIAL_ECHOLNPGM("Sensorless homing threshold:");
|
|
|
|
}
|
|
|
|
CONFIG_ECHO_START;
|
|
|
|
SERIAL_ECHO(" M914");
|
|
|
|
#if ENABLED(X_IS_TMC2130)
|
|
|
|
SERIAL_ECHOPAIR(" X", stepperX.sgt());
|
|
|
|
#endif
|
|
|
|
#if ENABLED(X2_IS_TMC2130)
|
|
|
|
SERIAL_ECHOPAIR(" X2 ", stepperX2.sgt());
|
|
|
|
#endif
|
|
|
|
#if ENABLED(Y_IS_TMC2130)
|
|
|
|
SERIAL_ECHOPAIR(" Y", stepperY.sgt());
|
|
|
|
#endif
|
|
|
|
#if ENABLED(X2_IS_TMC2130)
|
|
|
|
SERIAL_ECHOPAIR(" Y2 ", stepperY2.sgt());
|
2017-03-07 05:00:43 +00:00
|
|
|
#endif
|
2017-06-09 15:51:23 +00:00
|
|
|
SERIAL_EOL();
|
2017-03-07 05:00:43 +00:00
|
|
|
#endif
|
2017-04-16 03:18:10 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Linear Advance
|
|
|
|
*/
|
|
|
|
#if ENABLED(LIN_ADVANCE)
|
|
|
|
if (!forReplay) {
|
|
|
|
CONFIG_ECHO_START;
|
|
|
|
SERIAL_ECHOLNPGM("Linear Advance:");
|
|
|
|
}
|
|
|
|
CONFIG_ECHO_START;
|
2017-04-22 03:30:36 +00:00
|
|
|
SERIAL_ECHOPAIR(" M900 K", planner.extruder_advance_k);
|
|
|
|
SERIAL_ECHOLNPAIR(" R", planner.advance_ed_ratio);
|
2017-04-16 03:18:10 +00:00
|
|
|
#endif
|
2017-06-03 05:38:07 +00:00
|
|
|
|
|
|
|
#if HAS_MOTOR_CURRENT_PWM
|
|
|
|
CONFIG_ECHO_START;
|
|
|
|
if (!forReplay) {
|
|
|
|
SERIAL_ECHOLNPGM("Stepper motor currents:");
|
|
|
|
CONFIG_ECHO_START;
|
|
|
|
}
|
|
|
|
SERIAL_ECHOPAIR(" M907 X", stepper.motor_current_setting[0]);
|
|
|
|
SERIAL_ECHOPAIR(" Z", stepper.motor_current_setting[1]);
|
|
|
|
SERIAL_ECHOPAIR(" E", stepper.motor_current_setting[2]);
|
|
|
|
SERIAL_EOL();
|
|
|
|
#endif
|
2018-01-04 11:06:34 +00:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Advanced Pause filament load & unload lengths
|
|
|
|
*/
|
|
|
|
#if ENABLED(ADVANCED_PAUSE_FEATURE)
|
|
|
|
if (!forReplay) {
|
|
|
|
CONFIG_ECHO_START;
|
|
|
|
SERIAL_ECHOLNPGM("Filament load/unload lengths:");
|
|
|
|
}
|
|
|
|
CONFIG_ECHO_START;
|
|
|
|
#if EXTRUDERS == 1
|
|
|
|
SERIAL_ECHOPAIR(" M603 L", LINEAR_UNIT(filament_change_load_length[0]));
|
|
|
|
SERIAL_ECHOLNPAIR(" U", LINEAR_UNIT(filament_change_unload_length[0]));
|
|
|
|
#else
|
|
|
|
SERIAL_ECHOPAIR(" M603 T0 L", LINEAR_UNIT(filament_change_load_length[0]));
|
|
|
|
SERIAL_ECHOLNPAIR(" U", LINEAR_UNIT(filament_change_unload_length[0]));
|
|
|
|
CONFIG_ECHO_START;
|
|
|
|
SERIAL_ECHOPAIR(" M603 T1 L", LINEAR_UNIT(filament_change_load_length[1]));
|
|
|
|
SERIAL_ECHOLNPAIR(" U", LINEAR_UNIT(filament_change_unload_length[1]));
|
|
|
|
#if EXTRUDERS > 2
|
|
|
|
CONFIG_ECHO_START;
|
|
|
|
SERIAL_ECHOPAIR(" M603 T2 L", LINEAR_UNIT(filament_change_load_length[2]));
|
|
|
|
SERIAL_ECHOLNPAIR(" U", LINEAR_UNIT(filament_change_unload_length[2]));
|
|
|
|
#if EXTRUDERS > 3
|
|
|
|
CONFIG_ECHO_START;
|
|
|
|
SERIAL_ECHOPAIR(" M603 T3 L", LINEAR_UNIT(filament_change_load_length[3]));
|
|
|
|
SERIAL_ECHOLNPAIR(" U", LINEAR_UNIT(filament_change_unload_length[3]));
|
|
|
|
#if EXTRUDERS > 4
|
|
|
|
CONFIG_ECHO_START;
|
|
|
|
SERIAL_ECHOPAIR(" M603 T4 L", LINEAR_UNIT(filament_change_load_length[4]));
|
|
|
|
SERIAL_ECHOLNPAIR(" U", LINEAR_UNIT(filament_change_unload_length[4]));
|
|
|
|
#endif // EXTRUDERS > 4
|
|
|
|
#endif // EXTRUDERS > 3
|
|
|
|
#endif // EXTRUDERS > 2
|
|
|
|
#endif // EXTRUDERS == 1
|
|
|
|
#endif // ADVANCED_PAUSE_FEATURE
|
2016-10-28 23:55:42 +00:00
|
|
|
}
|
Allow Edit menu to call fn after edit; Fix PID Ki and Kd display in menus; Actually use changed PID and Max Accel values
Add new 'callback' edit-menu types that call a function after the edit is done. Use this to display and edit Ki and Kd correctly (removing the scaling first and reapplying it after). Also use it to reset maximum stepwise acceleration rates, after updating mm/s^2 rates via menus. (Previously, changes did nothing to affect planner unless saved back to EEPROM, and the machine reset).
Add calls to updatePID() so that PID loop uses updated values whether set by gcode (it already did this), or by restoring defaults, or loading from EEPROM (it didn't do those last two). Similarly, update the maximum step/s^2 accel rates when the mm/s^2 values are changed - whether by menu edits, restore defaults, or EEPROM read.
Refactor the acceleration rate update logic, and the PID scaling logic, into new functions that can be called from wherever, including the callbacks.
Add menu items to allow the z jerk and e jerk to be viewed/edited in the Control->Motion menu, as per xy jerk.
Conflicts:
Marlin/language.h
2013-03-19 14:05:11 +00:00
|
|
|
|
2015-01-28 09:08:48 +00:00
|
|
|
#endif // !DISABLE_M503
|