From 27c5692b132c680ecf626f817cb81ef8c3374fd9 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Sat, 25 Nov 2017 18:13:36 -0600 Subject: [PATCH] Syntax tweaks --- Marlin/src/module/planner.cpp | 2 +- Marlin/src/module/temperature.cpp | 13 ++++++++----- 2 files changed, 9 insertions(+), 6 deletions(-) diff --git a/Marlin/src/module/planner.cpp b/Marlin/src/module/planner.cpp index 742528241d..769aca36c6 100644 --- a/Marlin/src/module/planner.cpp +++ b/Marlin/src/module/planner.cpp @@ -1128,7 +1128,7 @@ void Planner::_buffer_line(const float &a, const float &b, const float &c, const // Calculate and limit speed in mm/sec for each axis float current_speed[NUM_AXIS], speed_factor = 1.0; // factor <1 decreases speed LOOP_XYZE(i) { - const float cs = FABS(current_speed[i] = delta_mm[i] * inverse_mm_s); + const float cs = FABS((current_speed[i] = delta_mm[i] * inverse_mm_s)); #if ENABLED(DISTINCT_E_FACTORS) if (i == E_AXIS) i += extruder; #endif diff --git a/Marlin/src/module/temperature.cpp b/Marlin/src/module/temperature.cpp index 309adc35e4..75a0a16487 100644 --- a/Marlin/src/module/temperature.cpp +++ b/Marlin/src/module/temperature.cpp @@ -1286,11 +1286,14 @@ void Temperature::init() { case TIMER1A: case TIMER1B: //_SET_CS(1, val); break; #endif - #ifdef TCCR2 - case TIMER2: case TIMER2: _SET_CS(2, val); break; - #endif - #ifdef TCCR2A - case TIMER2A: case TIMER2B: _SET_CS(2, val); break; + #if defined(TCCR2) || defined(TCCR2A) + #ifdef TCCR2 + case TIMER2: + #endif + #ifdef TCCR2A + case TIMER2A: case TIMER2B: + #endif + _SET_CS(2, val); break; #endif #ifdef TCCR3A case TIMER3A: case TIMER3B: case TIMER3C: _SET_CS(3, val); break;