noisymime
/
speeduino
mirror of https://github.com/noisymime/speeduino.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix ignition5 and idle interrupt mix

This commit is contained in:
Bruno Bousquet 2019-07-19 19:17:14 -04:00
parent e0f7804034
commit 6355d7d859
3 changed files with 6 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
speeduino/board_avr2560.ino
View File

@ -121,17 +121,4 @@ static inline unsigned long micros_safe()
}
#endif //TIMER5_MICROS
// Those are not needed anymore
#undef TIMER_PRESCALER_OFF
#undef TIMER_PRESCALER_1
#undef TIMER_PRESCALER_8
#undef TIMER_PRESCALER_64
#undef TIMER_PRESCALER_256
#undef TIMER_PRESCALER_1024
#undef TIMER_MODE_NORMAL
#undef TIMER_MODE_PWM
#undef TIMER_MODE_CTC
#undef TIMER_MODE_FASTPWM
#endif //CORE_AVR

2
speeduino/idle.ino
View File

@ -463,7 +463,7 @@ static inline void enableIdle()
}
#if defined(CORE_AVR) //AVR chips use the ISR for this
ISR(TIMER4_COMPC_vect)
ISR(TIMER1_COMPC_vect)
#else
static inline void idleInterrupt() //Most ARM chips can simply call a function
#endif

10
speeduino/scheduler.ino
View File

@ -854,7 +854,7 @@ static inline void fuelSchedule4Interrupt() //Most ARM chips can simply call a f
#if (INJ_CHANNELS >= 5)
#if defined(CORE_AVR) //AVR chips use the ISR for this
ISR(TIMER1_COMPC_vect) //fuelSchedule5
ISR(TIMER4_COMPC_vect) //fuelSchedule5
#else
static inline void fuelSchedule5Interrupt() //Most ARM chips can simply call a function
#endif
@ -1139,7 +1139,7 @@ static inline void ignitionSchedule4Interrupt() //Most ARM chips can simply call
#if IGN_CHANNELS >= 5
#if defined(CORE_AVR) //AVR chips use the ISR for this
ISR(TIMER1_COMPC_vect) //ignitionSchedule5
ISR(TIMER4_COMPC_vect) //ignitionSchedule5
#else
static inline void ignitionSchedule5Interrupt() //Most ARM chips can simply call a function
#endif
@ -1165,7 +1165,7 @@ static inline void ignitionSchedule5Interrupt() //Most ARM chips can simply call
#if IGN_CHANNELS >= 6
#if defined(CORE_AVR) //AVR chips use the ISR for this
ISR(TIMER1_COMPC_vect) //ignitionSchedule6 NOT CORRECT!!!
ISR(TIMER4_COMPC_vect) //ignitionSchedule6 NOT CORRECT!!!
#else
static inline void ignitionSchedule6Interrupt() //Most ARM chips can simply call a function
#endif
@ -1191,7 +1191,7 @@ static inline void ignitionSchedule6Interrupt() //Most ARM chips can simply call
#if IGN_CHANNELS >= 7
#if defined(CORE_AVR) //AVR chips use the ISR for this
ISR(TIMER1_COMPC_vect) //ignitionSchedule6 NOT CORRECT!!!
ISR(TIMER4_COMPC_vect) //ignitionSchedule6 NOT CORRECT!!!
#else
static inline void ignitionSchedule7Interrupt() //Most ARM chips can simply call a function
#endif
@ -1217,7 +1217,7 @@ static inline void ignitionSchedule7Interrupt() //Most ARM chips can simply call
#if IGN_CHANNELS >= 8
#if defined(CORE_AVR) //AVR chips use the ISR for this
ISR(TIMER1_COMPC_vect) //ignitionSchedule8 NOT CORRECT!!!
ISR(TIMER4_COMPC_vect) //ignitionSchedule8 NOT CORRECT!!!
#else
static inline void ignitionSchedule8Interrupt() //Most ARM chips can simply call a function
#endif