melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #3197 from PheiPheiPhei/RCBugFix

Browse Source 
Enabling servo usage on boards with PWM current control
This commit is contained in:
Scott Lahteine 2016-03-24 05:27:57 -07:00
commit b6ca86b974
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
Marlin/servo.h
View File

@ -60,12 +60,17 @@
// Say which 16 bit timers can be used and in what order // Say which 16 bit timers can be used and in what order
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) #if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__)
#define _useTimer5
//#define _useTimer1 //#define _useTimer1
#define _useTimer3 #define _useTimer3
#define _useTimer4 #define _useTimer4
//typedef enum { _timer5, _timer1, _timer3, _timer4, _Nbr_16timers } timer16_Sequence_t ; #ifndef MOTOR_CURRENT_PWM_XY_PIN
typedef enum { _timer5, _timer3, _timer4, _Nbr_16timers } timer16_Sequence_t ; //Timer 5 is used for motor current PWM and can't be used for servos.
#define _useTimer5
//typedef enum { _timer5, _timer1, _timer3, _timer4, _Nbr_16timers } timer16_Sequence_t ;
typedef enum { _timer5, _timer3, _timer4, _Nbr_16timers } timer16_Sequence_t ;
#else
typedef enum {_timer3, _timer4, _Nbr_16timers } timer16_Sequence_t ;
#endif
#elif defined(__AVR_ATmega32U4__) #elif defined(__AVR_ATmega32U4__)
//#define _useTimer1 //#define _useTimer1