Prechádzať zdrojové kódy

feat(sim): 修复sim仿真运行bug问题

CN\zhangkai71 1 rok pred
rodič
commit
09dcf198b4

+ 0 - 12
User project/1.FrameLayer/Source/app.c

@@ -209,18 +209,6 @@ void PeripheralInit()
     iCap_EnableChannelInterrupt(0,CAP_CH(2));
     iCap_EnableChannelInterrupt(0,CAP_CH(3));
 
-#ifdef RUN_ARCH_SIM
-    iCap_BindDeviceInterrupt(2,switchhall_voTim3Int);
-    iCap_BindChannelInterrupt(2,CAP_CH(0),switchhall_voTim3Int);
-    iCap_BindChannelInterrupt(2,CAP_CH(1),switchhall_voTim3Int);
-    iCap_BindChannelInterrupt(2,CAP_CH(2),switchhall_voTim3Int);
-    iCap_EnableDeviceInterrupt(2);
-    iCap_EnableChannelInterrupt(2,CAP_CH(0));
-    iCap_EnableChannelInterrupt(2,CAP_CH(1));
-    iCap_EnableChannelInterrupt(2,CAP_CH(2));
-
-#endif
-
 }
 
 void PeripheralStart()

BIN
tests/sim/FanPlatformAuto.slx


+ 0 - 1
tests/sim/sim_board/api_rt/api_rt_cap.c

@@ -13,7 +13,6 @@ void iRtCap_Init()
     Caps[1].CapBase                 = &bikeSpdCap;
     Caps[1].CapBase->Base.Prescaler = 100;
 
-    Caps[2].CapBase                 = &switchhalCap;
 
 }
       

+ 3 - 3
tests/sim/sim_board/api_rt/api_rt_gpio.c

@@ -10,9 +10,9 @@ void iRtGpioLow_Init()
 {
     Gpios[0].GpioBase = &ledPin;
     Gpios[1].GpioBase = &capPin;
-    Gpios[2].GpioBase = &switchHallA;
-    Gpios[3].GpioBase = &switchHallB;
-    Gpios[4].GpioBase = &switchHallC;
+    Gpios[2].GpioBase = &ledPin;
+    Gpios[3].GpioBase = &ledPin;
+    Gpios[4].GpioBase = &ledPin;
     Gpios[5].GpioBase = &ledPin;
     Gpios[6].GpioBase = &bikeBrakePin;
     Gpios[7].GpioBase = &ledPin;

+ 0 - 4
tests/sim/sim_board/include/mcu_instance.h

@@ -8,9 +8,6 @@ extern struct Sim_Adc       adc2;
 extern struct Sim_Adc       adc3;
 extern struct Sim_Gpio      ledPin;
 extern struct Sim_Gpio      capPin;
-extern struct Sim_Gpio      switchHallA;
-extern struct Sim_Gpio      switchHallB;
-extern struct Sim_Gpio      switchHallC;
 extern struct Sim_Gpio      breakPin;
 extern struct Sim_Gpio      bikeBrakePin;
 extern struct Sim_Timer     sysTick;
@@ -22,4 +19,3 @@ extern struct Sim_Timer     sampleTrigTimer2;
 extern struct Sim_DMA       pwmLoadDma;
 extern struct Sim_Capture   cadenceCap;
 extern struct Sim_Capture   bikeSpdCap;
-extern struct Sim_Capture   switchhalCap;

+ 2 - 20
tests/sim/sim_board/source/board.c

@@ -35,9 +35,6 @@ void BoardInit(double ts)
     Sim_AdcInit(&adc3);
     Sim_GpioInit(&ledPin);
     Sim_GpioInit(&capPin);
-    Sim_GpioInit(&switchHallA);
-    Sim_GpioInit(&switchHallB);
-    Sim_GpioInit(&switchHallC);
     Sim_GpioInit(&breakPin);
     Sim_GpioInit(&bikeBrakePin);
     Sim_TimerInit(&sysTick);
@@ -49,7 +46,7 @@ void BoardInit(double ts)
     Sim_DMAInit(&pwmLoadDma);
     Sim_CaptureInit(&cadenceCap);
     Sim_CaptureInit(&bikeSpdCap);
-    Sim_CaptureInit(&switchhalCap);
+
 
     /* 调度器外设注册 */
     scheduler.Register(&scheduler, &pwm.Base);
@@ -58,9 +55,6 @@ void BoardInit(double ts)
     scheduler.Register(&scheduler, &adc3.Base);
     scheduler.Register(&scheduler, &ledPin.Base);
     scheduler.Register(&scheduler, &capPin.Base);
-    scheduler.Register(&scheduler, &switchHallA.Base);
-    scheduler.Register(&scheduler, &switchHallB.Base);
-    scheduler.Register(&scheduler, &switchHallC.Base);
     scheduler.Register(&scheduler, &breakPin.Base);
     scheduler.Register(&scheduler, &bikeBrakePin.Base);
     scheduler.Register(&scheduler, &sysTick.Base);
@@ -72,7 +66,7 @@ void BoardInit(double ts)
     scheduler.Register(&scheduler, &pwmLoadDma.Base);
     scheduler.Register(&scheduler, &cadenceCap.Base);
     scheduler.Register(&scheduler, &bikeSpdCap.Base);
-    scheduler.Register(&scheduler, &switchhalCap.Base);
+
     /* Pwm配置 */
     pwm.CntMode             = SIM_PWM_UP_DOWN;
     pwm.PwmMode[0]          = SIM_PWM_PWMMODE2;
@@ -178,18 +172,6 @@ void BoardInit(double ts)
     bikeSpdCap.Channel[3].Enable          = 1;
     bikeSpdCap.Channel[3].InterruptEnable = 1;
 
-    switchhalCap.CountMax                   = TICK_TRANS(HW_TIM_CLOCK_HZ / HW_INIT_FTBS_HZ - 1);
-    switchhalCap.CounterInterruptEnable     = 1;
-    switchhalCap.Channel[0].Edge            = CaptureRisingFallingEdge;
-    switchhalCap.Channel[0].Enable          = 1;
-    switchhalCap.Channel[0].InterruptEnable = 1;
-    switchhalCap.Channel[1].Edge            = CaptureRisingFallingEdge;
-    switchhalCap.Channel[1].Enable          = 1;
-    switchhalCap.Channel[1].InterruptEnable = 1;
-    switchhalCap.Channel[2].Edge            = CaptureRisingFallingEdge;
-    switchhalCap.Channel[2].Enable          = 1;
-    switchhalCap.Channel[2].InterruptEnable = 1;
-
     //scheduler.InterruptBind(&scheduler, &bikeSpdCap.Base, CaptureInterruptOut1, CaptureIsr);
 
     scheduler.AppTimeSlice.Add(&scheduler.AppTimeSlice, 1, 1, 0, BackgroundTask);

+ 0 - 4
tests/sim/sim_board/source/mcu_instance.c

@@ -7,9 +7,6 @@ struct Sim_Adc       adc2;
 struct Sim_Adc       adc3;
 struct Sim_Gpio      ledPin;
 struct Sim_Gpio      capPin;
-struct Sim_Gpio      switchHallA;
-struct Sim_Gpio      switchHallB;
-struct Sim_Gpio      switchHallC;
 struct Sim_Gpio      breakPin;
 struct Sim_Gpio      bikeBrakePin;
 struct Sim_Timer     sysTick;
@@ -21,4 +18,3 @@ struct Sim_Timer     sampleTrigTimer2;
 struct Sim_DMA       pwmLoadDma;
 struct Sim_Capture   cadenceCap;
 struct Sim_Capture   bikeSpdCap;
-struct Sim_Capture   switchhalCap;