|
@@ -37,6 +37,7 @@ TEST_P(BikeSpeedTest1, FreCal)
|
|
|
int capValue = 0;
|
|
|
|
|
|
/* BikeSpeed Freq Cal */
|
|
|
+ int j = 0;
|
|
|
for(int i = 0; i < 100000000; i++)
|
|
|
{
|
|
|
/* Input BikeSpeed Signal */
|
|
@@ -48,22 +49,33 @@ TEST_P(BikeSpeedTest1, FreCal)
|
|
|
else
|
|
|
{
|
|
|
bikeSpeedSignal = 1;
|
|
|
- if(bikeSpeedCnt >= bikeSpeedPrd)
|
|
|
+ if(bikeSpeedPrd == 18000 && j == 0)
|
|
|
{
|
|
|
- bikeSpeedCnt = 0;
|
|
|
+ if(bikeSpeedCnt >= bikeSpeedPrd - 1)
|
|
|
+ {
|
|
|
+ bikeSpeedCnt = 0;
|
|
|
+ j = 1;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ else
|
|
|
+ {
|
|
|
+ if(bikeSpeedCnt >= bikeSpeedPrd)
|
|
|
+ {
|
|
|
+ bikeSpeedCnt = 0;
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
|
|
|
/* Timer */
|
|
|
timerCnt ++ ;
|
|
|
- if(timerCnt >= timerPrd - 1)
|
|
|
+ if(timerCnt >= timerPrd)
|
|
|
{
|
|
|
timerCnt = 0;
|
|
|
testTimerIntFlg[TIMER1][TIMER_INT_FLAG_UP] = 1;
|
|
|
}
|
|
|
|
|
|
/* Capture: rising edge trigger*/
|
|
|
- if(bikeSpeedSignal - bikeSpeedSignalLast == 1)
|
|
|
+ if(bikeSpeedSignal - bikeSpeedSignalLast == -1)
|
|
|
{
|
|
|
testCh3CapValue[TIMER1] = timerCnt;
|
|
|
testTimerIntFlg[TIMER1][TIMER_INT_FLAG_CH3] = 1;
|
|
@@ -97,7 +109,7 @@ TEST_P(BikeSpeedTest1, FreCal)
|
|
|
}
|
|
|
|
|
|
INSTANTIATE_TEST_SUITE_P(DiffBikeSpeedPeriod, BikeSpeedTest1,
|
|
|
- ::testing::Values(0, 500, 3000, 18002, 100000,1000000));
|
|
|
+ ::testing::Values(0, 500, 3000, 18000, 100000,1000000));
|
|
|
|
|
|
TEST_F(BikeSpeedTest, FreCal2)
|
|
|
{
|