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

Apply misc TERN

Browse source
This commit is contained in:
Scott Lahteine 2020-05-18 13:58:11 -05:00
parent 6ee81f0d26
commit 7628895ac8
2 changed files with 3 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
Marlin/src/gcode/calibrate/G28.cpp
View file

@ -369,11 +369,8 @@ void GcodeSuite::G28() {
if (doZ) { if (doZ) {
TERN_(BLTOUCH, bltouch.init()); TERN_(BLTOUCH, bltouch.init());
#if ENABLED(Z_SAFE_HOMING)
home_z_safely(); TERN(Z_SAFE_HOMING, home_z_safely(), homeaxis(Z_AXIS));
#else
homeaxis(Z_AXIS);
#endif
#if HOMING_Z_WITH_PROBE && defined(Z_AFTER_PROBING) #if HOMING_Z_WITH_PROBE && defined(Z_AFTER_PROBING)
#if Z_AFTER_HOMING > Z_AFTER_PROBING #if Z_AFTER_HOMING > Z_AFTER_PROBING

6
Marlin/src/module/temperature.cpp
View file

@ -900,11 +900,7 @@ void Temperature::min_temp_error(const heater_ind_t heater) {
#else // No PID enabled #else // No PID enabled
#if HEATER_IDLE_HANDLER const bool is_idling = TERN0(HEATER_IDLE_HANDLER, hotend_idle[ee].timed_out);
const bool is_idling = hotend_idle[ee].timed_out;
#else
constexpr bool is_idling = false;
#endif
const float pid_output = (!is_idling && temp_hotend[ee].celsius < temp_hotend[ee].target) ? BANG_MAX : 0; const float pid_output = (!is_idling && temp_hotend[ee].celsius < temp_hotend[ee].target) ? BANG_MAX : 0;
#endif #endif