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

General cleanup

Browse source
This commit is contained in:
Scott Lahteine 2017-04-12 00:08:24 -05:00 committed by Scott Lahteine
parent 2c86dfd3b5
commit 6131c62499
3 changed files with 15 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/Marlin_main.cpp
View file

@ -5858,10 +5858,6 @@ inline void gcode_M42() {
#else #else
#if !defined(z_servo_angle)
const int z_servo_angle[2] = Z_SERVO_ANGLES;
#endif
const uint8_t probe_index = code_seen('P') ? code_value_byte() : Z_ENDSTOP_SERVO_NR; const uint8_t probe_index = code_seen('P') ? code_value_byte() : Z_ENDSTOP_SERVO_NR;
SERIAL_PROTOCOLLNPGM("Servo probe test"); SERIAL_PROTOCOLLNPGM("Servo probe test");

8
Marlin/servo.cpp
View file

@ -168,8 +168,8 @@ static void initISR(timer16_Sequence_t timer) {
SBI(TIFR, OCF3A); // clear any pending interrupts; SBI(TIFR, OCF3A); // clear any pending interrupts;
SBI(ETIMSK, OCIE3A); // enable the output compare interrupt SBI(ETIMSK, OCIE3A); // enable the output compare interrupt
#else #else
TIFR3 = _BV(OCF3A); // clear any pending interrupts; SBI(TIFR3, OCF3A); // clear any pending interrupts;
TIMSK3 = _BV(OCIE3A) ; // enable the output compare interrupt SBI(TIMSK3, OCIE3A); // enable the output compare interrupt
#endif #endif
#ifdef WIRING #ifdef WIRING
timerAttach(TIMER3OUTCOMPAREA_INT, Timer3Service); // for Wiring platform only timerAttach(TIMER3OUTCOMPAREA_INT, Timer3Service); // for Wiring platform only
@ -183,7 +183,7 @@ static void initISR(timer16_Sequence_t timer) {
TCCR4B = _BV(CS41); // set prescaler of 8 TCCR4B = _BV(CS41); // set prescaler of 8
TCNT4 = 0; // clear the timer count TCNT4 = 0; // clear the timer count
TIFR4 = _BV(OCF4A); // clear any pending interrupts; TIFR4 = _BV(OCF4A); // clear any pending interrupts;
TIMSK4 = _BV(OCIE4A) ; // enable the output compare interrupt TIMSK4 = _BV(OCIE4A); // enable the output compare interrupt
} }
#endif #endif
@ -193,7 +193,7 @@ static void initISR(timer16_Sequence_t timer) {
TCCR5B = _BV(CS51); // set prescaler of 8 TCCR5B = _BV(CS51); // set prescaler of 8
TCNT5 = 0; // clear the timer count TCNT5 = 0; // clear the timer count
TIFR5 = _BV(OCF5A); // clear any pending interrupts; TIFR5 = _BV(OCF5A); // clear any pending interrupts;
TIMSK5 = _BV(OCIE5A) ; // enable the output compare interrupt TIMSK5 = _BV(OCIE5A); // enable the output compare interrupt
} }
#endif #endif
} }