zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Syntax tweaks

Browse source
This commit is contained in:
Scott Lahteine 2017-11-25 18:13:36 -06:00
parent a9adc2c2f6
commit 27c5692b13
2 changed files with 9 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/module/planner.cpp
View file

@ -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 // Calculate and limit speed in mm/sec for each axis
float current_speed[NUM_AXIS], speed_factor = 1.0; // factor <1 decreases speed float current_speed[NUM_AXIS], speed_factor = 1.0; // factor <1 decreases speed
LOOP_XYZE(i) { 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 ENABLED(DISTINCT_E_FACTORS)
if (i == E_AXIS) i += extruder; if (i == E_AXIS) i += extruder;
#endif #endif

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

@ -1286,11 +1286,14 @@ void Temperature::init() {
case TIMER1A: case TIMER1B: //_SET_CS(1, val); case TIMER1A: case TIMER1B: //_SET_CS(1, val);
break; break;
#endif #endif
#if defined(TCCR2) || defined(TCCR2A)
#ifdef TCCR2 #ifdef TCCR2
case TIMER2: case TIMER2: _SET_CS(2, val); break; case TIMER2:
#endif #endif
#ifdef TCCR2A #ifdef TCCR2A
case TIMER2A: case TIMER2B: _SET_CS(2, val); break; case TIMER2A: case TIMER2B:
#endif
_SET_CS(2, val); break;
#endif #endif
#ifdef TCCR3A #ifdef TCCR3A
case TIMER3A: case TIMER3B: case TIMER3C: _SET_CS(3, val); break; case TIMER3A: case TIMER3B: case TIMER3C: _SET_CS(3, val); break;