|
@@ -90,15 +90,9 @@ static void cadence_voCadenceIdle(UWORD source)
|
|
|
{
|
|
|
cadence_stFreGetOut.blCadenceCalStartState = TRUE;
|
|
|
cadence_stFreGetOut.uwCaputureOverflowCnt = 0;
|
|
|
- cadence_stFreGetOut.uwCaputureNumCnt = 1;
|
|
|
+ cadence_stFreGetOut.uwCaputureNumCnt = 0;
|
|
|
cadence_stFreGetOut.cadence_fsm = CADENCE_HFreWork;
|
|
|
cadence_stFreGetOut.uwForwardCnt = 0;
|
|
|
- cadence_stFreGetOut.uwCaputure1Cnt = (UWORD)iCap_GetCaptureValue(0, CAP_CH(2));
|
|
|
- cad_pvt_ulCadFreqPu = 1 * CADENCESPEED_KMPERH2FREQPU;
|
|
|
- cadence_stFreGetOut.uwFrequencyPu = (UWORD)cad_pvt_ulCadFreqPu;
|
|
|
- cadence_stFreGetOut.uwLPFFrequencyPu = (cadence_stFreGetOut.uwLPFFrequencyPu * cadence_stFreGetCof.uwCadenceLPFgain +
|
|
|
- cadence_stFreGetOut.uwFrequencyPu * (100 - cadence_stFreGetCof.uwCadenceLPFgain)) /
|
|
|
- 100;
|
|
|
}
|
|
|
}
|
|
|
}
|
|
@@ -219,15 +213,12 @@ static void cadence_voCadenceBackword(UWORD source)
|
|
|
if (cadence_stFreGetOut.cadence_dir == CADENCE_DIR_FORWARD)
|
|
|
{
|
|
|
cadence_stFreGetOut.uwCaputureOverflowCnt = 0;
|
|
|
- cadence_stFreGetOut.uwCaputureNumCnt = 1;
|
|
|
+ cadence_stFreGetOut.uwCaputureNumCnt = 0;
|
|
|
+ cadence_stFreGetOut.uwCaputure2Cnt = 0;
|
|
|
+ cadence_stFreGetOut.uwCaputure1Cnt = 0;
|
|
|
cadence_stFreGetOut.uwFreqPercent = 0;
|
|
|
cadence_stFreGetOut.cadence_fsm = CADENCE_HFreWork;
|
|
|
- cadence_stFreGetOut.uwCaputure1Cnt = (UWORD)iCap_GetCaptureValue(0, CAP_CH(2));
|
|
|
- cad_pvt_ulCadFreqPu = 1 * CADENCESPEED_KMPERH2FREQPU;
|
|
|
- cadence_stFreGetOut.uwFrequencyPu = (UWORD)cad_pvt_ulCadFreqPu;
|
|
|
- cadence_stFreGetOut.uwLPFFrequencyPu = (cadence_stFreGetOut.uwLPFFrequencyPu * cadence_stFreGetCof.uwCadenceLPFgain +
|
|
|
- cadence_stFreGetOut.uwFrequencyPu * (100 - cadence_stFreGetCof.uwCadenceLPFgain)) /
|
|
|
- 100;
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
/***************************************************************
|