|
@ -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); |
|
|