|
@@ -28,7 +28,6 @@
|
|
|
#include "MosResCalib.h"
|
|
|
#include "bikespeed.h"
|
|
|
#include "UserGpio_Config.h"
|
|
|
-#include "uart_TORG4BBSensor.h"
|
|
|
//#include "asr.h"
|
|
|
|
|
|
//#include "STLmain.h"
|
|
@@ -124,7 +123,9 @@ void Event_1ms(void)
|
|
|
else if(cp_stFlg.RunModelSelect == TorqAssist)
|
|
|
{
|
|
|
/* 力矩AD值处理 */
|
|
|
-// torsensor_voTorADC();
|
|
|
+#if (TORG4BBTORQU_ENABLE == 0)
|
|
|
+ torsensor_voTorADC();
|
|
|
+#endif
|
|
|
/* 力矩中轴助力输入 */
|
|
|
ass_voTorqAssistInput();
|
|
|
/* 根据踏频脉冲对力矩信号进行滑动平均处理 */
|
|
@@ -239,9 +240,9 @@ void Event_10ms(void)
|
|
|
|
|
|
cadence_stFreGetOut.uwFreqPercent = ((ULONG)cadence_stFreGetOut.uwLPFFrequencyPu << 14) / cadence_stFreGetCof.uwMaxCadenceFre; // Q14
|
|
|
|
|
|
-
|
|
|
+#if (TORG4BBTORQU_ENABLE == 1)
|
|
|
TORG4BB_Torque_Handler();
|
|
|
-
|
|
|
+#endif
|
|
|
/* Trip cal when open */
|
|
|
bikespeed_votempTripCal();
|
|
|
|
|
@@ -719,7 +720,7 @@ void StartSelectAssistMode(void)
|
|
|
****************************************************************/
|
|
|
void BOKESPEED_Handler(void)
|
|
|
{
|
|
|
-#if TORG4BBTORQU_ENABLE
|
|
|
+#if (TORG4BBTORQU_ENABLE == 1)
|
|
|
bikespeed_stFreGetOut.uwLPFFrequencyPu = (UWORD)((((stTORG4BBInfo.uwFlyWheelSpeed<<20)*6/1000/FBASE)<<20)/36/1048/10);
|
|
|
#else
|
|
|
/* add user code begin TMR16_GLOBAL_IRQ 0 */
|