Эх сурвалжийг харах

前灯 6-12V GPIO初始化;AD电压采样-1.2V;灯光控制频率由10ms更改为1ms;

Ye Jin 1 жил өмнө
parent
commit
7beab78b1f

+ 6 - 2
User project/1.FrameLayer/Source/TimeTask_Event.c

@@ -64,6 +64,10 @@ void  Event_1ms(void)
     /* 1st FSM control */
     FSM_1st_Main();
     FSM1st_Sys_state.Event_hook();
+    
+    /* Bike light control */
+    Can_Light_switch();
+    bikelight_voBikeLightControl(cp_stBikeRunInfoPara.uwLightSwitch, BikeBrake_blGetstate(), ass_stParaCong.uwLightVoltage);
 
     /* Power control */
     power_voPowerManagement(ass_stParaCong.uwAutoPowerOffTime, cp_ulSystickCnt, OBC_ButtonStatus.ulButtonSetTimeCnt, \
@@ -324,8 +328,8 @@ void Event_10ms(void)
         }     
       
         // Bike light control
-        Can_Light_switch();
-        bikelight_voBikeLightControl(cp_stBikeRunInfoPara.uwLightSwitch, BikeBrake_blGetstate(), ass_stParaCong.uwLightVoltage);
+//        Can_Light_switch();
+//        bikelight_voBikeLightControl(cp_stBikeRunInfoPara.uwLightSwitch, BikeBrake_blGetstate(), ass_stParaCong.uwLightVoltage);
 
         // Trip cal when open
         bikespeed_votempTripCal();

+ 1 - 1
User project/2.MotorDrive/Source/adc.c

@@ -332,7 +332,7 @@ void adc_voSampleUp_High(const ADC_COF *cof, ADC_UP_OUT *out)
     out->uwVdcReg = iAdc_GetResultPointer(0)[HW_ADC_UDC_CH]; 
 
     out->uwVdcPu = (UWORD)((ULONG)out->uwVdcReg * cof->uwVdcReg2Pu >> 10); // Q14=Q24-Q10
-    //out->uwVdcPu = (SLONG)((out->uwVdcReg * cof->uwVdcReg2Pu >> 10) - 410); // Q14=Q24-Q10,电路上DCDC的EN漏电流导致测量偏高1.2V
+    out->uwVdcPu = (SLONG)((out->uwVdcReg * cof->uwVdcReg2Pu >> 10) - 410); // Q14=Q24-Q10,电路上DCDC的EN漏电流导致测量偏高1.2V
     /* Vdc LPF */
     out->uwVdcLpfPu = ((out->uwVdcPu - out->uwVdcLpfPu) >> 1) + out->uwVdcLpfPu;
 

+ 1 - 1
User project/4.BasicHardwSoftwLayer/1.BasicHardwLayer/Source/hwsetup.c

@@ -288,7 +288,7 @@ void hw_voInitGPIO(void)
 
     gpio_init(GPIOC,GPIO_MODE_IPD,GPIO_OSPEED_50MHZ,GPIO_PIN_14); /* Bike Brake */
 
-    gpio_init(GPIOC,GPIO_MODE_OUT_PP,GPIO_OSPEED_50MHZ, GPIO_PIN_15); /* Light Enable */
+    gpio_init(GPIOC,GPIO_MODE_OUT_PP,GPIO_OSPEED_50MHZ, GPIO_PIN_13|GPIO_PIN_15); /* Light Enable */
 
     /*=======================================================================
                                     GPIO D