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

Fixes for PID AutoTune from menu

Browse Source 
Fixes for #3189

Setting a temp is still missing
This commit is contained in:
WPBack
2016-03-21 19:02:31 +01:00
committed by Scott Lahteine
parent 3b3e8a02b5
commit e3f583a3be
5 changed files with 16 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
Marlin/ultralcd.cpp
View File

@@ -1189,39 +1189,30 @@ static void lcd_control_temperature_menu() {
raw_Kd = unscalePID_d(PID_PARAM(Kd, eindex)); \
MENU_ITEM_EDIT(float52, MSG_PID_P ELABEL, &PID_PARAM(Kp, eindex), 1, 9990); \
MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_I ELABEL, &raw_Ki, 0.01, 9990, copy_and_scalePID_i_E ## eindex); \
MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_D ELABEL, &raw_Kd, 1, 9990, copy_and_scalePID_d_E ## eindex); \
if (eindex == 0) { \
MENU_ITEM(gcode, MSG_PID_AUTOTUNE ELABEL, PSTR("M303 U1")); \
} \
else if (eindex == 1) { \
MENU_ITEM(gcode, MSG_PID_AUTOTUNE ELABEL, PSTR("M303 U1 E1")); \
} \
else if (eindex == 2) { \
MENU_ITEM(gcode, MSG_PID_AUTOTUNE ELABEL, PSTR("M303 U1 E2")); \
} \
else { \
MENU_ITEM(gcode, MSG_PID_AUTOTUNE ELABEL, PSTR("M303 U1 E3")); \
}
MENU_ITEM_EDIT_CALLBACK(float52, MSG_PID_D ELABEL, &raw_Kd, 1, 9990, copy_and_scalePID_d_E ## eindex)
#if ENABLED(PID_ADD_EXTRUSION_RATE)
#define PID_MENU_ITEMS(ELABEL, eindex) \
#define PID_MENU_ITEMS(ELABEL, eindex, AUTOTUNE_CMD) \
_PID_MENU_ITEMS(ELABEL, eindex); \
MENU_ITEM_EDIT(float3, MSG_PID_C ELABEL, &PID_PARAM(Kc, eindex), 1, 9990)
MENU_ITEM_EDIT(float3, MSG_PID_C ELABEL, &PID_PARAM(Kc, eindex), 1, 9990); \
MENU_ITEM(gcode, MSG_PID_AUTOTUNE ELABEL, PSTR(AUTOTUNE_CMD))
#else
#define PID_MENU_ITEMS(ELABEL, eindex) _PID_MENU_ITEMS(ELABEL, eindex)
#define PID_MENU_ITEMS(ELABEL, eindex, AUTOTUNE_CMD) \
_PID_MENU_ITEMS(ELABEL, eindex); \
MENU_ITEM(gcode, MSG_PID_AUTOTUNE ELABEL, PSTR(AUTOTUNE_CMD))
#endif
#if ENABLED(PID_PARAMS_PER_EXTRUDER) && EXTRUDERS > 1
PID_MENU_ITEMS(MSG_E1, 0);
PID_MENU_ITEMS(MSG_E2, 1);
PID_MENU_ITEMS(MSG_E1, 0, "M303 U1");
PID_MENU_ITEMS(MSG_E2, 1, "M303 U1 E1");
#if EXTRUDERS > 2
PID_MENU_ITEMS(MSG_E3, 2);
PID_MENU_ITEMS(MSG_E3, 2, "M303 U1 E2");
#if EXTRUDERS > 3
PID_MENU_ITEMS(MSG_E4, 3);
PID_MENU_ITEMS(MSG_E4, 3, "M303 U1 E3");
#endif //EXTRUDERS > 3
#endif //EXTRUDERS > 2
#else //!PID_PARAMS_PER_EXTRUDER || EXTRUDERS == 1
PID_MENU_ITEMS("", 0);
PID_MENU_ITEMS("", 0, "M303 U1");
#endif //!PID_PARAMS_PER_EXTRUDER || EXTRUDERS == 1
#endif //PIDTEMP