Bladeren bron

解决部分Bug

dd 2 maanden geleden
bovenliggende
commit
48812a08d0

+ 2 - 2
3.BasicFunction/Include/Cadence.h

@@ -30,7 +30,7 @@
 #define TORQUE_LF_MINFRE                25   // Min frequency of human foot in Low frequency method, 0.01Hz
 #define TORQUE_HF_MAXTIME_MS            150  // 3000             //Min time of valid pulses, ms
 #define TORQUE_ERROR_RESETTIME_MS       5000 // TIMER PERIOD,ms
-#define TORQUE_TIM_TIMERUNIT_US         ((SLONG)500000/FTBS_HZ)   //25   // TIMER PERIOD,ms    us
+#define TORQUE_TIM_TIMERUNIT_US         ((SLONG)100000/FTBS_HZ)   //25   // TIMER PERIOD,ms    us
 #define TORQUE_LPF_GAIN                 80   //%
 #define TORQUE_MAX_FREQUENCY            5    // Hz, human foot
 //#elif (ASSIST_MODE == CADENCE_ASSIST)
@@ -42,7 +42,7 @@
 #define CADENCE_LF_MINFRE                25   // Min frequency of human foot in Low frequency method, 0.01Hz
 #define CADENCE_HF_MAXTIME_MS            ((800*12)/CADENCE_NUMBERS_PULSES)  // 3000             //Min time of valid pulses, ms
 #define CADENCE_ERROR_RESETTIME_MS       5000 // TIMER PERIOD,ms
-#define CADENCE_TIM_TIMERUNIT_US         ((SLONG)500000/FTBS_HZ)   //25   // TIMER PERIOD,ms    us
+#define CADENCE_TIM_TIMERUNIT_US         ((SLONG)100000/FTBS_HZ)   //25   // TIMER PERIOD,ms    us
 #define CADENCE_LPF_GAIN                 80   //%
 #define CADENCE_MAX_FREQUENCY            5    // Hz, human foot
 //#endif

+ 1 - 1
3.BasicFunction/Include/bikespeed.h

@@ -27,7 +27,7 @@ typedef _Bool  BOOL;
 #define BIKESPEED_NUMBERS_VALIDPULSE2START 1  // numbers of valid pulses that needed to start
 #define BIKESPEED_HF_MINTIME_MS               5000  // Min time of valid pulses, ms
 #define BIKESPEED_ERROR_RESETTIME_MS          5000  // TIMER PERIOD,ms
-#define BIKESPEED_TIM_TIMERUNIT_US            ((SLONG)500000/FTBS_HZ)    // TIMER PERIOD,us
+#define BIKESPEED_TIM_TIMERUNIT_US            ((SLONG)1000000/FTBS_HZ)    // TIMER PERIOD,us
 #define BIKESPEED_LPF_GAIN                 80    //
 #define BIKESPEED_MAX_FREQUENCY            20    // Hz, ebike wheel
 

+ 1 - 1
3.BasicFunction/Source/CadAssist.c

@@ -361,7 +361,7 @@ void ass_voAssistCoefCal(void)
     /** Motor Max Speed calculate according to bike speed limit */
     tmp_slAssistSpdLimit = ((SLONG)ass_stCadAssCoef.swKmhToMSpdPu*((SLONG) ass_stCadAssCoef.uwThrottleMaxBikeSpeed + ASS_SPD_LIMIT_ERR) >> 4) / 10;
     ass_stCadAssCoef.swThrottleMaxspd= (SWORD)tmp_slAssistSpdLimit;
-    tmp_slAssistSpdLimit = ((SWORD)((SLONG)ass_stCadAssCoef.swKmhToMSpdPu*((SLONG)ass_stCadAssCoef.uwAssistMaxBikeSpeed + ASS_SPD_LIMIT_ERR) >> 4)) / 10;
+    tmp_slAssistSpdLimit = ((SLONG)((SLONG)ass_stCadAssCoef.swKmhToMSpdPu*((SLONG)ass_stCadAssCoef.uwAssistMaxBikeSpeed + ASS_SPD_LIMIT_ERR) >> 4)) / 10;
     ass_stCadAssCoef.swAssistMaxSpd=(SWORD)tmp_slAssistSpdLimit;
 
    #if(THROTTLEGEAR !=0)

+ 2 - 2
4.BasicHardwSoftwLayer/2.BasicSoftwLayer/Include/syspar.h

@@ -216,12 +216,12 @@ Update Time
 *=======================================================================*/
 #define FPWM_HZ        16000
 #define FTBC_HZ        8000
-#define FTBS_HZ        4000
+#define FTBS_HZ        8000
 #define FSYSTICK_HZ    1000
 #define PWM_PERIOD_CNT 4500
 #define PWM_PERIOD_US  625
 #define TBC_PERIOD_US  1250
-#define TBS_PERIOD_US  5000
+#define TBS_PERIOD_US  1250
 #define EVENT_1MS_HZ   1000
 
 /*======================================================================*