Sfoglia il codice sorgente

test(cadence): 测试踏频模块计算

CN\zhangkai71 2 anni fa
parent
commit
62363155a8

+ 5 - 14
User project/3.BasicFunction/Source/Cadence.c

@@ -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;
+
     }
 }
 /***************************************************************

+ 0 - 1
User project/3.BasicFunction/Source/InputCapture.c

@@ -14,7 +14,6 @@ void IC_CountMaxISR(void)
         bikespeed_voBikeSpeedCal(uwIntSource);
     }
 }
-
 void IC_CadenceISR(void)
 {
     if(switch_flg.SysCoef_Flag == TRUE)

+ 4 - 4
User project/5.Api_rt/api_rt_cap.c

@@ -23,20 +23,20 @@ void iRtCap_Init(void)
         Caps[0].ChannelISR[i].Action = 0;
     }
 }
-
+  
+        
 void iRtCap_Isr(uint8_t devIndex)
 {   
     uint32_t base = Caps[devIndex].CapBase;
-    uint8_t  capValues[5]={0,0,0,0,0};
+    uint16_t  capValues[5]={0,0,0,0,0};
     uint8_t  results[5]={0,1,2,3,4};
     uint16_t tmpIntf;
-    
     tmpIntf = TIMER_INTF(base);   
     for (int i = 1; i < 5; i++)
     {
         if (tmpIntf & (0x01 << i ))
         {
-            capValues[i] = iCap_GetCaptureValue(devIndex,(i));
+            capValues[i] = iCap_GetCaptureValue(devIndex,(i-1));
         }
     }
     if (tmpIntf & 0x01)