🩹 Use _MIN/_MAX macros for native compatibility (#24570)
This commit is contained in:
parent
9ee558afe1
commit
5dad7e0d03
@ -1418,7 +1418,7 @@ void Temperature::min_temp_error(const heater_id_t heater_id) {
|
|||||||
|
|
||||||
// At startup, initialize modeled temperatures
|
// At startup, initialize modeled temperatures
|
||||||
if (isnan(hotend.modeled_block_temp)) {
|
if (isnan(hotend.modeled_block_temp)) {
|
||||||
hotend.modeled_ambient_temp = min(30.0f, hotend.celsius); // Cap initial value at reasonable max room temperature of 30C
|
hotend.modeled_ambient_temp = _MIN(30.0f, hotend.celsius); // Cap initial value at reasonable max room temperature of 30C
|
||||||
hotend.modeled_block_temp = hotend.modeled_sensor_temp = hotend.celsius;
|
hotend.modeled_block_temp = hotend.modeled_sensor_temp = hotend.celsius;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1464,7 +1464,7 @@ void Temperature::min_temp_error(const heater_id_t heater_id) {
|
|||||||
|
|
||||||
// Only correct ambient when close to steady state (output power is not clipped or asymptotic temperature is reached)
|
// Only correct ambient when close to steady state (output power is not clipped or asymptotic temperature is reached)
|
||||||
if (WITHIN(hotend.soft_pwm_amount, 1, 126) || fabs(blocktempdelta + delta_to_apply) < (MPC_STEADYSTATE * MPC_dT))
|
if (WITHIN(hotend.soft_pwm_amount, 1, 126) || fabs(blocktempdelta + delta_to_apply) < (MPC_STEADYSTATE * MPC_dT))
|
||||||
hotend.modeled_ambient_temp += delta_to_apply > 0.f ? max(delta_to_apply, MPC_MIN_AMBIENT_CHANGE * MPC_dT) : min(delta_to_apply, -MPC_MIN_AMBIENT_CHANGE * MPC_dT);
|
hotend.modeled_ambient_temp += delta_to_apply > 0.f ? _MAX(delta_to_apply, MPC_MIN_AMBIENT_CHANGE * MPC_dT) : _MIN(delta_to_apply, -MPC_MIN_AMBIENT_CHANGE * MPC_dT);
|
||||||
|
|
||||||
float power = 0.0;
|
float power = 0.0;
|
||||||
if (hotend.target != 0 && TERN1(HEATER_IDLE_HANDLER, !heater_idle[ee].timed_out)) {
|
if (hotend.target != 0 && TERN1(HEATER_IDLE_HANDLER, !heater_idle[ee].timed_out)) {
|
||||||
|
Loading…
Reference in New Issue
Block a user