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

Tweak some else clauses

Browse Source
This commit is contained in:
Scott Lahteine 2017-06-10 16:39:48 -05:00
parent fc89de6d8b
commit 57a51fd5db
4 changed files with 14 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Marlin/G26_Mesh_Validation_Tool.cpp
View File

@ -684,7 +684,8 @@
SERIAL_PROTOCOLLNPGM("?Prime length must be specified when not using an LCD."); SERIAL_PROTOCOLLNPGM("?Prime length must be specified when not using an LCD.");
return UBL_ERR; return UBL_ERR;
#endif #endif
} else { }
else {
g26_prime_flag++; g26_prime_flag++;
g26_prime_length = parser.value_linear_units(); g26_prime_length = parser.value_linear_units();
if (!WITHIN(g26_prime_length, 0.0, 25.0)) { if (!WITHIN(g26_prime_length, 0.0, 25.0)) {
@ -727,7 +728,9 @@
if (!parser.seen('R')) { if (!parser.seen('R')) {
SERIAL_PROTOCOLLNPGM("?(R)epeat must be specified when not using an LCD."); SERIAL_PROTOCOLLNPGM("?(R)epeat must be specified when not using an LCD.");
return UBL_ERR; return UBL_ERR;
} else g26_repeats = parser.has_value() ? parser.value_int() : GRID_MAX_POINTS + 1; }
else
g26_repeats = parser.has_value() ? parser.value_int() : GRID_MAX_POINTS + 1;
#endif #endif
if (g26_repeats < 1) { if (g26_repeats < 1) {
SERIAL_PROTOCOLLNPGM("?(R)epeat value not plausible; must be at least 1."); SERIAL_PROTOCOLLNPGM("?(R)epeat value not plausible; must be at least 1.");

3
Marlin/MarlinSerial.cpp
View File

@ -320,7 +320,8 @@
// space for us. // space for us.
if (TEST(M_UCSRxA, M_UDREx)) if (TEST(M_UCSRxA, M_UDREx))
_tx_udr_empty_irq(); _tx_udr_empty_irq();
} else { }
else {
// nop, the interrupt handler will free up space for us // nop, the interrupt handler will free up space for us
} }
} }

6
Marlin/nozzle.cpp
View File

@ -136,7 +136,8 @@ void Nozzle::circle(
// Order of movement is pretty darn important here // Order of movement is pretty darn important here
do_blocking_move_to_xy(start.x, start.y); do_blocking_move_to_xy(start.x, start.y);
do_blocking_move_to_z(start.z); do_blocking_move_to_z(start.z);
} else { }
else {
do_blocking_move_to_z(start.z); do_blocking_move_to_z(start.z);
do_blocking_move_to_xy(start.x, start.y); do_blocking_move_to_xy(start.x, start.y);
} }
@ -160,7 +161,8 @@ void Nozzle::circle(
// As above order is important // As above order is important
do_blocking_move_to_z(initial.z); do_blocking_move_to_z(initial.z);
do_blocking_move_to_xy(initial.x, initial.y); do_blocking_move_to_xy(initial.x, initial.y);
} else { }
else {
do_blocking_move_to_xy(initial.x, initial.y); do_blocking_move_to_xy(initial.x, initial.y);
do_blocking_move_to_z(initial.z); do_blocking_move_to_z(initial.z);
} }

11
Marlin/planner.cpp
View File

@ -470,14 +470,9 @@ void Planner::check_axes_activity() {
if (fan_kick_end[f] == 0) { \ if (fan_kick_end[f] == 0) { \
fan_kick_end[f] = ms + FAN_KICKSTART_TIME; \ fan_kick_end[f] = ms + FAN_KICKSTART_TIME; \
tail_fan_speed[f] = 255; \ tail_fan_speed[f] = 255; \
} else { \ } else if (PENDING(ms, fan_kick_end[f])) \
if (PENDING(ms, fan_kick_end[f])) { \ tail_fan_speed[f] = 255; \
tail_fan_speed[f] = 255; \ } else fan_kick_end[f] = 0
} \
} \
} else { \
fan_kick_end[f] = 0; \
}
#if HAS_FAN0 #if HAS_FAN0
KICKSTART_FAN(0); KICKSTART_FAN(0);