2016-03-25 07:19:46 +01:00
|
|
|
/**
|
2016-03-24 19:01:20 +01: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 07:19:46 +01:00
|
|
|
/**
|
2015-04-26 06:04:54 +02:00
|
|
|
* configuration_store.cpp
|
2015-01-28 10:08:48 +01:00
|
|
|
*
|
2017-04-10 04:47:49 +02:00
|
|
|
* Settings and EEPROM storage
|
2015-01-28 10:08:48 +01:00
|
|
|
*
|
2015-04-04 01:38:05 +02: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-05 02:59:43 +01:00
|
|
|
// Change EEPROM version if the structure changes
|
2018-03-15 04:03:53 +01:00
|
|
|
#define EEPROM_VERSION "V53"
|
2016-06-30 03:18:46 +02:00
|
|
|
#define EEPROM_OFFSET 100
|
|
|
|
|
2018-01-05 03:27:17 +01:00
|
|
|
// Check the integrity of data offsets.
|
|
|
|
// Can be disabled for production build.
|
|
|
|
//#define DEBUG_EEPROM_READWRITE
|
|
|
|
|
2017-04-10 04:47:49 +02:00
|
|
|
#include "configuration_store.h"
|
2018-03-15 04:44:07 +01:00
|
|
|
|
|
|
|
#if ADD_PORT_ARG
|
|
|
|
#define PORTARG_SOLO const int8_t port
|
|
|
|
#define PORTARG_AFTER ,const int8_t port
|
|
|
|
#define PORTVAR_SOLO port
|
|
|
|
#else
|
|
|
|
#define PORTARG_SOLO
|
|
|
|
#define PORTARG_AFTER
|
|
|
|
#define PORTVAR_SOLO
|
|
|
|
#endif
|
|
|
|
|
2016-07-15 01:12:20 +02:00
|
|
|
#include "endstops.h"
|
2012-11-07 23:16:43 +01:00
|
|
|
#include "planner.h"
|
2017-06-03 07:38:07 +02:00
|
|
|
#include "stepper.h"
|
2017-09-06 13:28:32 +02:00
|
|
|
#include "temperature.h"
|
|
|
|
#include "../lcd/ultralcd.h"
|
|
|
|
#include "../core/language.h"
|
2018-01-05 02:59:43 +01:00
|
|
|
#include "../libs/vector_3.h"
|
|
|
|
#include "../gcode/gcode.h"
|
2017-09-06 13:28:32 +02:00
|
|
|
#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 15:05:11 +01:00
|
|
|
|
2017-09-08 22:35:25 +02:00
|
|
|
#if HAS_LEVELING
|
|
|
|
#include "../feature/bedlevel/bedlevel.h"
|
|
|
|
#endif
|
|
|
|
|
2017-09-06 13:28:32 +02:00
|
|
|
#if HAS_BED_PROBE
|
|
|
|
#include "../module/probe.h"
|
2015-04-28 04:48:34 +02:00
|
|
|
#endif
|
2015-03-15 23:18:11 +01:00
|
|
|
|
2018-03-15 04:03:53 +01:00
|
|
|
#if HAS_TRINAMIC
|
2017-03-07 06:00:43 +01:00
|
|
|
#include "stepper_indirection.h"
|
2018-03-15 04:03:53 +01:00
|
|
|
#include "../feature/tmc_util.h"
|
|
|
|
#define TMC_GET_PWMTHRS(P,Q) _tmc_thrs(stepper##Q.microsteps(), stepper##Q.TPWMTHRS(), planner.axis_steps_per_mm[P##_AXIS])
|
2017-03-07 06:00:43 +01:00
|
|
|
#endif
|
|
|
|
|
2017-09-06 13:28:32 +02:00
|
|
|
#if ENABLED(FWRETRACT)
|
|
|
|
#include "../feature/fwretract.h"
|
2017-03-18 16:15:54 +01:00
|
|
|
#endif
|
|
|
|
|
2018-02-22 19:28:46 +01:00
|
|
|
#if ENABLED(ADVANCED_PAUSE_FEATURE)
|
|
|
|
#include "../feature/pause.h"
|
|
|
|
#endif
|
|
|
|
|
2018-01-13 02:38:23 +01:00
|
|
|
#pragma pack(push, 1) // No padding between variables
|
|
|
|
|
2018-01-05 02:59:43 +01:00
|
|
|
typedef struct PID { float Kp, Ki, Kd; } PID;
|
|
|
|
typedef struct PIDC { float Kp, Ki, Kd, Kc; } PIDC;
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Current EEPROM Layout
|
|
|
|
*
|
|
|
|
* Keep this data structure up to date so
|
|
|
|
* EEPROM size is known at compile time!
|
|
|
|
*/
|
|
|
|
typedef struct SettingsDataStruct {
|
|
|
|
char version[4]; // Vnn\0
|
|
|
|
uint16_t crc; // Data Checksum
|
|
|
|
|
|
|
|
//
|
|
|
|
// DISTINCT_E_FACTORS
|
|
|
|
//
|
|
|
|
uint8_t esteppers; // XYZE_N - XYZ
|
|
|
|
|
|
|
|
float planner_axis_steps_per_mm[XYZE_N], // M92 XYZE planner.axis_steps_per_mm[XYZE_N]
|
|
|
|
planner_max_feedrate_mm_s[XYZE_N]; // M203 XYZE planner.max_feedrate_mm_s[XYZE_N]
|
|
|
|
uint32_t planner_max_acceleration_mm_per_s2[XYZE_N]; // M201 XYZE planner.max_acceleration_mm_per_s2[XYZE_N]
|
|
|
|
float planner_acceleration, // M204 P planner.acceleration
|
|
|
|
planner_retract_acceleration, // M204 R planner.retract_acceleration
|
|
|
|
planner_travel_acceleration, // M204 T planner.travel_acceleration
|
|
|
|
planner_min_feedrate_mm_s, // M205 S planner.min_feedrate_mm_s
|
|
|
|
planner_min_travel_feedrate_mm_s; // M205 T planner.min_travel_feedrate_mm_s
|
|
|
|
uint32_t planner_min_segment_time_us; // M205 B planner.min_segment_time_us
|
|
|
|
float planner_max_jerk[XYZE]; // M205 XYZE planner.max_jerk[XYZE]
|
|
|
|
|
|
|
|
float home_offset[XYZ]; // M206 XYZ
|
|
|
|
|
|
|
|
#if HOTENDS > 1
|
|
|
|
float hotend_offset[XYZ][HOTENDS - 1]; // M218 XYZ
|
|
|
|
#endif
|
|
|
|
|
|
|
|
//
|
|
|
|
// ENABLE_LEVELING_FADE_HEIGHT
|
|
|
|
//
|
|
|
|
float planner_z_fade_height; // M420 Zn planner.z_fade_height
|
|
|
|
|
|
|
|
//
|
|
|
|
// MESH_BED_LEVELING
|
|
|
|
//
|
|
|
|
float mbl_z_offset; // mbl.z_offset
|
|
|
|
uint8_t mesh_num_x, mesh_num_y; // GRID_MAX_POINTS_X, GRID_MAX_POINTS_Y
|
|
|
|
#if ENABLED(MESH_BED_LEVELING)
|
|
|
|
float mbl_z_values[GRID_MAX_POINTS_X][GRID_MAX_POINTS_Y]; // mbl.z_values
|
|
|
|
#else
|
|
|
|
float mbl_z_values[3][3];
|
|
|
|
#endif
|
|
|
|
|
|
|
|
//
|
|
|
|
// HAS_BED_PROBE
|
|
|
|
//
|
|
|
|
float zprobe_zoffset; // M851 Z
|
|
|
|
|
|
|
|
//
|
|
|
|
// ABL_PLANAR
|
|
|
|
//
|
|
|
|
matrix_3x3 planner_bed_level_matrix; // planner.bed_level_matrix
|
|
|
|
|
|
|
|
//
|
|
|
|
// AUTO_BED_LEVELING_BILINEAR
|
|
|
|
//
|
|
|
|
uint8_t grid_max_x, grid_max_y; // GRID_MAX_POINTS_X, GRID_MAX_POINTS_Y
|
|
|
|
int bilinear_grid_spacing[2],
|
|
|
|
bilinear_start[2]; // G29 L F
|
|
|
|
#if ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
|
|
|
float z_values[GRID_MAX_POINTS_X][GRID_MAX_POINTS_Y]; // G29
|
|
|
|
#else
|
|
|
|
float z_values[3][3];
|
|
|
|
#endif
|
|
|
|
|
|
|
|
//
|
|
|
|
// AUTO_BED_LEVELING_UBL
|
|
|
|
//
|
|
|
|
bool planner_leveling_active; // M420 S planner.leveling_active
|
|
|
|
int8_t ubl_storage_slot; // ubl.storage_slot
|
|
|
|
|
|
|
|
//
|
|
|
|
// DELTA / [XYZ]_DUAL_ENDSTOPS
|
|
|
|
//
|
|
|
|
#if ENABLED(DELTA)
|
|
|
|
float delta_height, // M666 H
|
|
|
|
delta_endstop_adj[ABC], // M666 XYZ
|
|
|
|
delta_radius, // M665 R
|
|
|
|
delta_diagonal_rod, // M665 L
|
|
|
|
delta_segments_per_second, // M665 S
|
|
|
|
delta_calibration_radius, // M665 B
|
|
|
|
delta_tower_angle_trim[ABC]; // M665 XYZ
|
|
|
|
#elif ENABLED(X_DUAL_ENDSTOPS) || ENABLED(Y_DUAL_ENDSTOPS) || ENABLED(Z_DUAL_ENDSTOPS)
|
|
|
|
float x_endstop_adj, // M666 X
|
|
|
|
y_endstop_adj, // M666 Y
|
|
|
|
z_endstop_adj; // M666 Z
|
|
|
|
#endif
|
|
|
|
|
|
|
|
//
|
|
|
|
// ULTIPANEL
|
|
|
|
//
|
2018-01-13 02:38:23 +01:00
|
|
|
int16_t lcd_preheat_hotend_temp[2], // M145 S0 H
|
|
|
|
lcd_preheat_bed_temp[2], // M145 S0 B
|
|
|
|
lcd_preheat_fan_speed[2]; // M145 S0 F
|
2018-01-05 02:59:43 +01:00
|
|
|
|
|
|
|
//
|
|
|
|
// PIDTEMP
|
|
|
|
//
|
|
|
|
PIDC hotendPID[MAX_EXTRUDERS]; // M301 En PIDC / M303 En U
|
|
|
|
|
|
|
|
int lpq_len; // M301 L
|
|
|
|
|
|
|
|
//
|
|
|
|
// PIDTEMPBED
|
|
|
|
//
|
|
|
|
PID bedPID; // M304 PID / M303 E-1 U
|
|
|
|
|
|
|
|
//
|
|
|
|
// HAS_LCD_CONTRAST
|
|
|
|
//
|
2018-01-10 06:41:14 +01:00
|
|
|
int16_t lcd_contrast; // M250 C
|
2018-01-05 02:59:43 +01:00
|
|
|
|
|
|
|
//
|
|
|
|
// FWRETRACT
|
|
|
|
//
|
|
|
|
bool autoretract_enabled; // M209 S
|
|
|
|
float retract_length, // M207 S
|
|
|
|
retract_feedrate_mm_s, // M207 F
|
|
|
|
retract_zlift, // M207 Z
|
|
|
|
retract_recover_length, // M208 S
|
|
|
|
retract_recover_feedrate_mm_s, // M208 F
|
|
|
|
swap_retract_length, // M207 W
|
|
|
|
swap_retract_recover_length, // M208 W
|
|
|
|
swap_retract_recover_feedrate_mm_s; // M208 R
|
|
|
|
|
|
|
|
//
|
|
|
|
// !NO_VOLUMETRIC
|
|
|
|
//
|
|
|
|
bool parser_volumetric_enabled; // M200 D parser.volumetric_enabled
|
|
|
|
float planner_filament_size[MAX_EXTRUDERS]; // M200 T D planner.filament_size[]
|
|
|
|
|
|
|
|
//
|
|
|
|
// HAS_TRINAMIC
|
|
|
|
//
|
2018-03-15 04:03:53 +01:00
|
|
|
#define TMC_AXES (MAX_EXTRUDERS + 6)
|
|
|
|
uint16_t tmc_stepper_current[TMC_AXES]; // M906 X Y Z X2 Y2 Z2 E0 E1 E2 E3 E4
|
|
|
|
uint32_t tmc_hybrid_threshold[TMC_AXES]; // M913 X Y Z X2 Y2 Z2 E0 E1 E2 E3 E4
|
2018-02-26 04:02:22 +01:00
|
|
|
int16_t tmc_sgt[XYZ]; // M914 X Y Z
|
2018-01-05 02:59:43 +01:00
|
|
|
|
|
|
|
//
|
|
|
|
// LIN_ADVANCE
|
|
|
|
//
|
2018-02-23 07:53:29 +01:00
|
|
|
float planner_extruder_advance_K; // M900 K planner.extruder_advance_K
|
2018-01-05 02:59:43 +01:00
|
|
|
|
|
|
|
//
|
|
|
|
// HAS_MOTOR_CURRENT_PWM
|
|
|
|
//
|
|
|
|
uint32_t motor_current_setting[XYZ]; // M907 X Z E
|
|
|
|
|
|
|
|
//
|
|
|
|
// CNC_COORDINATE_SYSTEMS
|
|
|
|
//
|
|
|
|
float coordinate_system[MAX_COORDINATE_SYSTEMS][XYZ]; // G54-G59.3
|
|
|
|
|
|
|
|
//
|
|
|
|
// SKEW_CORRECTION
|
|
|
|
//
|
|
|
|
float planner_xy_skew_factor, // M852 I planner.xy_skew_factor
|
|
|
|
planner_xz_skew_factor, // M852 J planner.xz_skew_factor
|
|
|
|
planner_yz_skew_factor; // M852 K planner.yz_skew_factor
|
|
|
|
|
|
|
|
//
|
|
|
|
// ADVANCED_PAUSE_FEATURE
|
|
|
|
//
|
|
|
|
float filament_change_unload_length[MAX_EXTRUDERS], // M603 T U
|
|
|
|
filament_change_load_length[MAX_EXTRUDERS]; // M603 T L
|
|
|
|
|
|
|
|
} SettingsData;
|
|
|
|
|
2018-01-13 02:38:23 +01:00
|
|
|
#pragma pack(pop)
|
|
|
|
|
2018-01-05 02:59:43 +01:00
|
|
|
MarlinSettings settings;
|
2017-10-14 00:21:25 +02:00
|
|
|
|
2018-01-05 03:01:25 +01:00
|
|
|
uint16_t MarlinSettings::datasize() { return sizeof(SettingsData); }
|
|
|
|
|
2015-04-27 03:44:01 +02:00
|
|
|
/**
|
2016-06-30 03:19:26 +02:00
|
|
|
* Post-process after Retrieve or Reset
|
2015-04-27 03:44:01 +02:00
|
|
|
*/
|
2018-01-05 02:59:43 +01:00
|
|
|
|
|
|
|
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
|
|
|
|
float new_z_fade_height;
|
|
|
|
#endif
|
|
|
|
|
2017-04-10 04:47:49 +02:00
|
|
|
void MarlinSettings::postprocess() {
|
2017-12-11 05:57:24 +01:00
|
|
|
const float oldpos[] = { current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS] };
|
2017-12-11 04:39:07 +01:00
|
|
|
|
2016-06-30 03:19:26 +02:00
|
|
|
// steps per s2 needs to be updated to agree with units per s2
|
|
|
|
planner.reset_acceleration_rates();
|
|
|
|
|
2016-07-24 04:36:26 +02:00
|
|
|
// Make sure delta kinematics are updated before refreshing the
|
|
|
|
// planner position so the stepper counts will be set correctly.
|
2016-06-30 03:19:26 +02:00
|
|
|
#if ENABLED(DELTA)
|
2017-11-08 10:07:17 +01:00
|
|
|
recalc_delta_settings();
|
2016-06-30 03:19:26 +02:00
|
|
|
#endif
|
2012-11-07 23:16:43 +01:00
|
|
|
|
2016-06-30 03:19:26 +02:00
|
|
|
#if ENABLED(PIDTEMP)
|
|
|
|
thermalManager.updatePID();
|
|
|
|
#endif
|
2012-11-07 23:16:43 +01:00
|
|
|
|
2017-12-20 02:44:11 +01:00
|
|
|
#if DISABLED(NO_VOLUMETRICS)
|
|
|
|
planner.calculate_volumetric_multipliers();
|
2017-12-27 03:04:39 +01:00
|
|
|
#else
|
|
|
|
for (uint8_t i = COUNT(planner.e_factor); i--;)
|
|
|
|
planner.refresh_e_factor(i);
|
2017-12-20 02:44:11 +01:00
|
|
|
#endif
|
2016-08-19 08:00:46 +02:00
|
|
|
|
2017-04-15 04:41:21 +02:00
|
|
|
#if HAS_HOME_OFFSET || ENABLED(DUAL_X_CARRIAGE)
|
2017-03-05 01:01:33 +01:00
|
|
|
// Software endstops depend on home_offset
|
|
|
|
LOOP_XYZ(i) update_software_endstops((AxisEnum)i);
|
|
|
|
#endif
|
2017-02-21 13:49:31 +01:00
|
|
|
|
|
|
|
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
|
2017-12-11 04:39:07 +01:00
|
|
|
set_z_fade_height(new_z_fade_height, false); // false = no report
|
2017-02-21 13:49:31 +01:00
|
|
|
#endif
|
2017-04-11 12:05:23 +02:00
|
|
|
|
2017-04-22 05:45:02 +02:00
|
|
|
#if ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
|
|
|
refresh_bed_level();
|
|
|
|
#endif
|
2017-06-03 07:38:07 +02:00
|
|
|
|
|
|
|
#if HAS_MOTOR_CURRENT_PWM
|
|
|
|
stepper.refresh_motor_power();
|
|
|
|
#endif
|
2017-09-29 15:03:28 +02:00
|
|
|
|
|
|
|
#if ENABLED(FWRETRACT)
|
|
|
|
fwretract.refresh_autoretract();
|
|
|
|
#endif
|
2017-12-20 02:11:07 +01:00
|
|
|
|
2017-12-11 04:39:07 +01: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 22:36:41 +01:00
|
|
|
|
2017-12-11 04:39:07 +01:00
|
|
|
// Various factors can change the current position
|
|
|
|
if (memcmp(oldpos, current_position, sizeof(oldpos)))
|
|
|
|
report_current_position();
|
2016-06-30 03:19:26 +02:00
|
|
|
}
|
2012-11-07 23:16:43 +01:00
|
|
|
|
2015-07-31 07:31:45 +02:00
|
|
|
#if ENABLED(EEPROM_SETTINGS)
|
2017-09-06 13:28:32 +02:00
|
|
|
#include "../HAL/persistent_store_api.h"
|
2015-01-28 10:08:48 +01:00
|
|
|
|
2017-05-07 03:00:56 +02:00
|
|
|
#define DUMMY_PID_VALUE 3000.0f
|
2017-06-18 01:36:10 +02:00
|
|
|
#define EEPROM_START() int eeprom_index = EEPROM_OFFSET; HAL::PersistentStore::access_start()
|
|
|
|
#define EEPROM_FINISH() HAL::PersistentStore::access_finish()
|
2017-05-07 03:00:56 +02:00
|
|
|
#define EEPROM_SKIP(VAR) eeprom_index += sizeof(VAR)
|
2017-06-18 01:36:10 +02:00
|
|
|
#define EEPROM_WRITE(VAR) HAL::PersistentStore::write_data(eeprom_index, (uint8_t*)&VAR, sizeof(VAR), &working_crc)
|
2018-01-05 02:51:18 +01: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-11-05 15:49:38 +01:00
|
|
|
#define EEPROM_ASSERT(TST,ERR) if (!(TST)) do{ SERIAL_ERROR_START_P(port); SERIAL_ERRORLNPGM_P(port, ERR); eeprom_error = true; }while(0)
|
2018-01-05 03:27:17 +01:00
|
|
|
|
|
|
|
#if ENABLED(DEBUG_EEPROM_READWRITE)
|
2018-01-06 02:00:26 +01:00
|
|
|
#define _FIELD_TEST(FIELD) \
|
|
|
|
EEPROM_ASSERT( \
|
|
|
|
eeprom_error || eeprom_index == offsetof(SettingsData, FIELD) + EEPROM_OFFSET, \
|
|
|
|
"Field " STRINGIFY(FIELD) " mismatch." \
|
2018-01-05 03:27:17 +01:00
|
|
|
)
|
|
|
|
#else
|
|
|
|
#define _FIELD_TEST(FIELD) NOOP
|
|
|
|
#endif
|
2017-05-07 03:00:56 +02:00
|
|
|
|
2016-12-09 13:13:44 +01:00
|
|
|
const char version[4] = EEPROM_VERSION;
|
|
|
|
|
2018-01-05 02:51:18 +01:00
|
|
|
bool MarlinSettings::eeprom_error, MarlinSettings::validating;
|
2017-04-10 04:47:49 +02:00
|
|
|
|
2018-03-15 04:44:07 +01:00
|
|
|
bool MarlinSettings::size_error(const uint16_t size PORTARG_AFTER) {
|
2018-01-05 03:01:25 +01:00
|
|
|
if (size != datasize()) {
|
2017-11-05 15:49:38 +01:00
|
|
|
#if ENABLED(EEPROM_CHITCHAT)
|
|
|
|
SERIAL_ERROR_START_P(port);
|
|
|
|
SERIAL_ERRORLNPGM_P(port, "EEPROM datasize error.");
|
|
|
|
#endif
|
2018-01-05 03:01:25 +01:00
|
|
|
return true;
|
|
|
|
}
|
|
|
|
return false;
|
|
|
|
}
|
|
|
|
|
2016-10-29 01:55:42 +02:00
|
|
|
/**
|
|
|
|
* M500 - Store Configuration
|
|
|
|
*/
|
2018-03-15 04:44:07 +01:00
|
|
|
bool MarlinSettings::save(PORTARG_SOLO) {
|
2016-10-29 01:55:42 +02:00
|
|
|
float dummy = 0.0f;
|
2018-01-06 02:00:26 +01:00
|
|
|
char ver[4] = "ERR";
|
2015-01-28 10:08:48 +01:00
|
|
|
|
2017-05-07 03:00:56 +02:00
|
|
|
uint16_t working_crc = 0;
|
|
|
|
|
2016-10-29 01:55:42 +02:00
|
|
|
EEPROM_START();
|
2015-01-28 10:08:48 +01:00
|
|
|
|
2017-05-07 03:00:56 +02: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 06:12:45 +01: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 03:00:56 +02:00
|
|
|
EEPROM_SKIP(working_crc); // Skip the checksum slot
|
2016-06-30 03:12:23 +02:00
|
|
|
|
2017-12-11 04:39:07 +01:00
|
|
|
working_crc = 0; // clear before first "real data"
|
2016-07-24 19:19:49 +02:00
|
|
|
|
2018-01-05 03:27:17 +01:00
|
|
|
_FIELD_TEST(esteppers);
|
|
|
|
|
2016-12-16 06:15:12 +01:00
|
|
|
const uint8_t esteppers = COUNT(planner.axis_steps_per_mm) - XYZ;
|
2016-12-09 12:45:55 +01:00
|
|
|
EEPROM_WRITE(esteppers);
|
2016-12-14 14:13:25 +01:00
|
|
|
|
2016-10-29 01:55:42 +02: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 12:45:55 +01:00
|
|
|
|
2016-10-29 01:55:42 +02: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-30 00:21:15 +01:00
|
|
|
EEPROM_WRITE(planner.min_segment_time_us);
|
2016-10-29 01:55:42 +02:00
|
|
|
EEPROM_WRITE(planner.max_jerk);
|
2018-01-05 03:27:17 +01:00
|
|
|
|
|
|
|
_FIELD_TEST(home_offset);
|
|
|
|
|
2017-04-15 04:41:21 +02:00
|
|
|
#if !HAS_HOME_OFFSET
|
2017-03-31 21:58:40 +02:00
|
|
|
const float home_offset[XYZ] = { 0 };
|
|
|
|
#endif
|
2017-11-09 05:10:08 +01:00
|
|
|
EEPROM_WRITE(home_offset);
|
2015-01-28 10:08:48 +01:00
|
|
|
|
2016-10-29 01:39:23 +02:00
|
|
|
#if HOTENDS > 1
|
|
|
|
// Skip hotend 0 which must be 0
|
|
|
|
for (uint8_t e = 1; e < HOTENDS; e++)
|
2016-10-29 01:55:42 +02:00
|
|
|
LOOP_XYZ(i) EEPROM_WRITE(hotend_offset[i][e]);
|
2016-10-29 01:39:23 +02:00
|
|
|
#endif
|
|
|
|
|
2017-02-21 13:49:31 +01:00
|
|
|
//
|
2017-04-22 23:04:28 +02:00
|
|
|
// Global Leveling
|
2017-02-21 13:49:31 +01:00
|
|
|
//
|
|
|
|
|
|
|
|
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
|
2017-04-22 23:04:28 +02:00
|
|
|
const float zfh = planner.z_fade_height;
|
2017-02-21 13:49:31 +01:00
|
|
|
#else
|
2017-12-11 04:39:07 +01:00
|
|
|
const float zfh = 10.0;
|
2017-02-21 13:49:31 +01:00
|
|
|
#endif
|
2017-04-22 23:04:28 +02:00
|
|
|
EEPROM_WRITE(zfh);
|
2017-02-21 13:49:31 +01:00
|
|
|
|
2016-12-10 07:17:49 +01:00
|
|
|
//
|
|
|
|
// Mesh Bed Leveling
|
|
|
|
//
|
|
|
|
|
2015-07-31 07:31:45 +02:00
|
|
|
#if ENABLED(MESH_BED_LEVELING)
|
2016-10-29 01:55:42 +02:00
|
|
|
// Compile time test that sizeof(mbl.z_values) is as expected
|
2017-04-18 22:26:27 +02:00
|
|
|
static_assert(
|
2017-05-12 06:22:35 +02:00
|
|
|
sizeof(mbl.z_values) == GRID_MAX_POINTS * sizeof(mbl.z_values[0][0]),
|
2017-04-18 22:26:27 +02:00
|
|
|
"MBL Z array is the wrong size."
|
|
|
|
);
|
2017-04-06 05:29:44 +02:00
|
|
|
const uint8_t mesh_num_x = GRID_MAX_POINTS_X, mesh_num_y = GRID_MAX_POINTS_Y;
|
2016-10-29 01:55:42 +02:00
|
|
|
EEPROM_WRITE(mbl.z_offset);
|
|
|
|
EEPROM_WRITE(mesh_num_x);
|
|
|
|
EEPROM_WRITE(mesh_num_y);
|
|
|
|
EEPROM_WRITE(mbl.z_values);
|
2017-04-22 23:04:28 +02:00
|
|
|
#else // For disabled MBL write a default mesh
|
2016-10-29 01:55:42 +02:00
|
|
|
dummy = 0.0f;
|
2016-12-14 08:44:39 +01:00
|
|
|
const uint8_t mesh_num_x = 3, mesh_num_y = 3;
|
2016-12-10 07:17:49 +01:00
|
|
|
EEPROM_WRITE(dummy); // z_offset
|
2016-10-29 01:55:42 +02:00
|
|
|
EEPROM_WRITE(mesh_num_x);
|
|
|
|
EEPROM_WRITE(mesh_num_y);
|
2016-12-10 07:17:49 +01:00
|
|
|
for (uint8_t q = mesh_num_x * mesh_num_y; q--;) EEPROM_WRITE(dummy);
|
2015-04-27 06:06:04 +02:00
|
|
|
#endif // MESH_BED_LEVELING
|
2015-03-15 23:18:11 +01:00
|
|
|
|
2018-01-05 03:27:17 +01:00
|
|
|
_FIELD_TEST(zprobe_zoffset);
|
|
|
|
|
2016-06-15 03:05:20 +02:00
|
|
|
#if !HAS_BED_PROBE
|
2017-04-11 12:05:23 +02:00
|
|
|
const float zprobe_zoffset = 0;
|
2015-03-26 05:14:00 +01:00
|
|
|
#endif
|
2016-10-29 01:55:42 +02:00
|
|
|
EEPROM_WRITE(zprobe_zoffset);
|
2015-03-26 05:14:00 +01:00
|
|
|
|
2016-12-14 08:50:06 +01: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 07:17:49 +01:00
|
|
|
//
|
|
|
|
// Bilinear Auto Bed Leveling
|
|
|
|
//
|
|
|
|
|
|
|
|
#if ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
2017-04-22 05:46:19 +02:00
|
|
|
// Compile time test that sizeof(z_values) is as expected
|
2017-04-18 22:26:27 +02:00
|
|
|
static_assert(
|
2017-05-12 06:22:35 +02:00
|
|
|
sizeof(z_values) == GRID_MAX_POINTS * sizeof(z_values[0][0]),
|
2017-04-18 22:26:27 +02:00
|
|
|
"Bilinear Z array is the wrong size."
|
|
|
|
);
|
2017-04-06 05:29:44 +02:00
|
|
|
const uint8_t grid_max_x = GRID_MAX_POINTS_X, grid_max_y = GRID_MAX_POINTS_Y;
|
2016-12-10 07:17:49 +01: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 05:46:19 +02:00
|
|
|
EEPROM_WRITE(z_values); // 9-256 floats
|
2016-12-10 07:17:49 +01: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
|
|
|
|
|
2018-01-05 03:27:17 +01:00
|
|
|
_FIELD_TEST(planner_leveling_active);
|
|
|
|
|
2017-04-22 23:04:28 +02:00
|
|
|
#if ENABLED(AUTO_BED_LEVELING_UBL)
|
2017-10-14 00:21:25 +02:00
|
|
|
EEPROM_WRITE(planner.leveling_active);
|
2017-10-14 04:56:27 +02:00
|
|
|
EEPROM_WRITE(ubl.storage_slot);
|
2017-04-22 23:04:28 +02:00
|
|
|
#else
|
2017-05-16 09:34:36 +02:00
|
|
|
const bool ubl_active = false;
|
2017-05-07 03:00:56 +02:00
|
|
|
const int8_t storage_slot = -1;
|
2017-04-22 23:04:28 +02:00
|
|
|
EEPROM_WRITE(ubl_active);
|
2017-05-07 03:00:56 +02:00
|
|
|
EEPROM_WRITE(storage_slot);
|
2017-05-09 19:35:43 +02:00
|
|
|
#endif // AUTO_BED_LEVELING_UBL
|
2017-04-22 23:04:28 +02:00
|
|
|
|
2017-12-01 05:45:17 +01:00
|
|
|
// 11 floats for DELTA / [XYZ]_DUAL_ENDSTOPS
|
2015-07-31 07:31:45 +02:00
|
|
|
#if ENABLED(DELTA)
|
2018-01-10 01:33:44 +01:00
|
|
|
|
2018-01-05 03:27:17 +01:00
|
|
|
_FIELD_TEST(delta_height);
|
2018-01-10 01:33:44 +01:00
|
|
|
|
2017-11-09 05:10:08 +01:00
|
|
|
EEPROM_WRITE(delta_height); // 1 float
|
2017-09-24 09:18:15 +02:00
|
|
|
EEPROM_WRITE(delta_endstop_adj); // 3 floats
|
2016-10-29 01:55:42 +02: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 16:36:33 +02:00
|
|
|
EEPROM_WRITE(delta_calibration_radius); // 1 float
|
2017-09-24 09:18:15 +02:00
|
|
|
EEPROM_WRITE(delta_tower_angle_trim); // 3 floats
|
2017-10-29 09:43:44 +01:00
|
|
|
|
|
|
|
#elif ENABLED(X_DUAL_ENDSTOPS) || ENABLED(Y_DUAL_ENDSTOPS) || ENABLED(Z_DUAL_ENDSTOPS)
|
2018-01-10 01:33:44 +01:00
|
|
|
|
2018-01-05 03:27:17 +01:00
|
|
|
_FIELD_TEST(x_endstop_adj);
|
2018-01-10 01:33:44 +01:00
|
|
|
|
2017-10-29 09:43:44 +01:00
|
|
|
// Write dual endstops in X, Y, Z order. Unused = 0.0
|
2017-04-29 16:36:33 +02:00
|
|
|
dummy = 0.0f;
|
2017-10-29 09:43:44 +01: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
|
|
|
|
|
2015-01-28 10:08:48 +01:00
|
|
|
#endif
|
|
|
|
|
2018-01-05 03:27:17 +01:00
|
|
|
_FIELD_TEST(lcd_preheat_hotend_temp);
|
|
|
|
|
2015-07-31 07:31:45 +02:00
|
|
|
#if DISABLED(ULTIPANEL)
|
2018-01-19 22:24:13 +01:00
|
|
|
constexpr int16_t 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 };
|
2017-06-06 00:41:38 +02:00
|
|
|
#endif
|
2016-10-29 01:55:42 +02:00
|
|
|
|
2016-10-27 09:40:37 +02:00
|
|
|
EEPROM_WRITE(lcd_preheat_hotend_temp);
|
|
|
|
EEPROM_WRITE(lcd_preheat_bed_temp);
|
|
|
|
EEPROM_WRITE(lcd_preheat_fan_speed);
|
2016-10-29 01:55:42 +02: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 02:49:34 +02:00
|
|
|
#if ENABLED(PID_EXTRUSION_SCALING)
|
2016-10-29 01:55:42 +02:00
|
|
|
EEPROM_WRITE(PID_PARAM(Kc, e));
|
2015-01-28 10:08:48 +01:00
|
|
|
#else
|
2016-10-29 01:55:42 +02:00
|
|
|
dummy = 1.0f; // 1.0 = default kc
|
|
|
|
EEPROM_WRITE(dummy);
|
2015-01-28 10:08:48 +01:00
|
|
|
#endif
|
|
|
|
}
|
2016-10-29 01:55:42 +02: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 10:08:48 +01:00
|
|
|
}
|
2016-10-29 01:55:42 +02:00
|
|
|
|
|
|
|
} // Hotends Loop
|
2015-01-28 10:08:48 +01:00
|
|
|
|
2018-01-10 01:33:44 +01:00
|
|
|
_FIELD_TEST(lpq_len);
|
|
|
|
|
2016-08-01 02:49:34 +02:00
|
|
|
#if DISABLED(PID_EXTRUSION_SCALING)
|
2016-10-29 01:55:42 +02:00
|
|
|
int lpq_len = 20;
|
2015-08-31 04:04:30 +02:00
|
|
|
#endif
|
2016-10-29 01:55:42 +02:00
|
|
|
EEPROM_WRITE(lpq_len);
|
|
|
|
|
|
|
|
#if DISABLED(PIDTEMPBED)
|
|
|
|
dummy = DUMMY_PID_VALUE;
|
|
|
|
for (uint8_t q = 3; q--;) EEPROM_WRITE(dummy);
|
2016-04-29 03:18:13 +02:00
|
|
|
#else
|
2016-10-29 01:55:42 +02:00
|
|
|
EEPROM_WRITE(thermalManager.bedKp);
|
|
|
|
EEPROM_WRITE(thermalManager.bedKi);
|
|
|
|
EEPROM_WRITE(thermalManager.bedKd);
|
2015-04-04 01:38:05 +02:00
|
|
|
#endif
|
|
|
|
|
2018-01-05 03:27:17 +01:00
|
|
|
_FIELD_TEST(lcd_contrast);
|
|
|
|
|
2016-05-31 20:47:02 +02:00
|
|
|
#if !HAS_LCD_CONTRAST
|
2018-01-10 06:41:14 +01:00
|
|
|
const int16_t lcd_contrast = 32;
|
2015-01-28 10:08:48 +01:00
|
|
|
#endif
|
2016-10-29 01:55:42 +02:00
|
|
|
EEPROM_WRITE(lcd_contrast);
|
2015-01-28 10:08:48 +01:00
|
|
|
|
2017-07-18 05:01:41 +02:00
|
|
|
#if DISABLED(FWRETRACT)
|
|
|
|
const bool autoretract_enabled = false;
|
2017-09-08 05:40:32 +02: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 05:01:41 +02:00
|
|
|
#endif
|
2015-01-28 10:08:48 +01:00
|
|
|
|
2017-12-20 02:44:11 +01:00
|
|
|
//
|
|
|
|
// Volumetric & Filament Size
|
|
|
|
//
|
2018-01-10 01:33:44 +01:00
|
|
|
|
2018-01-05 03:27:17 +01:00
|
|
|
_FIELD_TEST(parser_volumetric_enabled);
|
2018-01-10 01:33:44 +01:00
|
|
|
|
2017-12-20 02:44:11 +01:00
|
|
|
#if DISABLED(NO_VOLUMETRICS)
|
|
|
|
|
|
|
|
EEPROM_WRITE(parser.volumetric_enabled);
|
2015-01-28 10:08:48 +01:00
|
|
|
|
2017-12-20 02:44:11 +01: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 03:23:24 +01: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 02:44:11 +01:00
|
|
|
#endif
|
2015-01-28 10:08:48 +01:00
|
|
|
|
2018-01-05 02:47:42 +01:00
|
|
|
//
|
2017-12-15 22:03:14 +01:00
|
|
|
// Save TMC2130 or TMC2208 Configuration, and placeholder values
|
2018-01-05 02:47:42 +01:00
|
|
|
//
|
2018-01-10 01:33:44 +01:00
|
|
|
|
2018-01-05 03:27:17 +01:00
|
|
|
_FIELD_TEST(tmc_stepper_current);
|
2018-01-10 01:33:44 +01:00
|
|
|
|
2018-03-15 04:03:53 +01:00
|
|
|
uint16_t tmc_stepper_current[TMC_AXES] = {
|
2018-01-05 02:47:42 +01:00
|
|
|
#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 21:58:40 +02:00
|
|
|
#else
|
2018-01-05 02:47:42 +01:00
|
|
|
0
|
2017-03-31 21:58:40 +02:00
|
|
|
#endif
|
2018-01-05 02:47:42 +01:00
|
|
|
};
|
2018-03-15 04:03:53 +01:00
|
|
|
EEPROM_WRITE(tmc_stepper_current);
|
|
|
|
|
|
|
|
//
|
|
|
|
// Save TMC2130 or TMC2208 Hybrid Threshold, and placeholder values
|
|
|
|
//
|
|
|
|
|
|
|
|
_FIELD_TEST(tmc_hybrid_threshold);
|
|
|
|
|
|
|
|
uint32_t tmc_hybrid_threshold[TMC_AXES] = {
|
|
|
|
#if HAS_TRINAMIC
|
|
|
|
#if X_IS_TRINAMIC
|
|
|
|
TMC_GET_PWMTHRS(X, X),
|
|
|
|
#else
|
|
|
|
X_HYBRID_THRESHOLD,
|
|
|
|
#endif
|
|
|
|
#if Y_IS_TRINAMIC
|
|
|
|
TMC_GET_PWMTHRS(Y, Y),
|
|
|
|
#else
|
|
|
|
Y_HYBRID_THRESHOLD,
|
|
|
|
#endif
|
|
|
|
#if Z_IS_TRINAMIC
|
|
|
|
TMC_GET_PWMTHRS(Z, Z),
|
|
|
|
#else
|
|
|
|
Z_HYBRID_THRESHOLD,
|
|
|
|
#endif
|
|
|
|
#if X2_IS_TRINAMIC
|
|
|
|
TMC_GET_PWMTHRS(X, X2),
|
|
|
|
#else
|
|
|
|
X2_HYBRID_THRESHOLD,
|
|
|
|
#endif
|
|
|
|
#if Y2_IS_TRINAMIC
|
|
|
|
TMC_GET_PWMTHRS(Y, Y2),
|
|
|
|
#else
|
|
|
|
Y2_HYBRID_THRESHOLD,
|
|
|
|
#endif
|
|
|
|
#if Z2_IS_TRINAMIC
|
|
|
|
TMC_GET_PWMTHRS(Z, Z2),
|
|
|
|
#else
|
|
|
|
Z2_HYBRID_THRESHOLD,
|
|
|
|
#endif
|
|
|
|
#if E0_IS_TRINAMIC
|
|
|
|
TMC_GET_PWMTHRS(E, E0),
|
|
|
|
#else
|
|
|
|
E0_HYBRID_THRESHOLD,
|
|
|
|
#endif
|
|
|
|
#if E1_IS_TRINAMIC
|
|
|
|
TMC_GET_PWMTHRS(E, E1),
|
|
|
|
#else
|
|
|
|
E1_HYBRID_THRESHOLD,
|
|
|
|
#endif
|
|
|
|
#if E2_IS_TRINAMIC
|
|
|
|
TMC_GET_PWMTHRS(E, E2),
|
|
|
|
#else
|
|
|
|
E2_HYBRID_THRESHOLD,
|
|
|
|
#endif
|
|
|
|
#if E3_IS_TRINAMIC
|
|
|
|
TMC_GET_PWMTHRS(E, E3),
|
|
|
|
#else
|
|
|
|
E3_HYBRID_THRESHOLD,
|
|
|
|
#endif
|
|
|
|
#if E4_IS_TRINAMIC
|
|
|
|
TMC_GET_PWMTHRS(E, E4)
|
|
|
|
#else
|
|
|
|
E4_HYBRID_THRESHOLD
|
|
|
|
#endif
|
|
|
|
#else
|
|
|
|
100, 100, 3, // X, Y, Z
|
|
|
|
100, 100, 3, // X2, Y2, Z2
|
|
|
|
30, 30, 30, 30, 30 // E0, E1, E2, E3, E4
|
|
|
|
#endif
|
|
|
|
};
|
|
|
|
EEPROM_WRITE(tmc_hybrid_threshold);
|
2017-03-07 06:00:43 +01:00
|
|
|
|
2017-12-15 22:03:14 +01:00
|
|
|
//
|
|
|
|
// TMC2130 Sensorless homing threshold
|
|
|
|
//
|
2018-03-15 04:03:53 +01:00
|
|
|
int16_t tmc_sgt[XYZ] = {
|
2018-02-26 04:02:22 +01:00
|
|
|
#if ENABLED(SENSORLESS_HOMING)
|
2018-03-15 04:03:53 +01:00
|
|
|
#if defined(X_HOMING_SENSITIVITY) && (ENABLED(X_IS_TMC2130) || ENABLED(IS_TRAMS))
|
2018-02-26 04:02:22 +01:00
|
|
|
stepperX.sgt(),
|
|
|
|
#else
|
|
|
|
0,
|
|
|
|
#endif
|
2018-03-15 04:03:53 +01:00
|
|
|
#if defined(Y_HOMING_SENSITIVITY) && (ENABLED(Y_IS_TMC2130) || ENABLED(IS_TRAMS))
|
2018-02-26 04:02:22 +01:00
|
|
|
stepperY.sgt(),
|
|
|
|
#else
|
|
|
|
0
|
|
|
|
#endif
|
2018-03-15 04:03:53 +01:00
|
|
|
#if defined(Z_HOMING_SENSITIVITY) && (ENABLED(Z_IS_TMC2130) || ENABLED(IS_TRAMS))
|
2018-02-26 04:02:22 +01:00
|
|
|
stepperZ.sgt()
|
|
|
|
#else
|
|
|
|
0
|
|
|
|
#endif
|
2018-02-08 11:20:44 +01:00
|
|
|
#else
|
2018-02-26 04:02:22 +01:00
|
|
|
0
|
2018-02-08 11:20:44 +01:00
|
|
|
#endif
|
2018-02-26 04:02:22 +01:00
|
|
|
};
|
2018-03-15 04:03:53 +01:00
|
|
|
EEPROM_WRITE(tmc_sgt);
|
2017-12-15 22:03:14 +01:00
|
|
|
|
2017-04-16 05:18:10 +02:00
|
|
|
//
|
|
|
|
// Linear Advance
|
|
|
|
//
|
2018-01-10 01:33:44 +01:00
|
|
|
|
2018-02-23 07:53:29 +01:00
|
|
|
_FIELD_TEST(planner_extruder_advance_K);
|
2018-01-10 01:33:44 +01:00
|
|
|
|
2017-04-16 05:18:10 +02:00
|
|
|
#if ENABLED(LIN_ADVANCE)
|
2018-02-23 07:53:29 +01:00
|
|
|
EEPROM_WRITE(planner.extruder_advance_K);
|
2017-04-22 05:30:36 +02:00
|
|
|
#else
|
|
|
|
dummy = 0.0f;
|
|
|
|
EEPROM_WRITE(dummy);
|
2017-04-16 05:18:10 +02:00
|
|
|
#endif
|
|
|
|
|
2018-01-10 01:33:44 +01:00
|
|
|
_FIELD_TEST(motor_current_setting);
|
|
|
|
|
2017-06-03 07:38:07 +02:00
|
|
|
#if HAS_MOTOR_CURRENT_PWM
|
2018-02-26 04:02:22 +01:00
|
|
|
for (uint8_t q = XYZ; q--;) EEPROM_WRITE(stepper.motor_current_setting[q]);
|
2017-06-03 07:38:07 +02:00
|
|
|
#else
|
2018-02-26 04:02:22 +01:00
|
|
|
const uint32_t dummyui32[XYZ] = { 0 };
|
|
|
|
EEPROM_WRITE(dummyui32);
|
2017-06-03 07:38:07 +02:00
|
|
|
#endif
|
|
|
|
|
2017-12-01 23:42:23 +01:00
|
|
|
//
|
|
|
|
// CNC Coordinate Systems
|
|
|
|
//
|
2018-01-10 01:33:44 +01:00
|
|
|
|
2018-01-05 03:27:17 +01:00
|
|
|
_FIELD_TEST(coordinate_system);
|
2018-01-10 01:33:44 +01:00
|
|
|
|
2017-11-04 22:36:41 +01:00
|
|
|
#if ENABLED(CNC_COORDINATE_SYSTEMS)
|
|
|
|
EEPROM_WRITE(coordinate_system); // 27 floats
|
|
|
|
#else
|
|
|
|
dummy = 0.0f;
|
2018-01-05 02:59:43 +01:00
|
|
|
for (uint8_t q = MAX_COORDINATE_SYSTEMS * XYZ; q--;) EEPROM_WRITE(dummy);
|
2017-11-04 22:36:41 +01:00
|
|
|
#endif
|
|
|
|
|
2017-12-01 23:42:23 +01:00
|
|
|
//
|
|
|
|
// Skew correction factors
|
|
|
|
//
|
2018-01-10 01:33:44 +01:00
|
|
|
|
2018-01-05 03:27:17 +01:00
|
|
|
_FIELD_TEST(planner_xy_skew_factor);
|
2018-01-10 01:33:44 +01:00
|
|
|
|
2017-12-01 23:42:23 +01:00
|
|
|
#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;
|
2018-03-15 04:03:53 +01:00
|
|
|
for (uint8_t q = 3; q--;) EEPROM_WRITE(dummy);
|
2017-12-01 23:42:23 +01:00
|
|
|
#endif
|
|
|
|
|
2018-01-04 12:06:34 +01:00
|
|
|
//
|
|
|
|
// Advanced Pause filament load & unload lengths
|
|
|
|
//
|
2018-01-10 01:33:44 +01:00
|
|
|
|
2018-01-05 03:27:17 +01:00
|
|
|
_FIELD_TEST(filament_change_unload_length);
|
2018-01-10 01:33:44 +01:00
|
|
|
|
2018-01-04 12:06:34 +01:00
|
|
|
#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 02:51:18 +01:00
|
|
|
//
|
2018-01-05 03:01:25 +01:00
|
|
|
// Validate CRC and Data Size
|
2018-01-05 02:51:18 +01:00
|
|
|
//
|
2017-05-07 03:00:56 +02:00
|
|
|
if (!eeprom_error) {
|
2018-01-05 02:59:43 +01:00
|
|
|
const uint16_t eeprom_size = eeprom_index - (EEPROM_OFFSET),
|
|
|
|
final_crc = working_crc;
|
2017-05-11 16:48:16 +02:00
|
|
|
|
2016-12-14 08:48:42 +01:00
|
|
|
// Write the EEPROM header
|
|
|
|
eeprom_index = EEPROM_OFFSET;
|
2017-05-11 16:48:16 +02:00
|
|
|
|
2016-12-14 08:48:42 +01:00
|
|
|
EEPROM_WRITE(version);
|
2017-05-17 23:16:38 +02:00
|
|
|
EEPROM_WRITE(final_crc);
|
2016-10-29 01:55:42 +02:00
|
|
|
|
2016-12-14 08:48:42 +01:00
|
|
|
// Report storage size
|
2017-07-02 04:48:18 +02:00
|
|
|
#if ENABLED(EEPROM_CHITCHAT)
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHO_START_P(port);
|
|
|
|
SERIAL_ECHOPAIR_P(port, "Settings Stored (", eeprom_size);
|
|
|
|
SERIAL_ECHOPAIR_P(port, " bytes; crc ", (uint32_t)final_crc);
|
|
|
|
SERIAL_ECHOLNPGM_P(port, ")");
|
2017-07-02 04:48:18 +02:00
|
|
|
#endif
|
2018-01-05 03:01:25 +01:00
|
|
|
|
|
|
|
eeprom_error |= size_error(eeprom_size);
|
2016-12-14 08:48:42 +01:00
|
|
|
}
|
2017-10-18 21:00:29 +02:00
|
|
|
EEPROM_FINISH();
|
2017-03-20 12:10:31 +01:00
|
|
|
|
2018-01-05 02:51:18 +01:00
|
|
|
//
|
|
|
|
// UBL Mesh
|
|
|
|
//
|
2017-04-22 23:04:28 +02:00
|
|
|
#if ENABLED(UBL_SAVE_ACTIVE_ON_M500)
|
2017-10-14 04:56:27 +02:00
|
|
|
if (ubl.storage_slot >= 0)
|
|
|
|
store_mesh(ubl.storage_slot);
|
2017-03-18 16:15:54 +01:00
|
|
|
#endif
|
2017-10-29 09:43:44 +01:00
|
|
|
|
2017-05-07 03:00:56 +02:00
|
|
|
return !eeprom_error;
|
2016-10-29 01:55:42 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
/**
|
|
|
|
* M501 - Retrieve Configuration
|
|
|
|
*/
|
2018-03-15 04:44:07 +01:00
|
|
|
bool MarlinSettings::_load(PORTARG_SOLO) {
|
2017-05-07 03:00:56 +02:00
|
|
|
uint16_t working_crc = 0;
|
2016-10-29 01:55:42 +02:00
|
|
|
|
|
|
|
EEPROM_START();
|
|
|
|
|
|
|
|
char stored_ver[4];
|
2018-01-05 02:51:18 +01:00
|
|
|
EEPROM_READ_ALWAYS(stored_ver);
|
2016-10-29 01:55:42 +02:00
|
|
|
|
2017-05-07 03:00:56 +02:00
|
|
|
uint16_t stored_crc;
|
2018-01-05 02:51:18 +01:00
|
|
|
EEPROM_READ_ALWAYS(stored_crc);
|
2016-10-29 01:55:42 +02:00
|
|
|
|
2016-12-09 12:45:55 +01:00
|
|
|
// Version has to match or defaults are used
|
2016-10-29 01:55:42 +02:00
|
|
|
if (strncmp(version, stored_ver, 3) != 0) {
|
2018-01-06 02:00:26 +01:00
|
|
|
if (stored_ver[3] != '\0') {
|
2017-03-04 08:20:36 +01:00
|
|
|
stored_ver[0] = '?';
|
|
|
|
stored_ver[1] = '\0';
|
|
|
|
}
|
2017-07-02 04:48:18 +02:00
|
|
|
#if ENABLED(EEPROM_CHITCHAT)
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHO_START_P(port);
|
|
|
|
SERIAL_ECHOPGM_P(port, "EEPROM version mismatch ");
|
|
|
|
SERIAL_ECHOPAIR_P(port, "(EEPROM=", stored_ver);
|
|
|
|
SERIAL_ECHOLNPGM_P(port, " Marlin=" EEPROM_VERSION ")");
|
2017-07-02 04:48:18 +02:00
|
|
|
#endif
|
2018-01-05 02:51:18 +01:00
|
|
|
if (!validating) reset();
|
|
|
|
eeprom_error = true;
|
2016-06-30 03:12:23 +02:00
|
|
|
}
|
2016-10-29 01:55:42 +02:00
|
|
|
else {
|
|
|
|
float dummy = 0;
|
2018-02-17 15:27:54 +01:00
|
|
|
#if DISABLED(AUTO_BED_LEVELING_UBL) || DISABLED(FWRETRACT) || ENABLED(NO_VOLUMETRICS)
|
2018-01-03 04:00:06 +01:00
|
|
|
bool dummyb;
|
|
|
|
#endif
|
2015-01-28 10:08:48 +01:00
|
|
|
|
2017-12-11 04:39:07 +01:00
|
|
|
working_crc = 0; // Init to 0. Accumulated by EEPROM_READ
|
2016-10-29 01:55:42 +02:00
|
|
|
|
2018-01-10 01:33:44 +01:00
|
|
|
_FIELD_TEST(esteppers);
|
|
|
|
|
2016-12-09 12:45:55 +01:00
|
|
|
// Number of esteppers may change
|
|
|
|
uint8_t esteppers;
|
2018-01-05 02:51:18 +01:00
|
|
|
EEPROM_READ_ALWAYS(esteppers);
|
2016-12-09 12:45:55 +01:00
|
|
|
|
2017-11-04 21:34:24 +01:00
|
|
|
//
|
|
|
|
// Planner Motion
|
|
|
|
//
|
|
|
|
|
2016-12-09 12:45:55 +01: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 05:04:18 +01:00
|
|
|
const uint32_t def3[] = DEFAULT_MAX_ACCELERATION;
|
2016-12-09 12:45:55 +01:00
|
|
|
float tmp1[XYZ + esteppers], tmp2[XYZ + esteppers];
|
2016-12-16 05:04:18 +01:00
|
|
|
uint32_t tmp3[XYZ + esteppers];
|
2016-12-09 12:45:55 +01:00
|
|
|
EEPROM_READ(tmp1);
|
|
|
|
EEPROM_READ(tmp2);
|
|
|
|
EEPROM_READ(tmp3);
|
2018-01-05 02:51:18 +01:00
|
|
|
if (!validating) LOOP_XYZE_N(i) {
|
2016-12-09 12:45:55 +01: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-29 01:55:42 +02: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-30 00:21:15 +01:00
|
|
|
EEPROM_READ(planner.min_segment_time_us);
|
2016-10-29 01:55:42 +02:00
|
|
|
EEPROM_READ(planner.max_jerk);
|
2017-03-05 01:01:33 +01:00
|
|
|
|
2017-11-04 21:34:24 +01:00
|
|
|
//
|
|
|
|
// Home Offset (M206)
|
|
|
|
//
|
|
|
|
|
2018-01-10 01:33:44 +01:00
|
|
|
_FIELD_TEST(home_offset);
|
|
|
|
|
2017-04-15 04:41:21 +02:00
|
|
|
#if !HAS_HOME_OFFSET
|
2017-03-05 01:01:33 +01:00
|
|
|
float home_offset[XYZ];
|
|
|
|
#endif
|
2016-10-29 01:55:42 +02:00
|
|
|
EEPROM_READ(home_offset);
|
|
|
|
|
2017-11-04 21:34:24 +01:00
|
|
|
//
|
|
|
|
// Hotend Offsets, if any
|
|
|
|
//
|
|
|
|
|
2016-10-29 01:55:42 +02: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 13:49:31 +01:00
|
|
|
//
|
2017-04-22 23:04:28 +02:00
|
|
|
// Global Leveling
|
2017-02-21 13:49:31 +01:00
|
|
|
//
|
|
|
|
|
|
|
|
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
|
2017-10-14 00:21:25 +02:00
|
|
|
EEPROM_READ(new_z_fade_height);
|
2017-02-21 13:49:31 +01:00
|
|
|
#else
|
|
|
|
EEPROM_READ(dummy);
|
|
|
|
#endif
|
|
|
|
|
2016-12-10 07:17:49 +01:00
|
|
|
//
|
|
|
|
// Mesh (Manual) Bed Leveling
|
|
|
|
//
|
|
|
|
|
2016-12-14 08:44:39 +01:00
|
|
|
uint8_t mesh_num_x, mesh_num_y;
|
2016-10-29 01:55:42 +02:00
|
|
|
EEPROM_READ(dummy);
|
2018-01-05 02:51:18 +01:00
|
|
|
EEPROM_READ_ALWAYS(mesh_num_x);
|
|
|
|
EEPROM_READ_ALWAYS(mesh_num_y);
|
2016-12-14 08:44:39 +01:00
|
|
|
|
2016-10-29 01:55:42 +02:00
|
|
|
#if ENABLED(MESH_BED_LEVELING)
|
2018-01-07 06:47:29 +01:00
|
|
|
if (!validating) mbl.z_offset = dummy;
|
2017-04-06 05:29:44 +02:00
|
|
|
if (mesh_num_x == GRID_MAX_POINTS_X && mesh_num_y == GRID_MAX_POINTS_Y) {
|
2016-10-29 01:55:42 +02:00
|
|
|
// EEPROM data fits the current mesh
|
|
|
|
EEPROM_READ(mbl.z_values);
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
// EEPROM data is stale
|
2018-01-05 02:51:18 +01:00
|
|
|
if (!validating) mbl.reset();
|
2016-12-10 07:17:49 +01:00
|
|
|
for (uint16_t q = mesh_num_x * mesh_num_y; q--;) EEPROM_READ(dummy);
|
2016-10-29 01:55:42 +02:00
|
|
|
}
|
|
|
|
#else
|
|
|
|
// MBL is disabled - skip the stored data
|
2016-12-10 07:17:49 +01:00
|
|
|
for (uint16_t q = mesh_num_x * mesh_num_y; q--;) EEPROM_READ(dummy);
|
2016-10-29 01:55:42 +02:00
|
|
|
#endif // MESH_BED_LEVELING
|
|
|
|
|
2018-01-10 01:33:44 +01:00
|
|
|
_FIELD_TEST(zprobe_zoffset);
|
|
|
|
|
2016-10-29 01:55:42 +02:00
|
|
|
#if !HAS_BED_PROBE
|
2017-04-11 12:05:23 +02:00
|
|
|
float zprobe_zoffset;
|
2016-10-29 01:55:42 +02:00
|
|
|
#endif
|
|
|
|
EEPROM_READ(zprobe_zoffset);
|
|
|
|
|
2016-12-14 08:50:06 +01: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 07:17:49 +01:00
|
|
|
//
|
|
|
|
// Bilinear Auto Bed Leveling
|
|
|
|
//
|
|
|
|
|
|
|
|
uint8_t grid_max_x, grid_max_y;
|
2018-01-05 02:51:18 +01:00
|
|
|
EEPROM_READ_ALWAYS(grid_max_x); // 1 byte
|
|
|
|
EEPROM_READ_ALWAYS(grid_max_y); // 1 byte
|
2016-12-10 07:17:49 +01:00
|
|
|
#if ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
2017-04-06 05:29:44 +02:00
|
|
|
if (grid_max_x == GRID_MAX_POINTS_X && grid_max_y == GRID_MAX_POINTS_Y) {
|
2018-01-05 02:51:18 +01:00
|
|
|
if (!validating) set_bed_leveling_enabled(false);
|
2016-12-10 07:17:49 +01:00
|
|
|
EEPROM_READ(bilinear_grid_spacing); // 2 ints
|
|
|
|
EEPROM_READ(bilinear_start); // 2 ints
|
2017-04-22 05:46:19 +02:00
|
|
|
EEPROM_READ(z_values); // 9 to 256 floats
|
2016-12-10 07:17:49 +01: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 21:34:24 +01:00
|
|
|
//
|
|
|
|
// Unified Bed Leveling active state
|
|
|
|
//
|
|
|
|
|
2018-01-10 01:33:44 +01:00
|
|
|
_FIELD_TEST(planner_leveling_active);
|
|
|
|
|
2017-04-22 23:04:28 +02:00
|
|
|
#if ENABLED(AUTO_BED_LEVELING_UBL)
|
2017-10-14 00:21:25 +02:00
|
|
|
EEPROM_READ(planner.leveling_active);
|
2017-10-14 04:56:27 +02:00
|
|
|
EEPROM_READ(ubl.storage_slot);
|
2017-04-22 23:04:28 +02:00
|
|
|
#else
|
|
|
|
uint8_t dummyui8;
|
|
|
|
EEPROM_READ(dummyb);
|
|
|
|
EEPROM_READ(dummyui8);
|
2017-05-09 19:35:43 +02:00
|
|
|
#endif // AUTO_BED_LEVELING_UBL
|
2017-04-22 23:04:28 +02:00
|
|
|
|
2017-11-04 21:34:24 +01:00
|
|
|
//
|
|
|
|
// DELTA Geometry or Dual Endstops offsets
|
|
|
|
//
|
|
|
|
|
2016-10-29 01:55:42 +02:00
|
|
|
#if ENABLED(DELTA)
|
2018-01-10 01:33:44 +01:00
|
|
|
|
|
|
|
_FIELD_TEST(delta_height);
|
|
|
|
|
2017-11-09 05:10:08 +01:00
|
|
|
EEPROM_READ(delta_height); // 1 float
|
2017-09-24 09:18:15 +02:00
|
|
|
EEPROM_READ(delta_endstop_adj); // 3 floats
|
2017-03-08 00:42:04 +01: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 16:36:33 +02:00
|
|
|
EEPROM_READ(delta_calibration_radius); // 1 float
|
2017-09-24 09:18:15 +02:00
|
|
|
EEPROM_READ(delta_tower_angle_trim); // 3 floats
|
2017-10-29 09:43:44 +01:00
|
|
|
|
|
|
|
#elif ENABLED(X_DUAL_ENDSTOPS) || ENABLED(Y_DUAL_ENDSTOPS) || ENABLED(Z_DUAL_ENDSTOPS)
|
|
|
|
|
2018-01-10 01:33:44 +01:00
|
|
|
_FIELD_TEST(x_endstop_adj);
|
|
|
|
|
2017-10-29 09:43:44 +01:00
|
|
|
#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
|
|
|
|
|
2016-10-29 01:55:42 +02:00
|
|
|
#endif
|
|
|
|
|
2017-11-04 21:34:24 +01:00
|
|
|
//
|
|
|
|
// LCD Preheat settings
|
|
|
|
//
|
|
|
|
|
2018-01-10 01:33:44 +01:00
|
|
|
_FIELD_TEST(lcd_preheat_hotend_temp);
|
|
|
|
|
2016-10-29 01:55:42 +02:00
|
|
|
#if DISABLED(ULTIPANEL)
|
2018-01-19 22:24:13 +01:00
|
|
|
int16_t lcd_preheat_hotend_temp[2], lcd_preheat_bed_temp[2], lcd_preheat_fan_speed[2];
|
2016-10-29 01:55:42 +02:00
|
|
|
#endif
|
2017-11-04 21:34:24 +01: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-29 01:55:42 +02:00
|
|
|
|
2017-04-10 04:47:49 +02:00
|
|
|
//EEPROM_ASSERT(
|
|
|
|
// WITHIN(lcd_preheat_fan_speed, 0, 255),
|
|
|
|
// "lcd_preheat_fan_speed out of range"
|
|
|
|
//);
|
|
|
|
|
2017-11-04 21:34:24 +01:00
|
|
|
//
|
|
|
|
// Hotend PID
|
|
|
|
//
|
|
|
|
|
2016-10-29 01:55:42 +02: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 02:51:18 +01:00
|
|
|
if (!validating) PID_PARAM(Kp, e) = dummy;
|
2016-10-29 01:55:42 +02: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 21:34:24 +01:00
|
|
|
//
|
|
|
|
// PID Extrusion Scaling
|
|
|
|
//
|
|
|
|
|
2018-01-10 01:33:44 +01:00
|
|
|
_FIELD_TEST(lpq_len);
|
|
|
|
|
2016-10-29 01:55:42 +02:00
|
|
|
#if DISABLED(PID_EXTRUSION_SCALING)
|
|
|
|
int lpq_len;
|
|
|
|
#endif
|
|
|
|
EEPROM_READ(lpq_len);
|
|
|
|
|
2017-11-04 21:34:24 +01:00
|
|
|
//
|
|
|
|
// Heated Bed PID
|
|
|
|
//
|
|
|
|
|
2016-10-29 01:55:42 +02:00
|
|
|
#if ENABLED(PIDTEMPBED)
|
|
|
|
EEPROM_READ(dummy); // bedKp
|
|
|
|
if (dummy != DUMMY_PID_VALUE) {
|
2018-01-05 02:51:18 +01:00
|
|
|
if (!validating) thermalManager.bedKp = dummy;
|
2016-10-29 01:55:42 +02: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 21:34:24 +01:00
|
|
|
//
|
|
|
|
// LCD Contrast
|
|
|
|
//
|
|
|
|
|
2018-01-10 01:33:44 +01:00
|
|
|
_FIELD_TEST(lcd_contrast);
|
|
|
|
|
2016-10-29 01:55:42 +02:00
|
|
|
#if !HAS_LCD_CONTRAST
|
2018-01-10 06:41:14 +01:00
|
|
|
int16_t lcd_contrast;
|
2016-10-29 01:55:42 +02:00
|
|
|
#endif
|
|
|
|
EEPROM_READ(lcd_contrast);
|
|
|
|
|
2017-11-04 21:34:24 +01:00
|
|
|
//
|
|
|
|
// Firmware Retraction
|
|
|
|
//
|
|
|
|
|
2016-10-29 01:55:42 +02:00
|
|
|
#if ENABLED(FWRETRACT)
|
2017-09-08 05:40:32 +02: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 05:01:41 +02:00
|
|
|
#else
|
|
|
|
EEPROM_READ(dummyb);
|
|
|
|
for (uint8_t q=8; q--;) EEPROM_READ(dummy);
|
|
|
|
#endif
|
2016-10-29 01:55:42 +02:00
|
|
|
|
2017-11-04 21:34:24 +01:00
|
|
|
//
|
|
|
|
// Volumetric & Filament Size
|
|
|
|
//
|
2018-01-10 01:33:44 +01:00
|
|
|
|
|
|
|
_FIELD_TEST(parser_volumetric_enabled);
|
|
|
|
|
2017-12-20 02:44:11 +01:00
|
|
|
#if DISABLED(NO_VOLUMETRICS)
|
2016-10-29 01:55:42 +02:00
|
|
|
|
2017-12-20 02:44:11 +01:00
|
|
|
EEPROM_READ(parser.volumetric_enabled);
|
|
|
|
|
|
|
|
for (uint8_t q = 0; q < MAX_EXTRUDERS; q++) {
|
|
|
|
EEPROM_READ(dummy);
|
2018-01-05 02:51:18 +01:00
|
|
|
if (!validating && q < COUNT(planner.filament_size))
|
|
|
|
planner.filament_size[q] = dummy;
|
2017-12-20 02:44:11 +01:00
|
|
|
}
|
|
|
|
|
2018-01-05 03:23:24 +01:00
|
|
|
#else
|
|
|
|
|
|
|
|
EEPROM_READ(dummyb);
|
|
|
|
for (uint8_t q=MAX_EXTRUDERS; q--;) EEPROM_READ(dummy);
|
|
|
|
|
2017-12-20 02:44:11 +01:00
|
|
|
#endif
|
2016-10-29 01:55:42 +02:00
|
|
|
|
2018-03-15 04:03:53 +01:00
|
|
|
if (!validating) reset_stepper_drivers();
|
|
|
|
|
2017-11-04 21:34:24 +01:00
|
|
|
//
|
2018-03-15 04:03:53 +01:00
|
|
|
// TMC2130 Stepper Settings
|
2017-11-04 21:34:24 +01:00
|
|
|
//
|
2018-01-10 01:33:44 +01:00
|
|
|
|
|
|
|
_FIELD_TEST(tmc_stepper_current);
|
|
|
|
|
2017-12-15 22:03:14 +01:00
|
|
|
#if HAS_TRINAMIC
|
2018-03-15 04:03:53 +01:00
|
|
|
|
|
|
|
#define SET_CURR(Q) stepper##Q.setCurrent(currents[TMC_##Q] ? currents[TMC_##Q] : Q##_CURRENT, R_SENSE, HOLD_MULTIPLIER)
|
|
|
|
uint16_t currents[TMC_AXES];
|
2018-01-10 01:33:44 +01:00
|
|
|
EEPROM_READ(currents);
|
2018-01-05 02:51:18 +01:00
|
|
|
if (!validating) {
|
|
|
|
#if X_IS_TRINAMIC
|
2018-03-15 04:03:53 +01:00
|
|
|
SET_CURR(X);
|
2018-01-05 02:51:18 +01:00
|
|
|
#endif
|
|
|
|
#if Y_IS_TRINAMIC
|
2018-03-15 04:03:53 +01:00
|
|
|
SET_CURR(Y);
|
2018-01-05 02:51:18 +01:00
|
|
|
#endif
|
|
|
|
#if Z_IS_TRINAMIC
|
2018-03-15 04:03:53 +01:00
|
|
|
SET_CURR(Z);
|
2018-01-05 02:51:18 +01:00
|
|
|
#endif
|
|
|
|
#if X2_IS_TRINAMIC
|
2018-03-15 04:03:53 +01:00
|
|
|
SET_CURR(X2);
|
2018-01-05 02:51:18 +01:00
|
|
|
#endif
|
|
|
|
#if Y2_IS_TRINAMIC
|
2018-03-15 04:03:53 +01:00
|
|
|
SET_CURR(Y2);
|
2018-01-05 02:51:18 +01:00
|
|
|
#endif
|
|
|
|
#if Z2_IS_TRINAMIC
|
2018-03-15 04:03:53 +01:00
|
|
|
SET_CURR(Z2);
|
2018-01-05 02:51:18 +01:00
|
|
|
#endif
|
|
|
|
#if E0_IS_TRINAMIC
|
2018-03-15 04:03:53 +01:00
|
|
|
SET_CURR(E0);
|
2018-01-05 02:51:18 +01:00
|
|
|
#endif
|
|
|
|
#if E1_IS_TRINAMIC
|
2018-03-15 04:03:53 +01:00
|
|
|
SET_CURR(E1);
|
2018-01-05 02:51:18 +01:00
|
|
|
#endif
|
|
|
|
#if E2_IS_TRINAMIC
|
2018-03-15 04:03:53 +01:00
|
|
|
SET_CURR(E2);
|
2018-01-05 02:51:18 +01:00
|
|
|
#endif
|
|
|
|
#if E3_IS_TRINAMIC
|
2018-03-15 04:03:53 +01:00
|
|
|
SET_CURR(E3);
|
2018-01-05 02:51:18 +01:00
|
|
|
#endif
|
|
|
|
#if E4_IS_TRINAMIC
|
2018-03-15 04:03:53 +01:00
|
|
|
SET_CURR(E4);
|
2018-01-05 02:51:18 +01:00
|
|
|
#endif
|
|
|
|
}
|
2017-03-07 06:00:43 +01:00
|
|
|
#else
|
2018-01-05 02:51:18 +01:00
|
|
|
uint16_t val;
|
2018-03-15 04:03:53 +01:00
|
|
|
for (uint8_t q=TMC_AXES; q--;) EEPROM_READ(val);
|
|
|
|
#endif
|
|
|
|
|
|
|
|
#if HAS_TRINAMIC
|
|
|
|
#define TMC_SET_PWMTHRS(P,Q) tmc_set_pwmthrs(stepper##Q, TMC_##Q, tmc_hybrid_threshold[TMC_##Q], planner.axis_steps_per_mm[P##_AXIS])
|
|
|
|
uint16_t tmc_hybrid_threshold[TMC_AXES];
|
|
|
|
EEPROM_READ(tmc_hybrid_threshold);
|
|
|
|
if (!validating) {
|
|
|
|
#if X_IS_TRINAMIC
|
|
|
|
TMC_SET_PWMTHRS(X, X);
|
|
|
|
#endif
|
|
|
|
#if Y_IS_TRINAMIC
|
|
|
|
TMC_SET_PWMTHRS(Y, Y);
|
|
|
|
#endif
|
|
|
|
#if Z_IS_TRINAMIC
|
|
|
|
TMC_SET_PWMTHRS(Z, Z);
|
|
|
|
#endif
|
|
|
|
#if X2_IS_TRINAMIC
|
|
|
|
TMC_SET_PWMTHRS(X, X2);
|
|
|
|
#endif
|
|
|
|
#if Y2_IS_TRINAMIC
|
|
|
|
TMC_SET_PWMTHRS(Y, Y2);
|
|
|
|
#endif
|
|
|
|
#if Z2_IS_TRINAMIC
|
|
|
|
TMC_SET_PWMTHRS(Z, Z2);
|
|
|
|
#endif
|
|
|
|
#if E0_IS_TRINAMIC
|
|
|
|
TMC_SET_PWMTHRS(E, E0);
|
|
|
|
#endif
|
|
|
|
#if E1_IS_TRINAMIC
|
|
|
|
TMC_SET_PWMTHRS(E, E1);
|
|
|
|
#endif
|
|
|
|
#if E2_IS_TRINAMIC
|
|
|
|
TMC_SET_PWMTHRS(E, E2);
|
|
|
|
#endif
|
|
|
|
#if E3_IS_TRINAMIC
|
|
|
|
TMC_SET_PWMTHRS(E, E3);
|
|
|
|
#endif
|
|
|
|
#if E4_IS_TRINAMIC
|
|
|
|
TMC_SET_PWMTHRS(E, E4);
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
#else
|
|
|
|
uint16_t thrs_val;
|
|
|
|
for (uint8_t q=TMC_AXES; q--;) EEPROM_READ(thrs_val);
|
2017-03-07 06:00:43 +01:00
|
|
|
#endif
|
|
|
|
|
2017-12-15 22:03:14 +01:00
|
|
|
/*
|
|
|
|
* TMC2130 Sensorless homing threshold.
|
|
|
|
* X and X2 use the same value
|
|
|
|
* Y and Y2 use the same value
|
2018-02-26 04:02:22 +01:00
|
|
|
* Z and Z2 use the same value
|
2017-12-15 22:03:14 +01:00
|
|
|
*/
|
2018-03-15 04:03:53 +01:00
|
|
|
int16_t tmc_sgt[XYZ];
|
|
|
|
EEPROM_READ(tmc_sgt);
|
2017-12-15 22:03:14 +01:00
|
|
|
#if ENABLED(SENSORLESS_HOMING)
|
2018-02-26 04:02:22 +01:00
|
|
|
if (!validating) {
|
|
|
|
#ifdef X_HOMING_SENSITIVITY
|
2018-03-15 04:03:53 +01:00
|
|
|
#if ENABLED(X_IS_TMC2130) || ENABLED(IS_TRAMS)
|
|
|
|
stepperX.sgt(tmc_sgt[0]);
|
2018-02-08 11:20:44 +01:00
|
|
|
#endif
|
|
|
|
#if ENABLED(X2_IS_TMC2130)
|
2018-03-15 04:03:53 +01:00
|
|
|
stepperX2.sgt(tmc_sgt[0]);
|
2018-02-08 11:20:44 +01:00
|
|
|
#endif
|
2018-02-26 04:02:22 +01:00
|
|
|
#endif
|
|
|
|
#ifdef Y_HOMING_SENSITIVITY
|
2018-03-15 04:03:53 +01:00
|
|
|
#if ENABLED(Y_IS_TMC2130) || ENABLED(IS_TRAMS)
|
|
|
|
stepperY.sgt(tmc_sgt[1]);
|
2018-02-08 11:20:44 +01:00
|
|
|
#endif
|
|
|
|
#if ENABLED(Y2_IS_TMC2130)
|
2018-03-15 04:03:53 +01:00
|
|
|
stepperY2.sgt(tmc_sgt[1]);
|
2018-02-08 11:20:44 +01:00
|
|
|
#endif
|
2018-02-26 04:02:22 +01:00
|
|
|
#endif
|
|
|
|
#ifdef Z_HOMING_SENSITIVITY
|
2018-03-15 04:03:53 +01:00
|
|
|
#if ENABLED(Z_IS_TMC2130) || ENABLED(IS_TRAMS)
|
|
|
|
stepperZ.sgt(tmc_sgt[2]);
|
2018-02-08 11:20:44 +01:00
|
|
|
#endif
|
|
|
|
#if ENABLED(Z2_IS_TMC2130)
|
2018-03-15 04:03:53 +01:00
|
|
|
stepperZ2.sgt(tmc_sgt[2]);
|
2018-02-08 11:20:44 +01:00
|
|
|
#endif
|
2018-02-26 04:02:22 +01:00
|
|
|
#endif
|
|
|
|
}
|
2017-12-15 22:03:14 +01:00
|
|
|
#endif
|
|
|
|
|
2017-04-16 05:18:10 +02:00
|
|
|
//
|
|
|
|
// Linear Advance
|
|
|
|
//
|
|
|
|
|
2018-02-23 07:53:29 +01:00
|
|
|
_FIELD_TEST(planner_extruder_advance_K);
|
2018-01-10 01:33:44 +01:00
|
|
|
|
2017-04-16 05:18:10 +02:00
|
|
|
#if ENABLED(LIN_ADVANCE)
|
2018-02-23 07:53:29 +01:00
|
|
|
EEPROM_READ(planner.extruder_advance_K);
|
2017-04-22 05:30:36 +02:00
|
|
|
#else
|
|
|
|
EEPROM_READ(dummy);
|
2017-04-16 05:18:10 +02:00
|
|
|
#endif
|
|
|
|
|
2017-11-04 21:34:24 +01:00
|
|
|
//
|
|
|
|
// Motor Current PWM
|
|
|
|
//
|
|
|
|
|
2018-01-10 01:33:44 +01:00
|
|
|
_FIELD_TEST(motor_current_setting);
|
|
|
|
|
2017-06-03 07:38:07 +02:00
|
|
|
#if HAS_MOTOR_CURRENT_PWM
|
2018-02-26 04:02:22 +01:00
|
|
|
for (uint8_t q = XYZ; q--;) EEPROM_READ(stepper.motor_current_setting[q]);
|
2017-06-03 07:38:07 +02:00
|
|
|
#else
|
2018-02-26 04:02:22 +01:00
|
|
|
uint32_t dummyui32[XYZ];
|
|
|
|
EEPROM_READ(dummyui32);
|
2017-06-03 07:38:07 +02:00
|
|
|
#endif
|
|
|
|
|
2017-11-04 22:36:41 +01:00
|
|
|
//
|
|
|
|
// CNC Coordinate System
|
|
|
|
//
|
|
|
|
|
2018-01-10 01:33:44 +01:00
|
|
|
_FIELD_TEST(coordinate_system);
|
|
|
|
|
2017-11-04 22:36:41 +01:00
|
|
|
#if ENABLED(CNC_COORDINATE_SYSTEMS)
|
2018-01-05 02:51:18 +01:00
|
|
|
if (!validating) (void)gcode.select_coordinate_system(-1); // Go back to machine space
|
2017-11-04 22:36:41 +01:00
|
|
|
EEPROM_READ(gcode.coordinate_system); // 27 floats
|
|
|
|
#else
|
2018-01-05 02:59:43 +01:00
|
|
|
for (uint8_t q = MAX_COORDINATE_SYSTEMS * XYZ; q--;) EEPROM_READ(dummy);
|
2017-11-04 22:36:41 +01:00
|
|
|
#endif
|
|
|
|
|
2017-12-01 23:42:23 +01:00
|
|
|
//
|
|
|
|
// Skew correction factors
|
|
|
|
//
|
|
|
|
|
2018-01-10 01:33:44 +01:00
|
|
|
_FIELD_TEST(planner_xy_skew_factor);
|
|
|
|
|
2017-12-01 23:42:23 +01:00
|
|
|
#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
|
2018-03-15 04:03:53 +01:00
|
|
|
for (uint8_t q = 3; q--;) EEPROM_READ(dummy);
|
2017-12-01 23:42:23 +01:00
|
|
|
#endif
|
|
|
|
|
2018-01-04 12:06:34 +01:00
|
|
|
//
|
|
|
|
// Advanced Pause filament load & unload lengths
|
|
|
|
//
|
|
|
|
|
2018-01-10 01:33:44 +01:00
|
|
|
_FIELD_TEST(filament_change_unload_length);
|
|
|
|
|
2018-01-04 12:06:34 +01:00
|
|
|
#if ENABLED(ADVANCED_PAUSE_FEATURE)
|
|
|
|
for (uint8_t q = 0; q < MAX_EXTRUDERS; q++) {
|
|
|
|
EEPROM_READ(dummy);
|
2018-01-05 02:51:18 +01:00
|
|
|
if (!validating && q < COUNT(filament_change_unload_length)) filament_change_unload_length[q] = dummy;
|
2018-01-04 12:06:34 +01:00
|
|
|
}
|
|
|
|
for (uint8_t q = 0; q < MAX_EXTRUDERS; q++) {
|
|
|
|
EEPROM_READ(dummy);
|
2018-01-05 02:51:18 +01:00
|
|
|
if (!validating && q < COUNT(filament_change_load_length)) filament_change_load_length[q] = dummy;
|
2018-01-04 12:06:34 +01:00
|
|
|
}
|
|
|
|
#else
|
|
|
|
for (uint8_t q = MAX_EXTRUDERS * 2; q--;) EEPROM_READ(dummy);
|
|
|
|
#endif
|
|
|
|
|
2018-01-05 03:01:25 +01:00
|
|
|
eeprom_error = size_error(eeprom_index - (EEPROM_OFFSET));
|
|
|
|
if (eeprom_error) {
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHO_START_P(port);
|
|
|
|
SERIAL_ECHOPAIR_P(port, "Index: ", int(eeprom_index - (EEPROM_OFFSET)));
|
|
|
|
SERIAL_ECHOLNPAIR_P(port, " Size: ", datasize());
|
2016-10-29 01:55:42 +02:00
|
|
|
}
|
2018-01-05 03:01:25 +01:00
|
|
|
else if (working_crc != stored_crc) {
|
|
|
|
eeprom_error = true;
|
2017-07-02 04:48:18 +02:00
|
|
|
#if ENABLED(EEPROM_CHITCHAT)
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ERROR_START_P(port);
|
|
|
|
SERIAL_ERRORPGM_P(port, "EEPROM CRC mismatch - (stored) ");
|
|
|
|
SERIAL_ERROR_P(port, stored_crc);
|
|
|
|
SERIAL_ERRORPGM_P(port, " != ");
|
|
|
|
SERIAL_ERROR_P(port, working_crc);
|
|
|
|
SERIAL_ERRORLNPGM_P(port, " (calculated)!");
|
2017-07-02 04:48:18 +02:00
|
|
|
#endif
|
2018-01-05 03:01:25 +01:00
|
|
|
}
|
|
|
|
else if (!validating) {
|
|
|
|
#if ENABLED(EEPROM_CHITCHAT)
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHO_START_P(port);
|
|
|
|
SERIAL_ECHO_P(port, version);
|
|
|
|
SERIAL_ECHOPAIR_P(port, " stored settings retrieved (", eeprom_index - (EEPROM_OFFSET));
|
|
|
|
SERIAL_ECHOPAIR_P(port, " bytes; crc ", (uint32_t)working_crc);
|
|
|
|
SERIAL_ECHOLNPGM_P(port, ")");
|
2018-01-05 03:01:25 +01:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
if (!validating) {
|
|
|
|
if (eeprom_error) reset(); else postprocess();
|
2016-10-29 01:55:42 +02:00
|
|
|
}
|
|
|
|
|
2017-03-18 16:15:54 +01:00
|
|
|
#if ENABLED(AUTO_BED_LEVELING_UBL)
|
2017-05-16 09:34:36 +02:00
|
|
|
ubl.report_state();
|
2017-03-18 16:15:54 +01:00
|
|
|
|
2018-01-05 02:51:18 +01:00
|
|
|
if (!validating) {
|
|
|
|
if (!ubl.sanity_check()) {
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_EOL_P(port);
|
2018-01-05 02:51:18 +01:00
|
|
|
#if ENABLED(EEPROM_CHITCHAT)
|
|
|
|
ubl.echo_name();
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOLNPGM_P(port, " initialized.\n");
|
2018-01-05 02:51:18 +01:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
eeprom_error = true;
|
|
|
|
#if ENABLED(EEPROM_CHITCHAT)
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_PROTOCOLPGM_P(port, "?Can't enable ");
|
2018-01-05 02:51:18 +01:00
|
|
|
ubl.echo_name();
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_PROTOCOLLNPGM_P(port, ".");
|
2018-01-05 02:51:18 +01:00
|
|
|
#endif
|
|
|
|
ubl.reset();
|
|
|
|
}
|
2017-03-18 16:15:54 +01:00
|
|
|
|
2018-01-05 02:51:18 +01:00
|
|
|
if (ubl.storage_slot >= 0) {
|
|
|
|
load_mesh(ubl.storage_slot);
|
|
|
|
#if ENABLED(EEPROM_CHITCHAT)
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOPAIR_P(port, "Mesh ", ubl.storage_slot);
|
|
|
|
SERIAL_ECHOLNPGM_P(port, " loaded from storage.");
|
2018-01-05 02:51:18 +01:00
|
|
|
#endif
|
|
|
|
}
|
|
|
|
else {
|
|
|
|
ubl.reset();
|
|
|
|
#if ENABLED(EEPROM_CHITCHAT)
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOLNPGM_P(port, "UBL System reset()");
|
2018-01-05 02:51:18 +01:00
|
|
|
#endif
|
|
|
|
}
|
2017-03-18 16:15:54 +01:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
}
|
2017-04-22 23:04:28 +02:00
|
|
|
|
2017-07-02 04:30:46 +02:00
|
|
|
#if ENABLED(EEPROM_CHITCHAT) && DISABLED(DISABLE_M503)
|
2018-03-15 04:44:07 +01:00
|
|
|
if (!validating) report(PORTVAR_SOLO);
|
2016-10-29 01:55:42 +02:00
|
|
|
#endif
|
2017-06-18 01:36:10 +02:00
|
|
|
EEPROM_FINISH();
|
2017-03-20 12:10:31 +01:00
|
|
|
|
2017-05-07 03:00:56 +02:00
|
|
|
return !eeprom_error;
|
2016-10-29 01:55:42 +02:00
|
|
|
}
|
2015-01-28 10:08:48 +01:00
|
|
|
|
2018-03-15 04:44:07 +01:00
|
|
|
bool MarlinSettings::validate(PORTARG_SOLO) {
|
2018-01-05 02:51:18 +01:00
|
|
|
validating = true;
|
2018-03-15 04:44:07 +01:00
|
|
|
const bool success = _load(PORTVAR_SOLO);
|
2018-01-05 02:51:18 +01:00
|
|
|
validating = false;
|
|
|
|
return success;
|
|
|
|
}
|
|
|
|
|
2018-03-15 04:44:07 +01:00
|
|
|
bool MarlinSettings::load(PORTARG_SOLO) {
|
|
|
|
if (validate(PORTVAR_SOLO)) return _load(PORTVAR_SOLO);
|
2018-01-05 02:51:18 +01:00
|
|
|
reset();
|
|
|
|
return true;
|
|
|
|
}
|
|
|
|
|
2017-05-07 03:00:56 +02:00
|
|
|
#if ENABLED(AUTO_BED_LEVELING_UBL)
|
|
|
|
|
2017-07-02 04:48:18 +02: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 09:34:36 +02:00
|
|
|
|
2018-01-05 04:09:56 +01:00
|
|
|
int16_t MarlinSettings::meshes_start_index() {
|
|
|
|
return (datasize() + EEPROM_OFFSET + 32) & 0xFFF8; // Pad the end of configuration data so it can float up
|
|
|
|
// or down a little bit without disrupting the mesh data
|
|
|
|
}
|
2017-05-07 03:00:56 +02:00
|
|
|
|
2018-01-05 04:09:56 +01:00
|
|
|
uint16_t MarlinSettings::calc_num_meshes() {
|
|
|
|
return (meshes_end - meshes_start_index()) / sizeof(ubl.z_values);
|
2017-05-07 03:00:56 +02:00
|
|
|
}
|
|
|
|
|
2018-03-10 10:02:53 +01:00
|
|
|
int MarlinSettings::mesh_slot_offset(const int8_t slot) {
|
|
|
|
return meshes_end - (slot + 1) * sizeof(ubl.z_values);
|
|
|
|
}
|
|
|
|
|
2017-12-25 10:32:31 +01:00
|
|
|
void MarlinSettings::store_mesh(const int8_t slot) {
|
2017-05-07 03:00:56 +02:00
|
|
|
|
|
|
|
#if ENABLED(AUTO_BED_LEVELING_UBL)
|
2017-12-25 10:32:31 +01:00
|
|
|
const int16_t a = calc_num_meshes();
|
2017-05-07 03:00:56 +02:00
|
|
|
if (!WITHIN(slot, 0, a - 1)) {
|
2017-07-02 04:48:18 +02: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 03:00:56 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2018-03-10 10:02:53 +01:00
|
|
|
int pos = mesh_slot_offset(slot);
|
2017-05-07 03:00:56 +02:00
|
|
|
uint16_t crc = 0;
|
|
|
|
|
2017-10-18 21:00:29 +02:00
|
|
|
HAL::PersistentStore::access_start();
|
2017-12-25 10:32:31 +01:00
|
|
|
const bool status = HAL::PersistentStore::write_data(pos, (uint8_t *)&ubl.z_values, sizeof(ubl.z_values), &crc);
|
2017-10-18 21:00:29 +02:00
|
|
|
HAL::PersistentStore::access_finish();
|
|
|
|
|
|
|
|
if (status)
|
2018-01-24 04:17:33 +01:00
|
|
|
SERIAL_PROTOCOLPGM("?Unable to save mesh data.\n");
|
2017-05-07 03:00:56 +02:00
|
|
|
|
|
|
|
// Write crc to MAT along with other data, or just tack on to the beginning or end
|
|
|
|
|
2017-07-02 04:48:18 +02:00
|
|
|
#if ENABLED(EEPROM_CHITCHAT)
|
2017-10-18 21:00:29 +02:00
|
|
|
if (!status)
|
|
|
|
SERIAL_PROTOCOLLNPAIR("Mesh saved in slot ", slot);
|
2017-07-02 04:48:18 +02:00
|
|
|
#endif
|
2017-05-07 03:00:56 +02:00
|
|
|
|
|
|
|
#else
|
|
|
|
|
|
|
|
// Other mesh types
|
|
|
|
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
2017-12-25 10:32:31 +01:00
|
|
|
void MarlinSettings::load_mesh(const int8_t slot, void * const into/*=NULL*/) {
|
2017-05-07 03:00:56 +02:00
|
|
|
|
|
|
|
#if ENABLED(AUTO_BED_LEVELING_UBL)
|
|
|
|
|
|
|
|
const int16_t a = settings.calc_num_meshes();
|
|
|
|
|
|
|
|
if (!WITHIN(slot, 0, a - 1)) {
|
2017-07-02 04:48:18 +02:00
|
|
|
#if ENABLED(EEPROM_CHITCHAT)
|
|
|
|
ubl_invalid_slot(a);
|
|
|
|
#endif
|
2017-05-07 03:00:56 +02:00
|
|
|
return;
|
|
|
|
}
|
|
|
|
|
2018-03-10 10:02:53 +01:00
|
|
|
int pos = mesh_slot_offset(slot);
|
2017-05-07 03:00:56 +02:00
|
|
|
uint16_t crc = 0;
|
|
|
|
uint8_t * const dest = into ? (uint8_t*)into : (uint8_t*)&ubl.z_values;
|
2017-10-18 21:00:29 +02:00
|
|
|
|
|
|
|
HAL::PersistentStore::access_start();
|
2017-12-25 10:32:31 +01:00
|
|
|
const uint16_t status = HAL::PersistentStore::read_data(pos, dest, sizeof(ubl.z_values), &crc);
|
2017-10-18 21:00:29 +02:00
|
|
|
HAL::PersistentStore::access_finish();
|
2017-05-07 03:00:56 +02:00
|
|
|
|
2017-10-18 21:00:29 +02:00
|
|
|
if (status)
|
2018-01-24 04:17:33 +01:00
|
|
|
SERIAL_PROTOCOLPGM("?Unable to load mesh data.\n");
|
2017-05-07 03:00:56 +02:00
|
|
|
|
2017-07-02 04:48:18 +02:00
|
|
|
#if ENABLED(EEPROM_CHITCHAT)
|
2017-10-18 21:00:29 +02:00
|
|
|
else
|
|
|
|
SERIAL_PROTOCOLLNPAIR("Mesh loaded from slot ", slot);
|
2017-07-02 04:48:18 +02:00
|
|
|
#endif
|
2017-10-18 21:00:29 +02:00
|
|
|
EEPROM_FINISH();
|
2017-05-07 03:00:56 +02:00
|
|
|
|
|
|
|
#else
|
|
|
|
|
|
|
|
// Other mesh types
|
|
|
|
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
|
|
|
|
//void MarlinSettings::delete_mesh() { return; }
|
|
|
|
//void MarlinSettings::defrag_meshes() { return; }
|
|
|
|
|
|
|
|
#endif // AUTO_BED_LEVELING_UBL
|
|
|
|
|
2016-10-29 01:53:48 +02:00
|
|
|
#else // !EEPROM_SETTINGS
|
|
|
|
|
2018-03-15 04:44:07 +01:00
|
|
|
bool MarlinSettings::save(PORTARG_SOLO) {
|
2017-11-05 15:49:38 +01:00
|
|
|
#if ENABLED(EEPROM_CHITCHAT)
|
|
|
|
SERIAL_ERROR_START_P(port);
|
|
|
|
SERIAL_ERRORLNPGM_P(port, "EEPROM disabled");
|
|
|
|
#endif
|
2017-03-20 12:10:31 +01:00
|
|
|
return false;
|
2016-10-29 01:53:48 +02:00
|
|
|
}
|
|
|
|
|
|
|
|
#endif // !EEPROM_SETTINGS
|
2015-01-28 10:08:48 +01:00
|
|
|
|
2015-04-27 03:44:01 +02:00
|
|
|
/**
|
2016-06-30 03:18:46 +02:00
|
|
|
* M502 - Reset Configuration
|
2015-04-27 03:44:01 +02:00
|
|
|
*/
|
2018-03-15 04:44:07 +01:00
|
|
|
void MarlinSettings::reset(PORTARG_SOLO) {
|
2017-06-06 11:03:01 +02: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 05:02:27 +01:00
|
|
|
LOOP_XYZE_N(i) {
|
2017-06-06 11:03:01 +02: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 23:15:02 +02:00
|
|
|
planner.max_acceleration_mm_per_s2[i] = pgm_read_dword_near(&tmp3[i < COUNT(tmp3) ? i : COUNT(tmp3) - 1]);
|
2015-01-28 10:08:48 +01:00
|
|
|
}
|
|
|
|
|
2016-04-28 03:06:32 +02:00
|
|
|
planner.acceleration = DEFAULT_ACCELERATION;
|
|
|
|
planner.retract_acceleration = DEFAULT_RETRACT_ACCELERATION;
|
|
|
|
planner.travel_acceleration = DEFAULT_TRAVEL_ACCELERATION;
|
2016-07-16 03:49:34 +02:00
|
|
|
planner.min_feedrate_mm_s = DEFAULT_MINIMUMFEEDRATE;
|
|
|
|
planner.min_travel_feedrate_mm_s = DEFAULT_MINTRAVELFEEDRATE;
|
2017-12-25 10:32:31 +01:00
|
|
|
planner.min_segment_time_us = DEFAULT_MINSEGMENTTIME;
|
2016-10-02 11:37:13 +02: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 13:49:31 +01:00
|
|
|
|
2017-04-15 04:41:21 +02:00
|
|
|
#if HAS_HOME_OFFSET
|
2017-03-05 01:01:33 +01:00
|
|
|
ZERO(home_offset);
|
|
|
|
#endif
|
2015-01-28 10:08:48 +01:00
|
|
|
|
2016-10-29 01:39:23 +02: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 10:32:31 +01:00
|
|
|
//
|
|
|
|
// Global Leveling
|
|
|
|
//
|
|
|
|
|
|
|
|
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
|
|
|
|
new_z_fade_height = 0.0;
|
|
|
|
#endif
|
|
|
|
|
2017-05-01 23:13:09 +02:00
|
|
|
#if HAS_LEVELING
|
2016-12-10 07:17:49 +01:00
|
|
|
reset_bed_level();
|
2015-03-26 07:06:33 +01:00
|
|
|
#endif
|
|
|
|
|
2016-06-15 03:05:20 +02:00
|
|
|
#if HAS_BED_PROBE
|
2015-05-27 02:47:04 +02:00
|
|
|
zprobe_zoffset = Z_PROBE_OFFSET_FROM_EXTRUDER;
|
2015-03-26 07:06:33 +01:00
|
|
|
#endif
|
2015-03-15 23:18:11 +01:00
|
|
|
|
2015-07-31 07:31:45 +02:00
|
|
|
#if ENABLED(DELTA)
|
2017-03-08 00:42:04 +01:00
|
|
|
const float adj[ABC] = DELTA_ENDSTOP_ADJ,
|
2017-04-29 16:36:33 +02:00
|
|
|
dta[ABC] = DELTA_TOWER_ANGLE_TRIM;
|
2017-11-09 05:10:08 +01:00
|
|
|
delta_height = DELTA_HEIGHT;
|
2017-09-08 22:35:25 +02:00
|
|
|
COPY(delta_endstop_adj, adj);
|
2016-12-10 07:17:49 +01:00
|
|
|
delta_radius = DELTA_RADIUS;
|
|
|
|
delta_diagonal_rod = DELTA_DIAGONAL_ROD;
|
|
|
|
delta_segments_per_second = DELTA_SEGMENTS_PER_SECOND;
|
2017-04-18 14:43:25 +02:00
|
|
|
delta_calibration_radius = DELTA_CALIBRATION_RADIUS;
|
2017-09-24 09:18:15 +02:00
|
|
|
COPY(delta_tower_angle_trim, dta);
|
2017-04-15 04:41:21 +02:00
|
|
|
|
2017-10-29 09:43:44 +01:00
|
|
|
#elif ENABLED(X_DUAL_ENDSTOPS) || ENABLED(Y_DUAL_ENDSTOPS) || ENABLED(Z_DUAL_ENDSTOPS)
|
2017-04-15 04:41:21 +02:00
|
|
|
|
2017-10-29 09:43:44 +01: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 04:41:21 +02:00
|
|
|
|
2015-01-28 10:08:48 +01:00
|
|
|
#endif
|
|
|
|
|
2015-07-31 07:31:45 +02:00
|
|
|
#if ENABLED(ULTIPANEL)
|
2016-10-27 09:40:37 +02: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 10:08:48 +01:00
|
|
|
#endif
|
|
|
|
|
2015-07-31 07:31:45 +02:00
|
|
|
#if ENABLED(PIDTEMP)
|
2016-07-13 15:11:23 +02:00
|
|
|
#if ENABLED(PID_PARAMS_PER_HOTEND) && HOTENDS > 1
|
2016-07-11 20:48:15 +02:00
|
|
|
HOTEND_LOOP()
|
2015-01-28 10:08:48 +01: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 02:49:34 +02:00
|
|
|
#if ENABLED(PID_EXTRUSION_SCALING)
|
2015-01-28 10:08:48 +01:00
|
|
|
PID_PARAM(Kc, e) = DEFAULT_Kc;
|
|
|
|
#endif
|
|
|
|
}
|
2016-08-01 02:49:34 +02:00
|
|
|
#if ENABLED(PID_EXTRUSION_SCALING)
|
2015-08-31 04:04:30 +02:00
|
|
|
lpq_len = 20; // default last-position-queue size
|
|
|
|
#endif
|
2015-01-28 10:08:48 +01:00
|
|
|
#endif // PIDTEMP
|
|
|
|
|
2015-07-31 07:31:45 +02:00
|
|
|
#if ENABLED(PIDTEMPBED)
|
2016-04-29 03:18:13 +02:00
|
|
|
thermalManager.bedKp = DEFAULT_bedKp;
|
|
|
|
thermalManager.bedKi = scalePID_i(DEFAULT_bedKi);
|
|
|
|
thermalManager.bedKd = scalePID_d(DEFAULT_bedKd);
|
2015-04-04 01:38:05 +02:00
|
|
|
#endif
|
|
|
|
|
2017-12-25 10:32:31 +01:00
|
|
|
#if HAS_LCD_CONTRAST
|
|
|
|
lcd_contrast = DEFAULT_LCD_CONTRAST;
|
|
|
|
#endif
|
|
|
|
|
2015-07-31 07:31:45 +02:00
|
|
|
#if ENABLED(FWRETRACT)
|
2017-09-08 05:40:32 +02:00
|
|
|
fwretract.reset();
|
|
|
|
#endif
|
2015-01-28 10:08:48 +01:00
|
|
|
|
2017-12-20 02:44:11 +01: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 03:19:26 +02:00
|
|
|
|
2016-07-15 01:12:20 +02:00
|
|
|
endstops.enable_globally(
|
|
|
|
#if ENABLED(ENDSTOPS_ALWAYS_ON_DEFAULT)
|
2017-06-06 11:03:01 +02:00
|
|
|
true
|
2016-07-15 01:12:20 +02:00
|
|
|
#else
|
2017-06-06 11:03:01 +02:00
|
|
|
false
|
2016-07-15 01:12:20 +02:00
|
|
|
#endif
|
|
|
|
);
|
|
|
|
|
2018-03-15 04:03:53 +01:00
|
|
|
reset_stepper_drivers();
|
2017-03-07 06:00:43 +01:00
|
|
|
|
2017-04-16 05:18:10 +02:00
|
|
|
#if ENABLED(LIN_ADVANCE)
|
2018-02-23 07:53:29 +01:00
|
|
|
planner.extruder_advance_K = LIN_ADVANCE_K;
|
2017-04-16 05:18:10 +02:00
|
|
|
#endif
|
|
|
|
|
2017-06-03 07:38:07 +02:00
|
|
|
#if HAS_MOTOR_CURRENT_PWM
|
2018-02-26 04:02:22 +01:00
|
|
|
uint32_t tmp_motor_current_setting[XYZ] = PWM_MOTOR_CURRENT;
|
|
|
|
for (uint8_t q = XYZ; q--;)
|
2017-06-03 07:38:07 +02:00
|
|
|
stepper.digipot_current(q, (stepper.motor_current_setting[q] = tmp_motor_current_setting[q]));
|
|
|
|
#endif
|
|
|
|
|
2017-12-01 23:42:23 +01: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 12:06:34 +01: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 04:47:49 +02:00
|
|
|
postprocess();
|
2015-01-28 10:08:48 +01:00
|
|
|
|
2017-07-02 04:48:18 +02:00
|
|
|
#if ENABLED(EEPROM_CHITCHAT)
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHO_START_P(port);
|
|
|
|
SERIAL_ECHOLNPGM_P(port, "Hardcoded Default Settings Loaded");
|
2017-07-02 04:48:18 +02:00
|
|
|
#endif
|
2015-01-28 10:08:48 +01:00
|
|
|
}
|
|
|
|
|
2015-07-31 07:31:45 +02:00
|
|
|
#if DISABLED(DISABLE_M503)
|
2015-01-28 10:08:48 +01:00
|
|
|
|
2018-03-19 01:21:10 +01:00
|
|
|
#define CONFIG_ECHO_START do{ if (!forReplay) SERIAL_ECHO_START_P(port); }while(0)
|
2015-04-27 03:44:01 +02:00
|
|
|
|
2018-03-14 13:25:27 +01:00
|
|
|
#if HAS_TRINAMIC
|
|
|
|
void say_M906() { SERIAL_ECHOPGM_P(port, " M906 "); }
|
|
|
|
void say_M913() { SERIAL_ECHOPGM_P(port, " M913 "); }
|
|
|
|
#if ENABLED(SENSORLESS_HOMING)
|
|
|
|
void say_M914() { SERIAL_ECHOPGM_P(port, " M914 "); }
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
2018-03-15 04:03:53 +01:00
|
|
|
#if ENABLED(ADVANCED_PAUSE_FEATURE)
|
|
|
|
void say_M603() { SERIAL_ECHOPGM_P(port, " M603 "); }
|
|
|
|
#endif
|
|
|
|
|
2016-10-29 01:55:42 +02:00
|
|
|
/**
|
2017-04-10 04:47:49 +02:00
|
|
|
* M503 - Report current settings in RAM
|
2017-03-31 21:58:40 +02:00
|
|
|
*
|
2017-04-10 04:47:49 +02:00
|
|
|
* Unless specifically disabled, M503 is available even without EEPROM
|
2016-10-29 01:55:42 +02:00
|
|
|
*/
|
2017-11-05 15:49:38 +01:00
|
|
|
void MarlinSettings::report(const bool forReplay
|
2018-03-09 14:42:27 +01:00
|
|
|
#if NUM_SERIAL > 1
|
2017-11-05 15:49:38 +01:00
|
|
|
, const int8_t port/*=-1*/
|
|
|
|
#endif
|
|
|
|
) {
|
2017-04-17 06:24:30 +02:00
|
|
|
/**
|
|
|
|
* Announce current units, in case inches are being displayed
|
|
|
|
*/
|
2015-04-27 03:44:01 +02:00
|
|
|
CONFIG_ECHO_START;
|
2017-04-17 06:24:30 +02:00
|
|
|
#if ENABLED(INCH_MODE_SUPPORT)
|
2017-11-25 00:27:56 +01: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-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOPGM_P(port, " G2");
|
|
|
|
SERIAL_CHAR_P(port, parser.linear_unit_factor == 1.0 ? '1' : '0');
|
|
|
|
SERIAL_ECHOPGM_P(port, " ; Units in ");
|
2018-03-15 04:03:53 +01:00
|
|
|
serialprintPGM_P(port, parser.linear_unit_factor == 1.0 ? PSTR("mm\n") : PSTR("inches\n"));
|
2017-04-17 06:24:30 +02:00
|
|
|
#else
|
2017-11-25 00:27:56 +01:00
|
|
|
#define LINEAR_UNIT(N) (N)
|
|
|
|
#define VOLUMETRIC_UNIT(N) (N)
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOLNPGM_P(port, " G21 ; Units in mm");
|
2017-04-17 06:24:30 +02:00
|
|
|
#endif
|
2015-01-28 10:08:48 +01:00
|
|
|
|
2017-05-07 02:41:50 +02:00
|
|
|
#if ENABLED(ULTIPANEL)
|
|
|
|
|
|
|
|
// Temperature units - for Ultipanel temperature options
|
|
|
|
|
|
|
|
CONFIG_ECHO_START;
|
|
|
|
#if ENABLED(TEMPERATURE_UNITS_SUPPORT)
|
2017-05-20 10:03:08 +02:00
|
|
|
#define TEMP_UNIT(N) parser.to_temp_units(N)
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOPGM_P(port, " M149 ");
|
|
|
|
SERIAL_CHAR_P(port, parser.temp_units_code());
|
|
|
|
SERIAL_ECHOPGM_P(port, " ; Units in ");
|
|
|
|
serialprintPGM_P(port, parser.temp_units_name());
|
2017-05-07 02:41:50 +02:00
|
|
|
#else
|
2017-11-25 00:27:56 +01:00
|
|
|
#define TEMP_UNIT(N) (N)
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOLNPGM_P(port, " M149 C ; Units in Celsius");
|
2017-05-07 02:41:50 +02:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#endif
|
|
|
|
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_EOL_P(port);
|
2017-05-26 01:02:29 +02:00
|
|
|
|
2017-12-20 02:44:11 +01:00
|
|
|
#if DISABLED(NO_VOLUMETRICS)
|
|
|
|
|
|
|
|
/**
|
|
|
|
* Volumetric extrusion M200
|
|
|
|
*/
|
|
|
|
if (!forReplay) {
|
|
|
|
CONFIG_ECHO_START;
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOPGM_P(port, "Filament settings:");
|
2017-12-20 02:44:11 +01:00
|
|
|
if (parser.volumetric_enabled)
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_EOL_P(port);
|
2017-12-20 02:44:11 +01:00
|
|
|
else
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOLNPGM_P(port, " Disabled");
|
2017-12-20 02:44:11 +01:00
|
|
|
}
|
2017-04-17 06:24:30 +02:00
|
|
|
|
|
|
|
CONFIG_ECHO_START;
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOPAIR_P(port, " M200 D", LINEAR_UNIT(planner.filament_size[0]));
|
|
|
|
SERIAL_EOL_P(port);
|
2017-12-20 02:44:11 +01:00
|
|
|
#if EXTRUDERS > 1
|
2017-04-17 06:24:30 +02:00
|
|
|
CONFIG_ECHO_START;
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOPAIR_P(port, " M200 T1 D", LINEAR_UNIT(planner.filament_size[1]));
|
|
|
|
SERIAL_EOL_P(port);
|
2017-12-20 02:44:11 +01:00
|
|
|
#if EXTRUDERS > 2
|
2017-04-17 06:24:30 +02:00
|
|
|
CONFIG_ECHO_START;
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOPAIR_P(port, " M200 T2 D", LINEAR_UNIT(planner.filament_size[2]));
|
|
|
|
SERIAL_EOL_P(port);
|
2017-12-20 02:44:11 +01:00
|
|
|
#if EXTRUDERS > 3
|
2017-04-17 06:24:30 +02:00
|
|
|
CONFIG_ECHO_START;
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOPAIR_P(port, " M200 T3 D", LINEAR_UNIT(planner.filament_size[3]));
|
|
|
|
SERIAL_EOL_P(port);
|
2017-12-20 02:44:11 +01:00
|
|
|
#if EXTRUDERS > 4
|
|
|
|
CONFIG_ECHO_START;
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOPAIR_P(port, " M200 T4 D", LINEAR_UNIT(planner.filament_size[4]));
|
|
|
|
SERIAL_EOL_P(port);
|
2017-12-20 02:44:11 +01:00
|
|
|
#endif // EXTRUDERS > 4
|
|
|
|
#endif // EXTRUDERS > 3
|
|
|
|
#endif // EXTRUDERS > 2
|
|
|
|
#endif // EXTRUDERS > 1
|
|
|
|
|
|
|
|
if (!parser.volumetric_enabled) {
|
|
|
|
CONFIG_ECHO_START;
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOLNPGM_P(port, " M200 D0");
|
2017-12-20 02:44:11 +01:00
|
|
|
}
|
2017-04-17 06:24:30 +02:00
|
|
|
|
2017-12-20 02:44:11 +01:00
|
|
|
#endif // !NO_VOLUMETRICS
|
2017-04-17 06:24:30 +02:00
|
|
|
|
|
|
|
if (!forReplay) {
|
|
|
|
CONFIG_ECHO_START;
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOLNPGM_P(port, "Steps per unit:");
|
2017-04-17 06:24:30 +02:00
|
|
|
}
|
|
|
|
CONFIG_ECHO_START;
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOPAIR_P(port, " M92 X", LINEAR_UNIT(planner.axis_steps_per_mm[X_AXIS]));
|
|
|
|
SERIAL_ECHOPAIR_P(port, " Y", LINEAR_UNIT(planner.axis_steps_per_mm[Y_AXIS]));
|
|
|
|
SERIAL_ECHOPAIR_P(port, " Z", LINEAR_UNIT(planner.axis_steps_per_mm[Z_AXIS]));
|
2016-12-12 02:37:29 +01:00
|
|
|
#if DISABLED(DISTINCT_E_FACTORS)
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOPAIR_P(port, " E", VOLUMETRIC_UNIT(planner.axis_steps_per_mm[E_AXIS]));
|
2016-12-04 05:02:27 +01:00
|
|
|
#endif
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_EOL_P(port);
|
2016-12-04 05:02:27 +01:00
|
|
|
#if ENABLED(DISTINCT_E_FACTORS)
|
2017-04-17 06:24:30 +02:00
|
|
|
CONFIG_ECHO_START;
|
2016-12-04 05:02:27 +01:00
|
|
|
for (uint8_t i = 0; i < E_STEPPERS; i++) {
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOPAIR_P(port, " M92 T", (int)i);
|
|
|
|
SERIAL_ECHOLNPAIR_P(port, " E", VOLUMETRIC_UNIT(planner.axis_steps_per_mm[E_AXIS + i]));
|
2016-12-04 05:02:27 +01:00
|
|
|
}
|
|
|
|
#endif
|
2016-10-29 01:55:42 +02:00
|
|
|
|
2015-04-27 03:44:01 +02:00
|
|
|
if (!forReplay) {
|
|
|
|
CONFIG_ECHO_START;
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOLNPGM_P(port, "Maximum feedrates (units/s):");
|
2015-04-27 03:44:01 +02:00
|
|
|
}
|
2017-04-17 06:24:30 +02:00
|
|
|
CONFIG_ECHO_START;
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOPAIR_P(port, " M203 X", LINEAR_UNIT(planner.max_feedrate_mm_s[X_AXIS]));
|
|
|
|
SERIAL_ECHOPAIR_P(port, " Y", LINEAR_UNIT(planner.max_feedrate_mm_s[Y_AXIS]));
|
|
|
|
SERIAL_ECHOPAIR_P(port, " Z", LINEAR_UNIT(planner.max_feedrate_mm_s[Z_AXIS]));
|
2016-12-12 02:37:29 +01:00
|
|
|
#if DISABLED(DISTINCT_E_FACTORS)
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOPAIR_P(port, " E", VOLUMETRIC_UNIT(planner.max_feedrate_mm_s[E_AXIS]));
|
2016-12-04 05:02:27 +01:00
|
|
|
#endif
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_EOL_P(port);
|
2016-12-04 05:02:27 +01:00
|
|
|
#if ENABLED(DISTINCT_E_FACTORS)
|
2017-04-17 06:24:30 +02:00
|
|
|
CONFIG_ECHO_START;
|
2016-12-04 05:02:27 +01:00
|
|
|
for (uint8_t i = 0; i < E_STEPPERS; i++) {
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOPAIR_P(port, " M203 T", (int)i);
|
|
|
|
SERIAL_ECHOLNPAIR_P(port, " E", VOLUMETRIC_UNIT(planner.max_feedrate_mm_s[E_AXIS + i]));
|
2016-12-04 05:02:27 +01:00
|
|
|
}
|
|
|
|
#endif
|
2015-04-27 03:44:01 +02:00
|
|
|
|
2015-01-28 10:08:48 +01:00
|
|
|
if (!forReplay) {
|
2015-04-27 03:44:01 +02:00
|
|
|
CONFIG_ECHO_START;
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOLNPGM_P(port, "Maximum Acceleration (units/s2):");
|
2015-01-28 10:08:48 +01:00
|
|
|
}
|
2017-04-17 06:24:30 +02:00
|
|
|
CONFIG_ECHO_START;
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOPAIR_P(port, " M201 X", LINEAR_UNIT(planner.max_acceleration_mm_per_s2[X_AXIS]));
|
|
|
|
SERIAL_ECHOPAIR_P(port, " Y", LINEAR_UNIT(planner.max_acceleration_mm_per_s2[Y_AXIS]));
|
|
|
|
SERIAL_ECHOPAIR_P(port, " Z", LINEAR_UNIT(planner.max_acceleration_mm_per_s2[Z_AXIS]));
|
2016-12-12 02:37:29 +01:00
|
|
|
#if DISABLED(DISTINCT_E_FACTORS)
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOPAIR_P(port, " E", VOLUMETRIC_UNIT(planner.max_acceleration_mm_per_s2[E_AXIS]));
|
2016-12-04 05:02:27 +01:00
|
|
|
#endif
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_EOL_P(port);
|
2016-12-04 05:02:27 +01:00
|
|
|
#if ENABLED(DISTINCT_E_FACTORS)
|
2017-05-24 23:56:36 +02:00
|
|
|
CONFIG_ECHO_START;
|
2016-12-04 05:02:27 +01:00
|
|
|
for (uint8_t i = 0; i < E_STEPPERS; i++) {
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOPAIR_P(port, " M201 T", (int)i);
|
|
|
|
SERIAL_ECHOLNPAIR_P(port, " E", VOLUMETRIC_UNIT(planner.max_acceleration_mm_per_s2[E_AXIS + i]));
|
2016-12-04 05:02:27 +01:00
|
|
|
}
|
|
|
|
#endif
|
|
|
|
|
2016-02-17 22:05:12 +01:00
|
|
|
if (!forReplay) {
|
|
|
|
CONFIG_ECHO_START;
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOLNPGM_P(port, "Acceleration (units/s2): P<print_accel> R<retract_accel> T<travel_accel>");
|
2016-02-17 22:05:12 +01:00
|
|
|
}
|
2015-04-27 03:44:01 +02:00
|
|
|
CONFIG_ECHO_START;
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOPAIR_P(port, " M204 P", LINEAR_UNIT(planner.acceleration));
|
|
|
|
SERIAL_ECHOPAIR_P(port, " R", LINEAR_UNIT(planner.retract_acceleration));
|
|
|
|
SERIAL_ECHOLNPAIR_P(port, " T", LINEAR_UNIT(planner.travel_acceleration));
|
2017-04-17 06:24:30 +02:00
|
|
|
|
2015-03-24 18:06:44 +01:00
|
|
|
if (!forReplay) {
|
2015-04-27 03:44:01 +02:00
|
|
|
CONFIG_ECHO_START;
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOLNPGM_P(port, "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 18:06:44 +01:00
|
|
|
}
|
2017-04-17 06:24:30 +02:00
|
|
|
CONFIG_ECHO_START;
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOPAIR_P(port, " M205 S", LINEAR_UNIT(planner.min_feedrate_mm_s));
|
|
|
|
SERIAL_ECHOPAIR_P(port, " T", LINEAR_UNIT(planner.min_travel_feedrate_mm_s));
|
|
|
|
SERIAL_ECHOPAIR_P(port, " B", planner.min_segment_time_us);
|
|
|
|
SERIAL_ECHOPAIR_P(port, " X", LINEAR_UNIT(planner.max_jerk[X_AXIS]));
|
|
|
|
SERIAL_ECHOPAIR_P(port, " Y", LINEAR_UNIT(planner.max_jerk[Y_AXIS]));
|
|
|
|
SERIAL_ECHOPAIR_P(port, " Z", LINEAR_UNIT(planner.max_jerk[Z_AXIS]));
|
|
|
|
SERIAL_ECHOLNPAIR_P(port, " E", LINEAR_UNIT(planner.max_jerk[E_AXIS]));
|
2015-01-28 10:08:48 +01:00
|
|
|
|
2017-04-15 04:41:21 +02:00
|
|
|
#if HAS_M206_COMMAND
|
2017-03-05 01:01:33 +01:00
|
|
|
if (!forReplay) {
|
|
|
|
CONFIG_ECHO_START;
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOLNPGM_P(port, "Home offset:");
|
2017-03-05 01:01:33 +01:00
|
|
|
}
|
2017-04-17 06:24:30 +02:00
|
|
|
CONFIG_ECHO_START;
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOPAIR_P(port, " M206 X", LINEAR_UNIT(home_offset[X_AXIS]));
|
|
|
|
SERIAL_ECHOPAIR_P(port, " Y", LINEAR_UNIT(home_offset[Y_AXIS]));
|
|
|
|
SERIAL_ECHOLNPAIR_P(port, " Z", LINEAR_UNIT(home_offset[Z_AXIS]));
|
2017-03-05 01:01:33 +01:00
|
|
|
#endif
|
2015-04-27 03:44:01 +02:00
|
|
|
|
2016-10-29 01:55:42 +02:00
|
|
|
#if HOTENDS > 1
|
|
|
|
if (!forReplay) {
|
2015-04-27 03:44:01 +02:00
|
|
|
CONFIG_ECHO_START;
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOLNPGM_P(port, "Hotend offsets:");
|
2016-10-29 01:55:42 +02:00
|
|
|
}
|
2017-04-17 06:24:30 +02:00
|
|
|
CONFIG_ECHO_START;
|
2016-10-29 01:55:42 +02:00
|
|
|
for (uint8_t e = 1; e < HOTENDS; e++) {
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOPAIR_P(port, " M218 T", (int)e);
|
|
|
|
SERIAL_ECHOPAIR_P(port, " X", LINEAR_UNIT(hotend_offset[X_AXIS][e]));
|
|
|
|
SERIAL_ECHOPAIR_P(port, " Y", LINEAR_UNIT(hotend_offset[Y_AXIS][e]));
|
2017-08-13 23:35:59 +02:00
|
|
|
#if ENABLED(DUAL_X_CARRIAGE) || ENABLED(SWITCHING_NOZZLE) ||ENABLED(PARKING_EXTRUDER)
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOPAIR_P(port, " Z", LINEAR_UNIT(hotend_offset[Z_AXIS][e]));
|
2015-08-31 04:04:30 +02:00
|
|
|
#endif
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_EOL_P(port);
|
2015-04-27 03:44:01 +02:00
|
|
|
}
|
2016-10-29 01:55:42 +02:00
|
|
|
#endif
|
2015-04-27 03:44:01 +02:00
|
|
|
|
2018-01-04 04:55:07 +01:00
|
|
|
/**
|
|
|
|
* Bed Leveling
|
|
|
|
*/
|
|
|
|
#if HAS_LEVELING
|
2017-03-24 06:53:37 +01:00
|
|
|
|
2018-01-04 04:55:07 +01:00
|
|
|
#if ENABLED(MESH_BED_LEVELING)
|
|
|
|
|
|
|
|
if (!forReplay) {
|
2016-10-29 01:55:42 +02:00
|
|
|
CONFIG_ECHO_START;
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOLNPGM_P(port, "Mesh Bed Leveling:");
|
2016-10-29 01:55:42 +02:00
|
|
|
}
|
2017-03-24 06:53:37 +01:00
|
|
|
|
2018-01-04 04:55:07 +01:00
|
|
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
|
|
|
|
|
|
|
if (!forReplay) {
|
|
|
|
CONFIG_ECHO_START;
|
|
|
|
ubl.echo_name();
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOLNPGM_P(port, ":");
|
2018-01-04 04:55:07 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
#elif HAS_ABL
|
|
|
|
|
|
|
|
if (!forReplay) {
|
|
|
|
CONFIG_ECHO_START;
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOLNPGM_P(port, "Auto Bed Leveling:");
|
2018-01-04 04:55:07 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
#endif
|
2017-03-24 06:53:37 +01:00
|
|
|
|
2017-04-17 06:24:30 +02:00
|
|
|
CONFIG_ECHO_START;
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOPAIR_P(port, " M420 S", planner.leveling_active ? 1 : 0);
|
2017-04-21 00:45:58 +02:00
|
|
|
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOPAIR_P(port, " Z", LINEAR_UNIT(planner.z_fade_height));
|
2017-04-21 00:45:58 +02:00
|
|
|
#endif
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_EOL_P(port);
|
2017-03-24 06:53:37 +01:00
|
|
|
|
2018-01-04 04:55:07 +01:00
|
|
|
#if ENABLED(MESH_BED_LEVELING)
|
2017-05-16 09:34:36 +02:00
|
|
|
|
2018-02-25 15:07:48 +01:00
|
|
|
if (leveling_is_valid()) {
|
|
|
|
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_P(port, " G29 S3 X", (int)px + 1);
|
|
|
|
SERIAL_ECHOPAIR_P(port, " Y", (int)py + 1);
|
|
|
|
SERIAL_ECHOPGM_P(port, " Z");
|
2018-03-15 04:03:53 +01:00
|
|
|
SERIAL_ECHO_F_P(port, LINEAR_UNIT(mbl.z_values[px][py]), 5);
|
2018-02-25 15:07:48 +01:00
|
|
|
SERIAL_EOL_P(port);
|
|
|
|
}
|
2018-01-04 04:55:07 +01:00
|
|
|
}
|
|
|
|
}
|
2017-03-24 06:53:37 +01:00
|
|
|
|
2018-01-04 04:55:07 +01:00
|
|
|
#elif ENABLED(AUTO_BED_LEVELING_UBL)
|
|
|
|
|
|
|
|
if (!forReplay) {
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_EOL_P(port);
|
2018-01-04 04:55:07 +01:00
|
|
|
ubl.report_state();
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOLNPAIR_P(port, "\nActive Mesh Slot: ", ubl.storage_slot);
|
|
|
|
SERIAL_ECHOPAIR_P(port, "EEPROM can hold ", calc_num_meshes());
|
|
|
|
SERIAL_ECHOLNPGM_P(port, " meshes.\n");
|
2018-01-04 04:55:07 +01:00
|
|
|
}
|
2017-03-24 06:53:37 +01:00
|
|
|
|
2018-03-15 04:44:07 +01:00
|
|
|
ubl.report_current_mesh(PORTVAR_SOLO);
|
2018-02-25 15:07:48 +01:00
|
|
|
|
|
|
|
#elif ENABLED(AUTO_BED_LEVELING_BILINEAR)
|
|
|
|
|
|
|
|
if (leveling_is_valid()) {
|
|
|
|
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_P(port, " G29 W I", (int)px + 1);
|
|
|
|
SERIAL_ECHOPAIR_P(port, " J", (int)py + 1);
|
|
|
|
SERIAL_ECHOPGM_P(port, " Z");
|
2018-03-15 04:03:53 +01:00
|
|
|
SERIAL_ECHO_F_P(port, LINEAR_UNIT(z_values[px][py]), 5);
|
2018-02-25 15:07:48 +01:00
|
|
|
SERIAL_EOL_P(port);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
2017-02-21 13:49:31 +01:00
|
|
|
#endif
|
2017-03-24 06:53:37 +01:00
|
|
|
|
2018-01-04 04:55:07 +01:00
|
|
|
#endif // HAS_LEVELING
|
2015-04-27 03:44:01 +02:00
|
|
|
|
2016-10-29 01:55:42 +02:00
|
|
|
#if ENABLED(DELTA)
|
2017-11-05 15:49:38 +01:00
|
|
|
|
2016-10-29 01:55:42 +02:00
|
|
|
if (!forReplay) {
|
|
|
|
CONFIG_ECHO_START;
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOLNPGM_P(port, "Endstop adjustment:");
|
2016-10-29 01:55:42 +02:00
|
|
|
}
|
|
|
|
CONFIG_ECHO_START;
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOPAIR_P(port, " M666 X", LINEAR_UNIT(delta_endstop_adj[X_AXIS]));
|
|
|
|
SERIAL_ECHOPAIR_P(port, " Y", LINEAR_UNIT(delta_endstop_adj[Y_AXIS]));
|
|
|
|
SERIAL_ECHOLNPAIR_P(port, " Z", LINEAR_UNIT(delta_endstop_adj[Z_AXIS]));
|
2016-10-29 01:55:42 +02:00
|
|
|
if (!forReplay) {
|
|
|
|
CONFIG_ECHO_START;
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOLNPGM_P(port, "Delta settings: L<diagonal_rod> R<radius> H<height> S<segments_per_s> B<calibration radius> XYZ<tower angle corrections>");
|
2016-10-29 01:55:42 +02:00
|
|
|
}
|
2017-04-17 06:24:30 +02:00
|
|
|
CONFIG_ECHO_START;
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOPAIR_P(port, " M665 L", LINEAR_UNIT(delta_diagonal_rod));
|
|
|
|
SERIAL_ECHOPAIR_P(port, " R", LINEAR_UNIT(delta_radius));
|
|
|
|
SERIAL_ECHOPAIR_P(port, " H", LINEAR_UNIT(delta_height));
|
|
|
|
SERIAL_ECHOPAIR_P(port, " S", delta_segments_per_second);
|
|
|
|
SERIAL_ECHOPAIR_P(port, " B", LINEAR_UNIT(delta_calibration_radius));
|
|
|
|
SERIAL_ECHOPAIR_P(port, " X", LINEAR_UNIT(delta_tower_angle_trim[A_AXIS]));
|
|
|
|
SERIAL_ECHOPAIR_P(port, " Y", LINEAR_UNIT(delta_tower_angle_trim[B_AXIS]));
|
|
|
|
SERIAL_ECHOPAIR_P(port, " Z", LINEAR_UNIT(delta_tower_angle_trim[C_AXIS]));
|
|
|
|
SERIAL_EOL_P(port);
|
2017-10-29 09:43:44 +01:00
|
|
|
|
|
|
|
#elif ENABLED(X_DUAL_ENDSTOPS) || ENABLED(Y_DUAL_ENDSTOPS) || ENABLED(Z_DUAL_ENDSTOPS)
|
2017-11-05 15:49:38 +01:00
|
|
|
|
2016-10-29 01:55:42 +02:00
|
|
|
if (!forReplay) {
|
|
|
|
CONFIG_ECHO_START;
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOLNPGM_P(port, "Endstop adjustment:");
|
2016-10-29 01:55:42 +02:00
|
|
|
}
|
2017-04-17 06:24:30 +02:00
|
|
|
CONFIG_ECHO_START;
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOPGM_P(port, " M666");
|
2017-10-29 09:43:44 +01:00
|
|
|
#if ENABLED(X_DUAL_ENDSTOPS)
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOPAIR_P(port, " X", LINEAR_UNIT(endstops.x_endstop_adj));
|
2017-10-29 09:43:44 +01:00
|
|
|
#endif
|
|
|
|
#if ENABLED(Y_DUAL_ENDSTOPS)
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOPAIR_P(port, " Y", LINEAR_UNIT(endstops.y_endstop_adj));
|
2017-10-29 09:43:44 +01:00
|
|
|
#endif
|
|
|
|
#if ENABLED(Z_DUAL_ENDSTOPS)
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOPAIR_P(port, " Z", LINEAR_UNIT(endstops.z_endstop_adj));
|
2017-10-29 09:43:44 +01:00
|
|
|
#endif
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_EOL_P(port);
|
|
|
|
|
|
|
|
#endif // [XYZ]_DUAL_ENDSTOPS
|
2015-04-27 03:44:01 +02:00
|
|
|
|
2016-10-29 01:55:42 +02:00
|
|
|
#if ENABLED(ULTIPANEL)
|
|
|
|
if (!forReplay) {
|
|
|
|
CONFIG_ECHO_START;
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOLNPGM_P(port, "Material heatup parameters:");
|
2016-10-29 01:55:42 +02:00
|
|
|
}
|
2016-10-27 09:40:37 +02:00
|
|
|
for (uint8_t i = 0; i < COUNT(lcd_preheat_hotend_temp); i++) {
|
2017-11-15 10:58:43 +01:00
|
|
|
CONFIG_ECHO_START;
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOPAIR_P(port, " M145 S", (int)i);
|
|
|
|
SERIAL_ECHOPAIR_P(port, " H", TEMP_UNIT(lcd_preheat_hotend_temp[i]));
|
|
|
|
SERIAL_ECHOPAIR_P(port, " B", TEMP_UNIT(lcd_preheat_bed_temp[i]));
|
|
|
|
SERIAL_ECHOLNPAIR_P(port, " F", lcd_preheat_fan_speed[i]);
|
2016-10-27 09:40:37 +02:00
|
|
|
}
|
2016-10-29 01:55:42 +02:00
|
|
|
#endif // ULTIPANEL
|
2015-01-28 10:08:48 +01:00
|
|
|
|
2016-10-29 01:55:42 +02:00
|
|
|
#if HAS_PID_HEATING
|
2015-01-28 10:08:48 +01:00
|
|
|
|
2016-10-29 01:55:42 +02:00
|
|
|
if (!forReplay) {
|
2017-04-17 06:24:30 +02:00
|
|
|
CONFIG_ECHO_START;
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOLNPGM_P(port, "PID settings:");
|
2016-10-29 01:55:42 +02:00
|
|
|
}
|
|
|
|
#if ENABLED(PIDTEMP)
|
|
|
|
#if HOTENDS > 1
|
|
|
|
if (forReplay) {
|
|
|
|
HOTEND_LOOP() {
|
|
|
|
CONFIG_ECHO_START;
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOPAIR_P(port, " M301 E", e);
|
|
|
|
SERIAL_ECHOPAIR_P(port, " P", PID_PARAM(Kp, e));
|
|
|
|
SERIAL_ECHOPAIR_P(port, " I", unscalePID_i(PID_PARAM(Ki, e)));
|
|
|
|
SERIAL_ECHOPAIR_P(port, " D", unscalePID_d(PID_PARAM(Kd, e)));
|
2016-10-29 01:55:42 +02:00
|
|
|
#if ENABLED(PID_EXTRUSION_SCALING)
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOPAIR_P(port, " C", PID_PARAM(Kc, e));
|
|
|
|
if (e == 0) SERIAL_ECHOPAIR_P(port, " L", lpq_len);
|
2016-10-29 01:55:42 +02:00
|
|
|
#endif
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_EOL_P(port);
|
2016-10-29 01:55:42 +02:00
|
|
|
}
|
|
|
|
}
|
|
|
|
else
|
|
|
|
#endif // HOTENDS > 1
|
|
|
|
// !forReplay || HOTENDS == 1
|
|
|
|
{
|
|
|
|
CONFIG_ECHO_START;
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOPAIR_P(port, " M301 P", PID_PARAM(Kp, 0)); // for compatibility with hosts, only echo values for E0
|
|
|
|
SERIAL_ECHOPAIR_P(port, " I", unscalePID_i(PID_PARAM(Ki, 0)));
|
|
|
|
SERIAL_ECHOPAIR_P(port, " D", unscalePID_d(PID_PARAM(Kd, 0)));
|
2016-10-29 01:55:42 +02:00
|
|
|
#if ENABLED(PID_EXTRUSION_SCALING)
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOPAIR_P(port, " C", PID_PARAM(Kc, 0));
|
|
|
|
SERIAL_ECHOPAIR_P(port, " L", lpq_len);
|
2016-10-29 01:55:42 +02:00
|
|
|
#endif
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_EOL_P(port);
|
2016-10-29 01:55:42 +02:00
|
|
|
}
|
|
|
|
#endif // PIDTEMP
|
|
|
|
|
|
|
|
#if ENABLED(PIDTEMPBED)
|
|
|
|
CONFIG_ECHO_START;
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOPAIR_P(port, " M304 P", thermalManager.bedKp);
|
|
|
|
SERIAL_ECHOPAIR_P(port, " I", unscalePID_i(thermalManager.bedKi));
|
|
|
|
SERIAL_ECHOPAIR_P(port, " D", unscalePID_d(thermalManager.bedKd));
|
|
|
|
SERIAL_EOL_P(port);
|
2016-10-29 01:55:42 +02:00
|
|
|
#endif
|
|
|
|
|
|
|
|
#endif // PIDTEMP || PIDTEMPBED
|
|
|
|
|
|
|
|
#if HAS_LCD_CONTRAST
|
|
|
|
if (!forReplay) {
|
|
|
|
CONFIG_ECHO_START;
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOLNPGM_P(port, "LCD Contrast:");
|
2016-10-29 01:55:42 +02:00
|
|
|
}
|
2017-04-17 06:24:30 +02:00
|
|
|
CONFIG_ECHO_START;
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOLNPAIR_P(port, " M250 C", lcd_contrast);
|
2015-04-27 03:44:01 +02:00
|
|
|
#endif
|
2015-01-28 10:08:48 +01:00
|
|
|
|
2016-10-29 01:55:42 +02:00
|
|
|
#if ENABLED(FWRETRACT)
|
2012-11-07 23:16:43 +01:00
|
|
|
|
2016-10-29 01:55:42 +02:00
|
|
|
if (!forReplay) {
|
|
|
|
CONFIG_ECHO_START;
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOLNPGM_P(port, "Retract: S<length> F<units/m> Z<lift>");
|
2016-10-29 01:55:42 +02:00
|
|
|
}
|
2017-04-17 06:24:30 +02:00
|
|
|
CONFIG_ECHO_START;
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOPAIR_P(port, " M207 S", LINEAR_UNIT(fwretract.retract_length));
|
|
|
|
SERIAL_ECHOPAIR_P(port, " W", LINEAR_UNIT(fwretract.swap_retract_length));
|
|
|
|
SERIAL_ECHOPAIR_P(port, " F", MMS_TO_MMM(LINEAR_UNIT(fwretract.retract_feedrate_mm_s)));
|
|
|
|
SERIAL_ECHOLNPAIR_P(port, " Z", LINEAR_UNIT(fwretract.retract_zlift));
|
2017-04-17 06:24:30 +02:00
|
|
|
|
2016-10-29 01:55:42 +02:00
|
|
|
if (!forReplay) {
|
|
|
|
CONFIG_ECHO_START;
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOLNPGM_P(port, "Recover: S<length> F<units/m>");
|
2016-10-29 01:55:42 +02:00
|
|
|
}
|
2017-04-17 06:24:30 +02:00
|
|
|
CONFIG_ECHO_START;
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOPAIR_P(port, " M208 S", LINEAR_UNIT(fwretract.retract_recover_length));
|
|
|
|
SERIAL_ECHOPAIR_P(port, " W", LINEAR_UNIT(fwretract.swap_retract_recover_length));
|
|
|
|
SERIAL_ECHOLNPAIR_P(port, " F", MMS_TO_MMM(LINEAR_UNIT(fwretract.retract_recover_feedrate_mm_s)));
|
2017-04-17 06:24:30 +02:00
|
|
|
|
2016-10-29 01:55:42 +02:00
|
|
|
if (!forReplay) {
|
|
|
|
CONFIG_ECHO_START;
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOLNPGM_P(port, "Auto-Retract: S=0 to disable, 1 to interpret E-only moves as retract/recover");
|
2016-10-29 01:55:42 +02:00
|
|
|
}
|
2015-04-27 03:44:01 +02:00
|
|
|
CONFIG_ECHO_START;
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOLNPAIR_P(port, " M209 S", fwretract.autoretract_enabled ? 1 : 0);
|
2015-01-28 10:08:48 +01:00
|
|
|
|
2017-04-17 06:24:30 +02:00
|
|
|
#endif // FWRETRACT
|
2016-10-29 01:55:42 +02:00
|
|
|
|
|
|
|
/**
|
2017-10-29 09:43:44 +01:00
|
|
|
* Probe Offset
|
2016-10-29 01:55:42 +02:00
|
|
|
*/
|
|
|
|
#if HAS_BED_PROBE
|
|
|
|
if (!forReplay) {
|
2017-03-07 06:00:43 +01:00
|
|
|
CONFIG_ECHO_START;
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOLNPGM_P(port, "Z-Probe Offset (mm):");
|
2016-10-29 01:55:42 +02:00
|
|
|
}
|
2017-04-17 06:24:30 +02:00
|
|
|
CONFIG_ECHO_START;
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOLNPAIR_P(port, " M851 Z", LINEAR_UNIT(zprobe_zoffset));
|
2016-10-29 01:55:42 +02:00
|
|
|
#endif
|
2017-12-01 23:42:23 +01:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Bed Skew Correction
|
|
|
|
*/
|
|
|
|
#if ENABLED(SKEW_CORRECTION_GCODE)
|
|
|
|
if (!forReplay) {
|
|
|
|
CONFIG_ECHO_START;
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOLNPGM_P(port, "Skew Factor: ");
|
2017-12-01 23:42:23 +01:00
|
|
|
}
|
|
|
|
CONFIG_ECHO_START;
|
|
|
|
#if ENABLED(SKEW_CORRECTION_FOR_Z)
|
2018-01-24 02:09:40 +01:00
|
|
|
SERIAL_ECHOPGM_P(port, " M852 I");
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHO_F_P(port, LINEAR_UNIT(planner.xy_skew_factor), 6);
|
2018-01-22 15:09:36 +01:00
|
|
|
SERIAL_ECHOPGM_P(port, " J");
|
|
|
|
SERIAL_ECHO_F_P(port, LINEAR_UNIT(planner.xz_skew_factor), 6);
|
|
|
|
SERIAL_ECHOPGM_P(port, " K");
|
|
|
|
SERIAL_ECHO_F_P(port, LINEAR_UNIT(planner.yz_skew_factor), 6);
|
|
|
|
SERIAL_EOL_P(port);
|
2018-03-15 04:03:53 +01:00
|
|
|
#else
|
2018-01-24 02:09:40 +01:00
|
|
|
SERIAL_ECHOPGM_P(port, " M852 S");
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHO_F_P(port, LINEAR_UNIT(planner.xy_skew_factor), 6);
|
|
|
|
SERIAL_EOL_P(port);
|
2017-12-01 23:42:23 +01:00
|
|
|
#endif
|
|
|
|
#endif
|
2017-03-07 06:00:43 +01:00
|
|
|
|
2018-01-04 04:55:07 +01:00
|
|
|
#if HAS_TRINAMIC
|
2018-03-15 04:03:53 +01:00
|
|
|
|
|
|
|
/**
|
|
|
|
* TMC2130 / TMC2208 / TRAMS stepper driver current
|
|
|
|
*/
|
2017-03-07 06:00:43 +01:00
|
|
|
if (!forReplay) {
|
|
|
|
CONFIG_ECHO_START;
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOLNPGM_P(port, "Stepper driver current:");
|
2017-03-07 06:00:43 +01:00
|
|
|
}
|
2017-04-17 06:24:30 +02:00
|
|
|
CONFIG_ECHO_START;
|
2018-03-15 04:03:53 +01:00
|
|
|
#if X_IS_TRINAMIC
|
2018-03-14 13:25:27 +01:00
|
|
|
say_M906();
|
|
|
|
SERIAL_ECHOLNPAIR_P(port, "X", stepperX.getCurrent());
|
|
|
|
#endif
|
|
|
|
#if X2_IS_TRINAMIC
|
|
|
|
say_M906();
|
|
|
|
SERIAL_ECHOLNPAIR_P(port, "I1 X", stepperX2.getCurrent());
|
2017-03-07 06:00:43 +01:00
|
|
|
#endif
|
2018-03-15 04:03:53 +01:00
|
|
|
#if Y_IS_TRINAMIC
|
2018-03-14 13:25:27 +01:00
|
|
|
say_M906();
|
|
|
|
SERIAL_ECHOLNPAIR_P(port, "Y", stepperY.getCurrent());
|
|
|
|
#endif
|
|
|
|
#if Y2_IS_TRINAMIC
|
|
|
|
say_M906();
|
|
|
|
SERIAL_ECHOLNPAIR_P(port, "I1 Y", stepperY2.getCurrent());
|
2017-03-07 06:00:43 +01:00
|
|
|
#endif
|
2018-03-15 04:03:53 +01:00
|
|
|
#if Z_IS_TRINAMIC
|
2018-03-14 13:25:27 +01:00
|
|
|
say_M906();
|
|
|
|
SERIAL_ECHOLNPAIR_P(port, "Z", stepperZ.getCurrent());
|
|
|
|
#endif
|
|
|
|
#if Z2_IS_TRINAMIC
|
|
|
|
say_M906();
|
|
|
|
SERIAL_ECHOLNPAIR_P(port, "I1 Z", stepperZ2.getCurrent());
|
2017-03-07 06:00:43 +01:00
|
|
|
#endif
|
2018-03-15 04:03:53 +01:00
|
|
|
#if E0_IS_TRINAMIC
|
2018-03-14 13:25:27 +01:00
|
|
|
say_M906();
|
|
|
|
SERIAL_ECHOLNPAIR_P(port, "T0 E", stepperE0.getCurrent());
|
|
|
|
#endif
|
|
|
|
#if E_STEPPERS > 1 && E1_IS_TRINAMIC
|
|
|
|
say_M906();
|
|
|
|
SERIAL_ECHOLNPAIR_P(port, "T1 E", stepperE1.getCurrent());
|
|
|
|
#endif
|
|
|
|
#if E_STEPPERS > 2 && E2_IS_TRINAMIC
|
|
|
|
say_M906();
|
|
|
|
SERIAL_ECHOLNPAIR_P(port, "T2 E", stepperE2.getCurrent());
|
|
|
|
#endif
|
|
|
|
#if E_STEPPERS > 3 && E3_IS_TRINAMIC
|
|
|
|
say_M906();
|
|
|
|
SERIAL_ECHOLNPAIR_P(port, "T3 E", stepperE3.getCurrent());
|
|
|
|
#endif
|
|
|
|
#if E_STEPPERS > 4 && E4_IS_TRINAMIC
|
|
|
|
say_M906();
|
|
|
|
SERIAL_ECHOLNPAIR_P(port, "T4 E", stepperE4.getCurrent());
|
|
|
|
#endif
|
|
|
|
SERIAL_EOL_P(port);
|
2017-12-15 22:03:14 +01:00
|
|
|
|
2018-03-15 04:03:53 +01:00
|
|
|
/**
|
|
|
|
* TMC2130 / TMC2208 / TRAMS Hybrid Threshold
|
|
|
|
*/
|
2017-12-15 22:03:14 +01:00
|
|
|
if (!forReplay) {
|
|
|
|
CONFIG_ECHO_START;
|
2018-03-15 04:03:53 +01:00
|
|
|
SERIAL_ECHOLNPGM_P(port, "Hybrid Threshold:");
|
2017-12-15 22:03:14 +01:00
|
|
|
}
|
|
|
|
CONFIG_ECHO_START;
|
2018-03-15 04:03:53 +01:00
|
|
|
#if X_IS_TRINAMIC
|
2018-03-14 13:25:27 +01:00
|
|
|
say_M913();
|
|
|
|
SERIAL_ECHOLNPAIR_P(port, "X", TMC_GET_PWMTHRS(X, X));
|
|
|
|
#endif
|
|
|
|
#if X2_IS_TRINAMIC
|
|
|
|
say_M913();
|
|
|
|
SERIAL_ECHOLNPAIR_P(port, "I1 X", TMC_GET_PWMTHRS(X, X2));
|
2017-12-15 22:03:14 +01:00
|
|
|
#endif
|
2018-03-15 04:03:53 +01:00
|
|
|
#if Y_IS_TRINAMIC
|
2018-03-14 13:25:27 +01:00
|
|
|
say_M913();
|
|
|
|
SERIAL_ECHOLNPAIR_P(port, "Y", TMC_GET_PWMTHRS(Y, Y));
|
|
|
|
#endif
|
|
|
|
#if Y2_IS_TRINAMIC
|
|
|
|
say_M913();
|
|
|
|
SERIAL_ECHOLNPAIR_P(port, "I1 Y", TMC_GET_PWMTHRS(Y, Y2));
|
2017-12-15 22:03:14 +01:00
|
|
|
#endif
|
2018-03-15 04:03:53 +01:00
|
|
|
#if Z_IS_TRINAMIC
|
2018-03-14 13:25:27 +01:00
|
|
|
say_M913();
|
|
|
|
SERIAL_ECHOLNPAIR_P(port, "Z", TMC_GET_PWMTHRS(Z, Z));
|
|
|
|
#endif
|
|
|
|
#if Z2_IS_TRINAMIC
|
|
|
|
say_M913();
|
|
|
|
SERIAL_ECHOLNPAIR_P(port, "I1 Z", TMC_GET_PWMTHRS(Z, Z2));
|
2018-03-15 04:03:53 +01:00
|
|
|
#endif
|
|
|
|
#if E0_IS_TRINAMIC
|
2018-03-14 13:25:27 +01:00
|
|
|
say_M913();
|
|
|
|
SERIAL_ECHOLNPAIR_P(port, "T0 E", TMC_GET_PWMTHRS(E, E0));
|
|
|
|
#endif
|
|
|
|
#if E_STEPPERS > 1 && E1_IS_TRINAMIC
|
|
|
|
say_M913();
|
|
|
|
SERIAL_ECHOLNPAIR_P(port, "T1 E", TMC_GET_PWMTHRS(E, E1));
|
|
|
|
#endif
|
|
|
|
#if E_STEPPERS > 2 && E2_IS_TRINAMIC
|
|
|
|
say_M913();
|
|
|
|
SERIAL_ECHOLNPAIR_P(port, "T2 E", TMC_GET_PWMTHRS(E, E2));
|
|
|
|
#endif
|
|
|
|
#if E_STEPPERS > 3 && E3_IS_TRINAMIC
|
|
|
|
say_M913();
|
|
|
|
SERIAL_ECHOLNPAIR_P(port, "T3 E", TMC_GET_PWMTHRS(E, E3));
|
|
|
|
#endif
|
|
|
|
#if E_STEPPERS > 4 && E4_IS_TRINAMIC
|
|
|
|
say_M913();
|
|
|
|
SERIAL_ECHOLNPAIR_P(port, "T4 E", TMC_GET_PWMTHRS(E, E4));
|
|
|
|
#endif
|
|
|
|
SERIAL_EOL_P(port);
|
2018-03-15 04:03:53 +01:00
|
|
|
|
|
|
|
/**
|
|
|
|
* TMC2130 Sensorless homing thresholds
|
|
|
|
*/
|
|
|
|
#if ENABLED(SENSORLESS_HOMING)
|
|
|
|
if (!forReplay) {
|
|
|
|
CONFIG_ECHO_START;
|
|
|
|
SERIAL_ECHOLNPGM_P(port, "Sensorless homing threshold:");
|
|
|
|
}
|
|
|
|
CONFIG_ECHO_START;
|
|
|
|
#ifdef X_HOMING_SENSITIVITY
|
|
|
|
#if ENABLED(X_IS_TMC2130) || ENABLED(IS_TRAMS)
|
2018-03-14 13:25:27 +01:00
|
|
|
say_M914();
|
|
|
|
SERIAL_ECHOLNPAIR_P(port, "X", stepperX.sgt());
|
|
|
|
#endif
|
|
|
|
#if ENABLED(X2_IS_TMC2130)
|
|
|
|
say_M914();
|
|
|
|
SERIAL_ECHOLNPAIR_P(port, "I1 X", stepperX2.sgt());
|
2018-03-15 04:03:53 +01:00
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
#ifdef Y_HOMING_SENSITIVITY
|
|
|
|
#if ENABLED(Y_IS_TMC2130) || ENABLED(IS_TRAMS)
|
2018-03-14 13:25:27 +01:00
|
|
|
say_M914();
|
|
|
|
SERIAL_ECHOLNPAIR_P(port, "Y", stepperY.sgt());
|
|
|
|
#endif
|
|
|
|
#if ENABLED(Y2_IS_TMC2130)
|
|
|
|
say_M914();
|
|
|
|
SERIAL_ECHOLNPAIR_P(port, "I1 Y", stepperY2.sgt());
|
2018-03-15 04:03:53 +01:00
|
|
|
#endif
|
2018-02-08 11:20:44 +01:00
|
|
|
#endif
|
2018-03-15 04:03:53 +01:00
|
|
|
#ifdef Z_HOMING_SENSITIVITY
|
|
|
|
#if ENABLED(Z_IS_TMC2130) || ENABLED(IS_TRAMS)
|
2018-03-14 13:25:27 +01:00
|
|
|
say_M914();
|
|
|
|
SERIAL_ECHOLNPAIR_P(port, "Z", stepperZ.sgt());
|
|
|
|
#endif
|
|
|
|
#if ENABLED(Z2_IS_TMC2130)
|
|
|
|
say_M914();
|
|
|
|
SERIAL_ECHOLNPAIR_P(port, "I1 Z", stepperZ2.sgt());
|
2018-03-15 04:03:53 +01:00
|
|
|
#endif
|
2018-02-08 11:20:44 +01:00
|
|
|
#endif
|
2018-03-14 13:25:27 +01:00
|
|
|
SERIAL_EOL_P(port);
|
2017-03-07 06:00:43 +01:00
|
|
|
#endif
|
2018-03-15 04:03:53 +01:00
|
|
|
|
|
|
|
#endif // HAS_TRINAMIC
|
2017-04-16 05:18:10 +02:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Linear Advance
|
|
|
|
*/
|
|
|
|
#if ENABLED(LIN_ADVANCE)
|
|
|
|
if (!forReplay) {
|
|
|
|
CONFIG_ECHO_START;
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOLNPGM_P(port, "Linear Advance:");
|
2017-04-16 05:18:10 +02:00
|
|
|
}
|
|
|
|
CONFIG_ECHO_START;
|
2018-02-23 07:53:29 +01:00
|
|
|
SERIAL_ECHOLNPAIR_P(port, " M900 K", planner.extruder_advance_K);
|
2017-04-16 05:18:10 +02:00
|
|
|
#endif
|
2017-06-03 07:38:07 +02:00
|
|
|
|
|
|
|
#if HAS_MOTOR_CURRENT_PWM
|
|
|
|
CONFIG_ECHO_START;
|
|
|
|
if (!forReplay) {
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOLNPGM_P(port, "Stepper motor currents:");
|
2017-06-03 07:38:07 +02:00
|
|
|
CONFIG_ECHO_START;
|
|
|
|
}
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOPAIR_P(port, " M907 X", stepper.motor_current_setting[0]);
|
|
|
|
SERIAL_ECHOPAIR_P(port, " Z", stepper.motor_current_setting[1]);
|
|
|
|
SERIAL_ECHOPAIR_P(port, " E", stepper.motor_current_setting[2]);
|
|
|
|
SERIAL_EOL_P(port);
|
2017-06-03 07:38:07 +02:00
|
|
|
#endif
|
2018-01-04 12:06:34 +01:00
|
|
|
|
|
|
|
/**
|
|
|
|
* Advanced Pause filament load & unload lengths
|
|
|
|
*/
|
|
|
|
#if ENABLED(ADVANCED_PAUSE_FEATURE)
|
|
|
|
if (!forReplay) {
|
|
|
|
CONFIG_ECHO_START;
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOLNPGM_P(port, "Filament load/unload lengths:");
|
2018-01-04 12:06:34 +01:00
|
|
|
}
|
|
|
|
CONFIG_ECHO_START;
|
|
|
|
#if EXTRUDERS == 1
|
2018-03-15 04:03:53 +01:00
|
|
|
say_M603();
|
|
|
|
SERIAL_ECHOPAIR_P(port, "L", LINEAR_UNIT(filament_change_load_length[0]));
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOLNPAIR_P(port, " U", LINEAR_UNIT(filament_change_unload_length[0]));
|
2018-01-04 12:06:34 +01:00
|
|
|
#else
|
2018-03-15 04:03:53 +01:00
|
|
|
say_M603();
|
|
|
|
SERIAL_ECHOPAIR_P(port, "T0 L", LINEAR_UNIT(filament_change_load_length[0]));
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOLNPAIR_P(port, " U", LINEAR_UNIT(filament_change_unload_length[0]));
|
2018-01-04 12:06:34 +01:00
|
|
|
CONFIG_ECHO_START;
|
2018-03-15 04:03:53 +01:00
|
|
|
say_M603();
|
|
|
|
SERIAL_ECHOPAIR_P(port, "T1 L", LINEAR_UNIT(filament_change_load_length[1]));
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOLNPAIR_P(port, " U", LINEAR_UNIT(filament_change_unload_length[1]));
|
2018-01-04 12:06:34 +01:00
|
|
|
#if EXTRUDERS > 2
|
|
|
|
CONFIG_ECHO_START;
|
2018-03-15 04:03:53 +01:00
|
|
|
say_M603();
|
|
|
|
SERIAL_ECHOPAIR_P(port, "T2 L", LINEAR_UNIT(filament_change_load_length[2]));
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOLNPAIR_P(port, " U", LINEAR_UNIT(filament_change_unload_length[2]));
|
2018-01-04 12:06:34 +01:00
|
|
|
#if EXTRUDERS > 3
|
|
|
|
CONFIG_ECHO_START;
|
2018-03-15 04:03:53 +01:00
|
|
|
say_M603();
|
|
|
|
SERIAL_ECHOPAIR_P(port, "T3 L", LINEAR_UNIT(filament_change_load_length[3]));
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOLNPAIR_P(port, " U", LINEAR_UNIT(filament_change_unload_length[3]));
|
2018-01-04 12:06:34 +01:00
|
|
|
#if EXTRUDERS > 4
|
|
|
|
CONFIG_ECHO_START;
|
2018-03-15 04:03:53 +01:00
|
|
|
say_M603();
|
|
|
|
SERIAL_ECHOPAIR_P(port, "T4 L", LINEAR_UNIT(filament_change_load_length[4]));
|
2017-11-05 15:49:38 +01:00
|
|
|
SERIAL_ECHOLNPAIR_P(port, " U", LINEAR_UNIT(filament_change_unload_length[4]));
|
2018-01-04 12:06:34 +01:00
|
|
|
#endif // EXTRUDERS > 4
|
|
|
|
#endif // EXTRUDERS > 3
|
|
|
|
#endif // EXTRUDERS > 2
|
|
|
|
#endif // EXTRUDERS == 1
|
|
|
|
#endif // ADVANCED_PAUSE_FEATURE
|
2016-10-29 01:55:42 +02: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 15:05:11 +01:00
|
|
|
|
2015-01-28 10:08:48 +01:00
|
|
|
#endif // !DISABLE_M503
|