Fix unit test build errors from last commit
This commit is contained in:
parent
53d6a6a461
commit
1e66cfc5a6
|
@ -219,9 +219,9 @@ void triggerSec_NGC68(void);
|
||||||
uint16_t getRPM_NGC(void);
|
uint16_t getRPM_NGC(void);
|
||||||
void triggerSetEndTeeth_NGC(void);
|
void triggerSetEndTeeth_NGC(void);
|
||||||
|
|
||||||
void triggerSetup_Renix();
|
void triggerSetup_Renix(void);
|
||||||
void triggerPrimary_Renix();
|
void triggerPrimary_Renix(void);
|
||||||
void triggerSetEndTeeth_Renix();
|
void triggerSetEndTeeth_Renix(void);
|
||||||
|
|
||||||
void triggerSetup_RoverMEMS(void);
|
void triggerSetup_RoverMEMS(void);
|
||||||
void triggerPri_RoverMEMS(void);
|
void triggerPri_RoverMEMS(void);
|
||||||
|
|
|
@ -47,6 +47,8 @@ uint16_t (*getRPM)(void); ///Pointer to the getRPM function (Gets pointed to the
|
||||||
int (*getCrankAngle)(void); ///Pointer to the getCrank Angle function (Gets pointed to the relevant decoder)
|
int (*getCrankAngle)(void); ///Pointer to the getCrank Angle function (Gets pointed to the relevant decoder)
|
||||||
void (*triggerSetEndTeeth)(void); ///Pointer to the triggerSetEndTeeth function of each decoder
|
void (*triggerSetEndTeeth)(void); ///Pointer to the triggerSetEndTeeth function of each decoder
|
||||||
|
|
||||||
|
static void triggerRoverMEMSCommon(void);
|
||||||
|
|
||||||
volatile unsigned long curTime;
|
volatile unsigned long curTime;
|
||||||
volatile unsigned long curGap;
|
volatile unsigned long curGap;
|
||||||
volatile unsigned long curTime2;
|
volatile unsigned long curTime2;
|
||||||
|
@ -4776,7 +4778,7 @@ void triggerSetEndTeeth_Vmax(void)
|
||||||
* @defgroup dec_renix Renix decoder
|
* @defgroup dec_renix Renix decoder
|
||||||
* @{
|
* @{
|
||||||
*/
|
*/
|
||||||
void triggerSetup_Renix()
|
void triggerSetup_Renix(void)
|
||||||
{
|
{
|
||||||
if( configPage2.nCylinders == 4)
|
if( configPage2.nCylinders == 4)
|
||||||
{
|
{
|
||||||
|
@ -4808,7 +4810,7 @@ void triggerSetup_Renix()
|
||||||
#define renixSystemLastToothTime toothLastToothRisingTime
|
#define renixSystemLastToothTime toothLastToothRisingTime
|
||||||
#define renixSystemLastMinusOneToothTime toothLastSecToothRisingTime
|
#define renixSystemLastMinusOneToothTime toothLastSecToothRisingTime
|
||||||
|
|
||||||
void triggerPri_Renix()
|
void triggerPri_Renix(void)
|
||||||
{
|
{
|
||||||
curTime = micros();
|
curTime = micros();
|
||||||
curGap = curTime - renixSystemLastToothTime;
|
curGap = curTime - renixSystemLastToothTime;
|
||||||
|
@ -4882,7 +4884,7 @@ void triggerPri_Renix()
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
void triggerSetEndTeeth_Renix()
|
void triggerSetEndTeeth_Renix(void)
|
||||||
{
|
{
|
||||||
byte toothAdder = 0;
|
byte toothAdder = 0;
|
||||||
if( (configPage4.sparkMode == IGN_MODE_SEQUENTIAL) && (configPage4.TrigSpeed == CRANK_SPEED) ) { toothAdder = configPage4.triggerTeeth; }
|
if( (configPage4.sparkMode == IGN_MODE_SEQUENTIAL) && (configPage4.TrigSpeed == CRANK_SPEED) ) { toothAdder = configPage4.triggerTeeth; }
|
||||||
|
@ -5139,7 +5141,7 @@ void triggerPri_RoverMEMS()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
void triggerRoverMEMSCommon(void)
|
static void triggerRoverMEMSCommon(void)
|
||||||
{
|
{
|
||||||
// pattern 1 isn't unique & if we don't have a cam we need special code to identify if we're tooth 18 or 36 - this allows batch injection but not spark to run
|
// pattern 1 isn't unique & if we don't have a cam we need special code to identify if we're tooth 18 or 36 - this allows batch injection but not spark to run
|
||||||
// as we have to be greater than 18 teeth when using the cam this code also works for that.
|
// as we have to be greater than 18 teeth when using the cam this code also works for that.
|
||||||
|
|
|
@ -9,7 +9,6 @@ void test_setup_renix44()
|
||||||
//Setup a renix 44 tooth wheel
|
//Setup a renix 44 tooth wheel
|
||||||
configPage4.TrigPattern = DECODER_RENIX;
|
configPage4.TrigPattern = DECODER_RENIX;
|
||||||
configPage2.nCylinders = 4;
|
configPage2.nCylinders = 4;
|
||||||
decoderHasSecondary = false;
|
|
||||||
|
|
||||||
triggerSetup_Renix();
|
triggerSetup_Renix();
|
||||||
}
|
}
|
||||||
|
@ -19,7 +18,6 @@ void test_setup_renix66()
|
||||||
//Setup a renix 66 tooth wheel
|
//Setup a renix 66 tooth wheel
|
||||||
configPage4.TrigPattern = DECODER_RENIX;
|
configPage4.TrigPattern = DECODER_RENIX;
|
||||||
configPage2.nCylinders = 6;
|
configPage2.nCylinders = 6;
|
||||||
decoderHasSecondary = false;
|
|
||||||
|
|
||||||
triggerSetup_Renix();
|
triggerSetup_Renix();
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue