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

Cleanup warnings on non-AVR architectures (scheduler interrupts were not static)

This commit is contained in:
Josh Stewart 2023-04-24 15:33:02 +10:00
parent 3aa9aec13f
commit 76dd7dc1bf
2 changed files with 32 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
speeduino/scheduler.h
View File

@ -110,45 +110,45 @@ inline void refreshIgnitionSchedule1(unsigned long timeToEnd) __attribute__((alw
//The ARM cores use separate functions for their ISRs
#if defined(ARDUINO_ARCH_STM32) || defined(CORE_TEENSY)
static inline void fuelSchedule1Interrupt(void);
static inline void fuelSchedule2Interrupt(void);
static inline void fuelSchedule3Interrupt(void);
static inline void fuelSchedule4Interrupt(void);
inline void fuelSchedule1Interrupt(void);
inline void fuelSchedule2Interrupt(void);
inline void fuelSchedule3Interrupt(void);
inline void fuelSchedule4Interrupt(void);
#if (INJ_CHANNELS >= 5)
static inline void fuelSchedule5Interrupt(void);
inline void fuelSchedule5Interrupt(void);
#endif
#if (INJ_CHANNELS >= 6)
static inline void fuelSchedule6Interrupt(void);
inline void fuelSchedule6Interrupt(void);
#endif
#if (INJ_CHANNELS >= 7)
static inline void fuelSchedule7Interrupt(void);
inline void fuelSchedule7Interrupt(void);
#endif
#if (INJ_CHANNELS >= 8)
static inline void fuelSchedule8Interrupt(void);
inline void fuelSchedule8Interrupt(void);
#endif
#if (IGN_CHANNELS >= 1)
static inline void ignitionSchedule1Interrupt(void);
inline void ignitionSchedule1Interrupt(void);
#endif
#if (IGN_CHANNELS >= 2)
static inline void ignitionSchedule2Interrupt(void);
inline void ignitionSchedule2Interrupt(void);
#endif
#if (IGN_CHANNELS >= 3)
static inline void ignitionSchedule3Interrupt(void);
inline void ignitionSchedule3Interrupt(void);
#endif
#if (IGN_CHANNELS >= 4)
static inline void ignitionSchedule4Interrupt(void);
inline void ignitionSchedule4Interrupt(void);
#endif
#if (IGN_CHANNELS >= 5)
static inline void ignitionSchedule5Interrupt(void);
inline void ignitionSchedule5Interrupt(void);
#endif
#if (IGN_CHANNELS >= 6)
static inline void ignitionSchedule6Interrupt(void);
inline void ignitionSchedule6Interrupt(void);
#endif
#if (IGN_CHANNELS >= 7)
static inline void ignitionSchedule7Interrupt(void);
inline void ignitionSchedule7Interrupt(void);
#endif
#if (IGN_CHANNELS >= 8)
static inline void ignitionSchedule8Interrupt(void);
inline void ignitionSchedule8Interrupt(void);
#endif
#endif
/** Schedule statuses.

32
speeduino/scheduler.ino
View File

@ -839,7 +839,7 @@ extern void beginInjectorPriming(void)
//fuelSchedules 1 and 5
ISR(TIMER3_COMPA_vect) //cppcheck-suppress misra-c2012-8.2
#else
static inline void fuelSchedule1Interrupt() //Most ARM chips can simply call a function
inline void fuelSchedule1Interrupt(void)
#endif
{
if (fuelSchedule1.Status == PENDING) //Check to see if this schedule is turn on
@ -876,7 +876,7 @@ static inline void fuelSchedule1Interrupt() //Most ARM chips can simply call a f
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) || defined(__AVR_ATmega2561__) //AVR chips use the ISR for this
ISR(TIMER3_COMPB_vect) //cppcheck-suppress misra-c2012-8.2
#else
static inline void fuelSchedule2Interrupt() //Most ARM chips can simply call a function
inline void fuelSchedule2Interrupt(void)
#endif
{
if (fuelSchedule2.Status == PENDING) //Check to see if this schedule is turn on
@ -911,7 +911,7 @@ static inline void fuelSchedule2Interrupt() //Most ARM chips can simply call a f
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) || defined(__AVR_ATmega2561__) //AVR chips use the ISR for this
ISR(TIMER3_COMPC_vect) //cppcheck-suppress misra-c2012-8.2
#else
static inline void fuelSchedule3Interrupt() //Most ARM chips can simply call a function
inline void fuelSchedule3Interrupt(void)
#endif
{
if (fuelSchedule3.Status == PENDING) //Check to see if this schedule is turn on
@ -946,7 +946,7 @@ static inline void fuelSchedule3Interrupt() //Most ARM chips can simply call a f
#if defined(__AVR_ATmega1280__) || defined(__AVR_ATmega2560__) || defined(__AVR_ATmega2561__) //AVR chips use the ISR for this
ISR(TIMER4_COMPB_vect) //cppcheck-suppress misra-c2012-8.2
#else
static inline void fuelSchedule4Interrupt() //Most ARM chips can simply call a function
inline void fuelSchedule4Interrupt(void)
#endif
{
if (fuelSchedule4.Status == PENDING) //Check to see if this schedule is turn on
@ -981,7 +981,7 @@ static inline void fuelSchedule4Interrupt() //Most ARM chips can simply call a f
#if defined(CORE_AVR) //AVR chips use the ISR for this
ISR(TIMER4_COMPC_vect) //cppcheck-suppress misra-c2012-8.2
#else
static inline void fuelSchedule5Interrupt() //Most ARM chips can simply call a function
inline void fuelSchedule5Interrupt(void)
#endif
{
if (fuelSchedule5.Status == PENDING) //Check to see if this schedule is turn on
@ -1014,7 +1014,7 @@ static inline void fuelSchedule5Interrupt() //Most ARM chips can simply call a f
#if defined(CORE_AVR) //AVR chips use the ISR for this
ISR(TIMER4_COMPA_vect) //cppcheck-suppress misra-c2012-8.2
#else
static inline void fuelSchedule6Interrupt() //Most ARM chips can simply call a function
inline void fuelSchedule6Interrupt(void)
#endif
{
if (fuelSchedule6.Status == PENDING) //Check to see if this schedule is turn on
@ -1049,7 +1049,7 @@ static inline void fuelSchedule6Interrupt() //Most ARM chips can simply call a f
#if defined(CORE_AVR) //AVR chips use the ISR for this
ISR(TIMER5_COMPC_vect) //cppcheck-suppress misra-c2012-8.2
#else
static inline void fuelSchedule7Interrupt() //Most ARM chips can simply call a function
inline void fuelSchedule7Interrupt(void)
#endif
{
if (fuelSchedule7.Status == PENDING) //Check to see if this schedule is turn on
@ -1084,7 +1084,7 @@ static inline void fuelSchedule7Interrupt() //Most ARM chips can simply call a f
#if defined(CORE_AVR) //AVR chips use the ISR for this
ISR(TIMER5_COMPB_vect) //cppcheck-suppress misra-c2012-8.2
#else
static inline void fuelSchedule8Interrupt() //Most ARM chips can simply call a function
inline void fuelSchedule8Interrupt(void)
#endif
{
if (fuelSchedule8.Status == PENDING) //Check to see if this schedule is turn on
@ -1119,7 +1119,7 @@ static inline void fuelSchedule8Interrupt() //Most ARM chips can simply call a f
#if defined(CORE_AVR) //AVR chips use the ISR for this
ISR(TIMER5_COMPA_vect) //cppcheck-suppress misra-c2012-8.2
#else
static inline void ignitionSchedule1Interrupt(void) //Most ARM chips can simply call a function
inline void ignitionSchedule1Interrupt(void)
#endif
{
if (ignitionSchedule1.Status == PENDING) //Check to see if this schedule is turn on
@ -1160,7 +1160,7 @@ static inline void ignitionSchedule1Interrupt(void) //Most ARM chips can simply
#if defined(CORE_AVR) //AVR chips use the ISR for this
ISR(TIMER5_COMPB_vect) //cppcheck-suppress misra-c2012-8.2
#else
static inline void ignitionSchedule2Interrupt(void) //Most ARM chips can simply call a function
inline void ignitionSchedule2Interrupt(void)
#endif
{
if (ignitionSchedule2.Status == PENDING) //Check to see if this schedule is turn on
@ -1201,7 +1201,7 @@ static inline void ignitionSchedule2Interrupt(void) //Most ARM chips can simply
#if defined(CORE_AVR) //AVR chips use the ISR for this
ISR(TIMER5_COMPC_vect) //cppcheck-suppress misra-c2012-8.2
#else
static inline void ignitionSchedule3Interrupt(void) //Most ARM chips can simply call a function
inline void ignitionSchedule3Interrupt(void)
#endif
{
if (ignitionSchedule3.Status == PENDING) //Check to see if this schedule is turn on
@ -1242,7 +1242,7 @@ static inline void ignitionSchedule3Interrupt(void) //Most ARM chips can simply
#if defined(CORE_AVR) //AVR chips use the ISR for this
ISR(TIMER4_COMPA_vect) //cppcheck-suppress misra-c2012-8.2
#else
static inline void ignitionSchedule4Interrupt(void) //Most ARM chips can simply call a function
inline void ignitionSchedule4Interrupt(void)
#endif
{
if (ignitionSchedule4.Status == PENDING) //Check to see if this schedule is turn on
@ -1283,7 +1283,7 @@ static inline void ignitionSchedule4Interrupt(void) //Most ARM chips can simply
#if defined(CORE_AVR) //AVR chips use the ISR for this
ISR(TIMER4_COMPC_vect) //cppcheck-suppress misra-c2012-8.2
#else
static inline void ignitionSchedule5Interrupt(void) //Most ARM chips can simply call a function
inline void ignitionSchedule5Interrupt(void)
#endif
{
if (ignitionSchedule5.Status == PENDING) //Check to see if this schedule is turn on
@ -1324,7 +1324,7 @@ static inline void ignitionSchedule5Interrupt(void) //Most ARM chips can simply
#if defined(CORE_AVR) //AVR chips use the ISR for this
ISR(TIMER4_COMPB_vect) //cppcheck-suppress misra-c2012-8.2
#else
static inline void ignitionSchedule6Interrupt(void) //Most ARM chips can simply call a function
inline void ignitionSchedule6Interrupt(void)
#endif
{
if (ignitionSchedule6.Status == PENDING) //Check to see if this schedule is turn on
@ -1365,7 +1365,7 @@ static inline void ignitionSchedule6Interrupt(void) //Most ARM chips can simply
#if defined(CORE_AVR) //AVR chips use the ISR for this
ISR(TIMER3_COMPC_vect) //cppcheck-suppress misra-c2012-8.2
#else
static inline void ignitionSchedule7Interrupt(void) //Most ARM chips can simply call a function
inline void ignitionSchedule7Interrupt(void)
#endif
{
if (ignitionSchedule7.Status == PENDING) //Check to see if this schedule is turn on
@ -1406,7 +1406,7 @@ static inline void ignitionSchedule7Interrupt(void) //Most ARM chips can simply
#if defined(CORE_AVR) //AVR chips use the ISR for this
ISR(TIMER3_COMPB_vect) //cppcheck-suppress misra-c2012-8.2
#else
static inline void ignitionSchedule8Interrupt(void) //Most ARM chips can simply call a function
inline void ignitionSchedule8Interrupt(void)
#endif
{
if (ignitionSchedule8.Status == PENDING) //Check to see if this schedule is turn on