SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Use Material Preset 1 for PID autotune (#18446)

Browse source 
Co-authored-by: Scott Lahteine <thinkyhead@users.noreply.github.com>
This commit is contained in:
Luc Hoang Long 2020-07-06 13:17:40 +07:00 committed by GitHub
parent 9f5b8c9bbc
commit 764fc81761
Signed by: GitHub
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
Marlin/src/gcode/temp/M303.cpp
View file

@ -60,16 +60,8 @@ void GcodeSuite::M303() {
} }
#endif #endif
#if ENABLED(PIDTEMPBED) #define SI TERN(PIDTEMPBED, H_BED, H_E0)
#define SI H_BED #define EI TERN(PIDTEMP, HOTENDS - 1, H_BED)
#else
#define SI H_E0
#endif
#if ENABLED(PIDTEMP)
#define EI HOTENDS - 1
#else
#define EI H_BED
#endif
const heater_ind_t e = (heater_ind_t)parser.intval('E'); const heater_ind_t e = (heater_ind_t)parser.intval('E');
if (!WITHIN(e, SI, EI)) { if (!WITHIN(e, SI, EI)) {
SERIAL_ECHOLNPGM(STR_PID_BAD_EXTRUDER_NUM); SERIAL_ECHOLNPGM(STR_PID_BAD_EXTRUDER_NUM);
@ -79,7 +71,7 @@ void GcodeSuite::M303() {
const int c = parser.intval('C', 5); const int c = parser.intval('C', 5);
const bool u = parser.boolval('U'); const bool u = parser.boolval('U');
const int16_t temp = parser.celsiusval('S', e < 0 ? 70 : 150); const int16_t temp = parser.celsiusval('S', e < 0 ? PREHEAT_1_TEMP_BED : PREHEAT_1_TEMP_HOTEND);
#if DISABLED(BUSY_WHILE_HEATING) #if DISABLED(BUSY_WHILE_HEATING)
KEEPALIVE_STATE(NOT_BUSY); KEEPALIVE_STATE(NOT_BUSY);

13
Marlin/src/lcd/menu/menu_advanced.cpp
View file

@ -169,17 +169,10 @@ void menu_cancelobject();
#if ENABLED(PID_AUTOTUNE_MENU) #if ENABLED(PID_AUTOTUNE_MENU)
#if ENABLED(PIDTEMP) #if ENABLED(PIDTEMP)
#ifdef PREHEAT_1_TEMP_HOTEND int16_t autotune_temp[HOTENDS] = ARRAY_BY_HOTENDS1(PREHEAT_1_TEMP_HOTEND);
#define PID_TUNE_TEMP PREHEAT_1_TEMP_HOTEND
#else
#define PID_TUNE_TEMP 200
#endif #endif
int16_t autotune_temp[HOTENDS] = ARRAY_BY_HOTENDS1(PID_TUNE_TEMP);
#undef PID_TUNE_TEMP
#endif
#if ENABLED(PIDTEMPBED) #if ENABLED(PIDTEMPBED)
int16_t autotune_temp_bed = 70; int16_t autotune_temp_bed = PREHEAT_1_TEMP_BED;
#endif #endif
#include "../../gcode/queue.h" #include "../../gcode/queue.h"
@ -324,7 +317,7 @@ void menu_cancelobject();
#ifndef BED_OVERSHOOT #ifndef BED_OVERSHOOT
#define BED_OVERSHOOT 5 #define BED_OVERSHOOT 5
#endif #endif
EDIT_ITEM_FAST_N(int3, -1, MSG_PID_AUTOTUNE_E, &autotune_temp_bed, 70, BED_MAXTEMP - BED_OVERSHOOT, []{ _lcd_autotune(-1); }); EDIT_ITEM_FAST_N(int3, -1, MSG_PID_AUTOTUNE_E, &autotune_temp_bed, PREHEAT_1_TEMP_BED, BED_MAXTEMP - BED_OVERSHOOT, []{ _lcd_autotune(-1); });
#endif #endif
#endif #endif