Skip to content

J
jiancetai
Commit 7e42f9ee authored by 王佳伟's avatar 王佳伟
Browse files
Options

✨ feat:豪进750VA新增静态电流和读内部版本号

parent 22003fc6
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 144 additions and 93 deletions
source/app/api_can/can.c
View file @ 7e42f9ee
......@@ -482,13 +482,13 @@ void CheckRecvCan0Frame(stc_canfd_msg_t *stc_msg)//C CAN ��Ϣ���ջص
memcpy(MultiplePack.Data, data.Data + 5, 3);
MyRecvCount+=3;
}
if(data.Data[2] == 0x62 && data.Data[3] == 0x00 && data.Data[4] == 0x05)
if(data.Data[2] == 0x62 && data.Data[3] == 0x10 && data.Data[4] == 0x22)
{
memcpy(MultiplePack.Data, data.Data + 5, 3);
MyRecvCount+=3;
}
if(data.Data[2] == 0x62 && data.Data[3] == 0x00 && data.Data[4] == 0x06)
{
if(data.Data[2] == 0x62 && data.Data[3] == 0x10 && data.Data[4] == 0x24)
{
memcpy(MultiplePack.Data, data.Data + 5, 3);
MyRecvCount+=3;
}
......
source/app/api_gpio/io_config.c
View file @ 7e42f9ee
......@@ -77,8 +77,8 @@ void Api_GPIO_Init(void)
//��������
//���
Port_SetPinConfig(1, 21, &stc_IN_pin_config); // N
Port_SetPinConfig(1, 22, &stc_IN_pin_config); // R
//Port_SetPinConfig(1, 21, &stc_IN_pin_config); // N
//Port_SetPinConfig(1, 22, &stc_IN_pin_config); // R
Port_SetPinConfig(1, 6, &stc_IN_pin_config); // BUTTON_DETENT_IN
......@@ -143,6 +143,11 @@ void Api_GPIO_Init(void)
Port_SetPinConfig(2, 0, &stc_OUT_pin_config); //CSB0LCD_OUT
Port_SetPinConfig(1, 13, &stc_OUT_pin_config); //����ʻ��ȫ����Ϣ
Port_SetPinConfig(1, 21, &stc_OUT_pin_config);
Port_SetPinConfig(1, 22, &stc_OUT_pin_config);
Port_SetPinConfig(1, 23, &stc_OUT_pin_config);
Port_SetPinConfig(2, 1, &stc_OUT_pin_config); //WaterSeparator
Port_SetPinConfig(1, 25, &stc_OUT_pin_config); //WaterSeparator
//Port_SetPinConfig(2, 1, &stc_OUT_pin_config); //SEG0LCD_OUT
......
source/app/api_timer/api_timer.c
View file @ 7e42f9ee
......@@ -59,7 +59,7 @@ void TimeProcessing(void)
{
time1--;
}
//稳定电流5秒xxhh close
//�ȶ�����5��xxhh close
if(laohuatime > 0) {
laohuatime --;
}
......@@ -308,9 +308,9 @@ static void TIMER_1MS_ISR(void)
memset((void *)&BuzzerAlarm, 0, sizeof(BuzzerAlarm));
memset((void *)&CheckCurrent, 0, sizeof(CheckCurrent));
//#if (CAN_2ND)
// WHL_SPD11.msg.bits.WHL_SPD_FL = 0x500;//车速40
// WHL_SPD11.msg.bits.WHL_SPD_RL = 0x500;//车速40
// CGW_PC4.msg.bits.N=0x1F40;//2000 转速
// WHL_SPD11.msg.bits.WHL_SPD_FL = 0x500;//����40
// WHL_SPD11.msg.bits.WHL_SPD_RL = 0x500;//����40
// CGW_PC4.msg.bits.N=0x1F40;//2000 ת��
// //EMS_01_10ms.ENG_EngSpdVal = 0;
//#endif
}
......@@ -508,7 +508,7 @@ static void TIMER4_50US_ISR(void)
if(Time_100us_Uart9 < 0xffffffff)
Time_100us_Uart9++;
//TFT 必须用的
//TFT �����õ�
if(UP_VSYNC)
{
UpScreenTime ++;
......@@ -599,7 +599,7 @@ static void TIMER5_100US_ISR(void)
}
*/
//通道一计数
//ͨ��һ����
if (Frequeice.Flag == 1) {
if (Frequeice.Time <= 10000) {
Frequeice.Time++;
......@@ -632,6 +632,7 @@ uint32_t MODEtimer = 500;
uint32_t MODEtimer = DMS_MODE_INIT_VALUE;
#else
uint32_t MODEtimer = 0;
uint32_t AAA = 0;
#endif
uint8_t SetTimeBlinkCount = 0;
uint32_t CANSendCnts = 0;
......@@ -657,7 +658,8 @@ static void TIMER13_10MS_ISR(void)
if (g_Stage == STAGE_AutoCheck) {
if(StaticCurrent.count < 50){
StaticCurrent.buf[StaticCurrent.count] = Calculate_Thermistor(AdcValList[14]);//18
StaticCurrent.buf[StaticCurrent.count] = AdcValList[14];//18
AAA = AdcValList[14];
StaticCurrent.count ++;
if(StaticCurrent.count == 50) {
StaticCurrent.count = 0;
......
source/app/app_tft/app_tft.c
View file @ 7e42f9ee
......@@ -2299,21 +2299,6 @@ void AUTO_Step5(void)
{
SetDisplayStaticItemW2(Gear,SMALL_PIC_LIST_COL2_X,SMALL_PIC_LIST_ROW02, DRAW_LUMIN_ICOM_WINDOW);
if(ButtomCurrent.count >= 5) {
if (GearDisp == 1) //P
SetDisplayDynamicItemW2(CharP, SMALL_PIC_LIST_COL2_X + 40, SMALL_PIC_LIST_ROW02, DRAW_LUMIN_ICOM_WINDOW);
else if (GearDisp == 2) //R
SetDisplayDynamicItemW2(CharR, SMALL_PIC_LIST_COL2_X + 40, SMALL_PIC_LIST_ROW02, DRAW_LUMIN_ICOM_WINDOW);
else if (GearDisp == 3) //N
SetDisplayDynamicItemW2(CharN, SMALL_PIC_LIST_COL2_X + 40, SMALL_PIC_LIST_ROW02, DRAW_LUMIN_ICOM_WINDOW);
else if (GearDisp == 4) //D
SetDisplayDynamicItemW2(CharD, SMALL_PIC_LIST_COL2_X + 40, SMALL_PIC_LIST_ROW02, DRAW_LUMIN_ICOM_WINDOW);
else if (GearDisp == 5) {//S
#if (PRO_BR2)
SetDisplayDynamicItemW2(CharP, SMALL_PIC_LIST_COL2_X + 40, SMALL_PIC_LIST_ROW02, DRAW_LUMIN_ICOM_WINDOW);
#else
SetDisplayDynamicItemW2(CharS, SMALL_PIC_LIST_COL2_X + 40, SMALL_PIC_LIST_ROW02, DRAW_LUMIN_ICOM_WINDOW);
#endif
}
if (AutoStep5Result == 1) {
SetDisplayDynamicItemW2(RIGHT_S, SMALL_PIC_LIST_COL2_X + CHECK_STATE_OFFSET2, SMALL_PIC_LIST_ROW02, DRAW_LUMIN_ICOM_WINDOW);
} else if (AutoStep5Result == 2) {
......
source/bsp_source/bsp_button/bsp_app_AUTO.c
View file @ 7e42f9ee
......@@ -642,8 +642,8 @@ void build_number6(void)
MyRecvCount = 0;
Send_7CE_Data.Byte0Data = 0x03;
Send_7CE_Data.Byte1Data = 0x22;
Send_7CE_Data.Byte2Data = 0x00;
Send_7CE_Data.Byte3Data = 0x06;
Send_7CE_Data.Byte2Data = 0x10;
Send_7CE_Data.Byte3Data = 0x24;
Send_7CE_Data.Byte4Data = 0x00;
Send_7CE_Data.Byte5Data = 0x00;
Send_7CE_Data.Byte6Data = 0x00;
......@@ -654,7 +654,7 @@ void build_number6(void)
}
if (BetweenTime(100,200) && RxFinish == FINISH ) { //???????
GetNUM6(0);GetNUM6(1);GetNUM6(2);GetNUM6(3);GetNUM6(4);GetNUM6(5);GetNUM6(6);GetNUM6(7);
GetNUM6(2);GetNUM6(3);GetNUM6(4);GetNUM6(5);GetNUM6(6);GetNUM6(7);GetNUM6(8);GetNUM6(9);GetNUM6(10);GetNUM6(11);GetNUM6(12);GetNUM6(13);
}
else if (BetweenTime(200,300) && MultiplePack.Data[0] != 0x0){
CANSendEnable = ON; //??????????????
......@@ -1874,8 +1874,8 @@ void StaticCurrentCheck(void)//???????
//if(LampState_L.Lamps.RELAY_B_ == 1){
//LampState_L.Lamps.RELAY_IGN1 = 0;
//}
MC1413_B_ON;
MC1413_IGNOFF;
//MC1413_B_ON;
//MC1413_IGNOFF;
g_CostTimeSecond = 0;
StaticCurrent.enable = 1;
}
......@@ -1886,7 +1886,7 @@ void StaticCurrentCheck(void)//???????
}
else if (BetweenTime(1000,2000)) {
//LampState_L.Lamps.RELAY_B = 0;
MC1413_BOFF;
//MC1413_BOFF;
}
else if(GreaterThan(3000)){//
StaticCurrentNum = StaticCurrent.Value;
......@@ -1895,9 +1895,9 @@ void StaticCurrentCheck(void)//???????
//LampState_L.Lamps.RELAY_B = 1;
//LampState_L.Lamps.RELAY_IGN1 = 1;
//LampState_L.Lamps.RELAY_B_ = 0;
MC1413_IGNON;
MC1413_BON;
MC1413_B_OFF;
//MC1413_IGNON;
//MC1413_BON;
//MC1413_B_OFF;
CANSendEnable = ON;
if (BetweenTime(STATIC_BEGIN_CHECK_TIME,STATIC_BEGIN_CHECK_TIME+CLUSTER_START_TIME)) {
//uint8_t test1=1;
......@@ -1919,9 +1919,9 @@ void StaticCurrentCheck(void)//???????
//LampState_L.Lamps.RELAY_B = 1;
//LampState_L.Lamps.RELAY_IGN1 = 1;
//LampState_L.Lamps.RELAY_B_ = 0;
MC1413_IGNON;
MC1413_BON;
MC1413_B_OFF;
//MC1413_IGNON;
//MC1413_BON;
//MC1413_B_OFF;
CANSendEnable = ON;
if (BetweenTime(STATIC_BEGIN_CHECK_TIME,STATIC_BEGIN_CHECK_TIME+CLUSTER_START_TIME)) {
//uint8_t test2=1;
......@@ -2413,7 +2413,7 @@ void APP_AUTO(void)
{
switch (ButtomCurrent.count) {
case 0:
// OtherCheck();
OtherCheck();
if(g_AutoConfig.AUTO_STEP10_APPLY == 0){
ButtomCurrent.count++;
} else {
......@@ -2442,14 +2442,6 @@ void APP_AUTO(void)
else {
//ButtomCurrent.enable = 1;
build_number1();
// build_number2();
// build_number3();
// build_number3();
// build_number4();
// build_number5();
// build_number6();
// build_number7();
// SWandHW_Version();
}
break;
......@@ -2475,34 +2467,43 @@ void APP_AUTO(void)
break;
case 4:
if(g_AutoConfig.AUTO_STEP11_APPLY == 0){
//ButtomCurrent.count++;
ButtomCurrent.count = 0;
ButtomCurrent.count ++;
}
else {
//CanOutPutandBrakeCheck();
//DAY_Version();
build_number4();
build_number4();
}
break;
break;
case 5:
ErrorCode = 99;//??????
SetStartTime(0);
ButtomCurrent.enable = 0;
//if(g_AutoConfig.AUTO_STEP11_APPLY == 0){
// ButtomCurrent.count++;
//}
//else {
// build_number6();
// //CanOutPutSeatBeltCheck();
//}
break;
if(g_AutoConfig.AUTO_STEP11_APPLY == 0){
ButtomCurrent.count ++;
}
else {
//CanOutPutandBrakeCheck();
//DAY_Version();
build_number6();
}
break;
case 6:
if(g_AutoConfig.AUTO_STEP11_APPLY == 0){
ButtomCurrent.count++;
}
else {
//OtherCheck();
}
break;
case 7:
if(g_AutoConfig.AUTO_STEP11_APPLY == 0){
ButtomCurrent.count++;
}
else {
build_number7();
//build_number7();
//CanOutPutLowBrakeCheck();
}
break;
......@@ -2521,8 +2522,7 @@ void APP_AUTO(void)
ButtomCurrent.count++;
}
else {
OtherCheck();
//CanOutPutMessageCounterCheck();
}
break;
default:
......
source/bsp_source/bsp_button/bsp_app_led_output.c
View file @ 7e42f9ee
......@@ -49,7 +49,7 @@ void HJ_SWPush(HJ_SwitchOutPut SWitchSate, uint8_t SwPushCount, uint8_t SwSept)
if((SWitchSate == HJ_MODE_ShortPush) || (SWitchSate == HJ_SET_ShortPush)) {
if(HJ_SWitchUpTime == 0) {
if(SWitchSate == HJ_MODE_ShortPush) {
Port_SetPortPinLevel(1, 24, PortGpioHigh);
//Port_SetPortPinLevel(1, 24, PortGpioHigh);
Port_SetPortPinLevel(2, 27, PortGpioLow);
} else if(SWitchSate == HJ_SET_ShortPush) {
Port_SetPortPinLevel(2, 12, PortGpioLow);
......@@ -389,7 +389,10 @@ void HJ_LED(en_port_gpio_level_t LedState)
#if 1
Port_SetPortPinLevel(2, 0, PortGpioLow);//左转
Port_SetPortPinLevel(2, 1, PortGpioLow);//远光
if(LED_High_Beam_STATUS() != 1)
{
Port_SetPortPinLevel(2, 1, PortGpioLow);//远光
}
testabs = Port_SetPortPinLevel(2, 21, PortGpioHigh);//ABS
Port_SetPortPinLevel(2, 28, PortGpioLow);//电故障 备用1
Port_SetPortPinLevel(1, 13, PortGpioLow);//右转
......@@ -430,7 +433,10 @@ void HJ_LED(en_port_gpio_level_t LedState)
break;
case 3:
Port_SetPortPinLevel(2, 1, PortGpioHigh);//远光
if(LED_High_Beam_STATUS() != 1)
{
Port_SetPortPinLevel(2, 1, PortGpioHigh);//远光
}
Port_SetPortPinLevel(2, 21, PortGpioLow);//ABS
//Port_SetPortPinLevel(2, 21, PortGpioHigh);
//Port_SetPortPinLevel(2, 1, PortGpioHigh);
......
source/bsp_source/bsp_button/bsp_button.c
View file @ 7e42f9ee
......@@ -453,7 +453,10 @@ uint8_t Calc_Checksum(uint8_t *msg, uint8_t len)
// }
// }
//}
uint8_t LED_High_Beam_Flag = 0;
uint8_t LED_High_Beam_Status = 0;
uint8_t LED_High_Beam_Counts = 0;
uint8_t LED_High_Beam_Times = 0;
void Button_Statu_Manage(void)
{
uint8_t checkSum;
......@@ -509,12 +512,46 @@ void Button_Statu_Manage(void)
}else{
if(Botton.Auto.Time > 100){
Botton.Auto.Statu = 1;
Button_Press= 1;
Button_Value=3;
LED_High_Beam_Flag = 1;
LED_High_Beam_Status = 1;
LED_High_Beam_Counts = 0;
LED_High_Beam_Times = 0;
//Button_Press= 1;
//Button_Value=3;
}
Botton.Auto.Time = 0;
}
if(LED_High_Beam_Flag == 1 )
{
LED_High_Beam_Times++;
if(LED_High_Beam_Times > 100)
{
LED_High_Beam_Times = 0;
LED_High_Beam_Counts++;
if(LED_High_Beam_Counts < 20)
{
LED_High_Beam_Status = ~LED_High_Beam_Status;
}
else
{
LED_High_Beam_Flag = 0;
LED_High_Beam_Status = 0;
}
}
if(LED_High_Beam_Status == 1)
{
Port_SetPortPinLevel(2, 1, PortGpioHigh);//远光
}
else
{
Port_SetPortPinLevel(2, 1, PortGpioLow);//远光
}
if(LED_High_Beam_Flag == 0)
{
Port_SetPortPinLevel(2, 1, PortGpioLow);//远光
}
}
if(Botton.EOL.Flag == 1){ //EOL
if(Botton.EOL.Time < 3000){
Botton.EOL.Time += IntervalTimerDelta;
......@@ -739,22 +776,22 @@ void Button_Statu_Manage(void)
Botton.EOLClear.Time = 0;
}
if(Botton.End.Flag == 1)
{ //END
if(Botton.End.Time < 3000)
Botton.End.Time += IntervalTimerDelta;
} else {
if(Botton.End.Time > 100 && Botton.End.Time < 2000)
{
Botton.End.Statu = 1;
Button_Press= 1;
Button_Value=12;
}
if(Botton.End.Time > 2900)
{
bsp_Save_Check_Service(3);// �������
Diaplay_test = NewData.Data1;
}
Botton.End.Time = 0;
{
Botton.End.Time += IntervalTimerDelta;
if(Botton.End.Time > 50)
{
Botton.End.Time = 51;
Port_SetPortPinLevel(1, 21, PortGpioHigh);
}
}
else {
Botton.End.Time ++;
if(Botton.End.Time > 100)
{
Botton.End.Time = 0;
Port_SetPortPinLevel(1, 21, PortGpioLow);
}
}
}
......@@ -805,9 +842,10 @@ void Button_Statu_Manage(void)
}
}
}
uint8_t LED_High_Beam_STATUS(void)
{
return LED_High_Beam_Flag;
}
/*-------------------------------------------------------------------------
* Function Name : StageManage
* Description : ��ⲽ�账��
......
source/bsp_source/bsp_button/bsp_button.h
View file @ 7e42f9ee
......@@ -147,4 +147,5 @@ extern uint8_t laohuaflag;
extern uint16_t laohuatime;
extern uint16_t time1;
extern uint16_t count1;
extern uint8_t LED_High_Beam_STATUS(void);
#endif // #define _BSP_BUTTON_
\ No newline at end of file
source/main.c
View file @ 7e42f9ee
......@@ -828,7 +828,8 @@ void main(void)
memset(&g_stCheckResult,0,sizeof(g_stCheckResult));
#if ((PRO_CONFIG_CHECK_APPLY) || (PRO_CONFIG_EOL_APPLY))
for(;;)
{Port_SetPortPinLevel(1, 21, PortGpioLow);//测试
{
//Port_SetPortPinLevel(1, 21, PortGpioLow);//测试
// Speed_Output_Update(PWMCH_SPEED_OUT, 356, 50);
while ((Timer1msCnts > TpTaskTimerCnts) && ((Timer1msCnts - TpTaskTimerCnts) >= 2)) {
BenchTpTaskMain(2);
......
说明文件.txt 0 → 100644
View file @ 7e42f9ee
豪进750va检测台10_25_v102.srec 程序名
kl30 控制30电
kl15 控制15电
自检 出现检测界面 显示 顺序为
静态电流
软件外部版本号
硬件外部版本号
BOOT版本号
零件号
软件内部版本号 和 日期 例：11_20241026 软件内部版本号1.11 日期为20241026
注意事项：
在按自检按键时会触发5次/6次远光灯
\ No newline at end of file
豪进750va检测台10_25_v102.srec 0 → 100644
View file @ 7e42f9ee
This diff is collapsed.
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment