Skip to content

V
VC66_7C
Commit ef56acce authored by hu's avatar hu
Browse files
Options

调整GPIO配置，仪表可以点亮，GPIO配置依然不对

parent c35a7385
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 21815 additions and 21774 deletions
.gitignore
View file @ ef56acce
......@@ -11,7 +11,6 @@
*.tags
/ghs/project.out
# Object files
*.o
*.ko
......@@ -31,7 +30,6 @@
/ghs/*.dnm
/ghs/*.map
/ghs/*.run
/ghs/.srec
/ghs/*
/ghs/project.mem
......
ghs/project
View file @ ef56acce
No preview for this file type
ghs/project.hex
View file @ ef56acce
This diff is collapsed.
ghs/project.siz
View file @ ef56acce
project .intvect 1536
project .text 299068
project .text 298972
project .rodata 412383
project .secinfo 120
project .syscall 6
......
source/Application/APP/BackLight/BackLight_APP.c
View file @ ef56acce
......@@ -174,22 +174,22 @@ void BL_Management_service ( void )
/*主函数中调用第一个参数电源状态 1是 ON档 2 off 第二个参数 唤醒条件 1是TTF唤醒 2 是表盘唤醒 3 是表盘和屏都有唤醒，0无唤醒*/
BackLightSchedu(Common_Get_IG_Sts(), BackLightWakeFlag);
D8867_BL_PWM_OUT = 1 ;
BL_PWM_OUT = 1 ;
//水温灯
TimerB_PWM_Channel_Duty_Set(TIMERB_2_CH7 , testBG );//水温格白色
TEMP_LED_W_MCU_OUT = 1 ;//水温字符白色指示灯
TEMP_W_LED_OUT = 1 ;//水温字符白色指示灯
//燃油灯
if(Fuel_Get_LowAlarm())
{
FUEL_LED_Y_MCU = 1U ;
FUEL_LED_W_MCU_OUT = 0U ;
FUEL_W_LED_OUT = 0U ;
}
else
{
FUEL_LED_Y_MCU = 0U ;
FUEL_LED_W_MCU_OUT = 1U ;
FUEL_W_LED_OUT = 1U ;
}
......
source/Application/APP/LINE_IN/Line_In_user.c
View file @ ef56acce
......@@ -43,37 +43,37 @@ const Line_In_Attribute_st_t g_stLineInAttribute[LINE_IN_MAX] =
{
/*ZH修改：2021.6.24 19:47*/
/*指示灯信号 硬线输入*/
{LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_ABS,}, /*A22 ABS*/
{LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_PARK_BRAKE,}, /*A23 PARK BRAKE*/
{LINE_IN_LEVEL_HIGH, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_HI_BEAM,}, /*A25 HI BEAM*/
{LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_BRAKE_AIR_EBS,}, /*A28 BRAKE AIR/EBS*/
{LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_SEAT_BELT,}, /*A30 SEAT BELT*/
{LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_MIL,}, /*A31 MIL*/
{LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_ENG_OIL,}, /*A32 ENG OIL*/
{LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_CHARGE,}, /*A34 CHARGE*/
{LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_TRAILER_ABS_INFO,}, /*B03 TRAILER ABS INFO*/
{LINE_IN_LEVEL_HIGH, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_Rr_FOG_LAMP,}, /*B14 Rr FOG LAMP*/
{LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_ACC_AIR,}, /*B15 ACC AIR*/
{LINE_IN_LEVEL_HIGH, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_AIR_SUS,}, /*B30 AIR SUS*/
{LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_TRAILER_BRAKE,}, /*B31 TRAILER BRAKE*/
{LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_TRAILER_ABS,}, /*B33 TRAILER ABS*/
{LINE_IN_LEVEL_HIGH, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_RR_DIFF_LOCK,}, /*B36 RR DIFF LOCK*/
{LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_WEAR_IND,}, /*B38 WEAR IND*/
{LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_ABS,}, /*A22 ABS*/
{LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_PARK_BRAKE,}, /*A23 PARK BRAKE*/
{LINE_IN_LEVEL_HIGH, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_HI_BEAM,}, /*A25 HI BEAM*/
{LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_BRAKE_AIR_EBS,}, /*A28 BRAKE AIR/EBS*/
{LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_SEAT_BELT,}, /*A30 SEAT BELT*/
{LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_MIL,}, /*A31 MIL*/
{LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_ENG_OIL,}, /*A32 ENG OIL*/
{LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_CHARGE,}, /*A34 CHARGE*/
{LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_TRAILER_ABS_INFO,}, /*B03 TRAILER ABS INFO*/
{LINE_IN_LEVEL_HIGH, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_Rr_FOG_LAMP,}, /*B14 Rr FOG LAMP*/
{LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_ACC_AIR,}, /*B15 ACC AIR*/
{LINE_IN_LEVEL_HIGH, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_AIR_SUS,}, /*B30 AIR SUS*/
{LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_TRAILER_BRAKE,}, /*B31 TRAILER BRAKE*/
{LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_TRAILER_ABS,}, /*B33 TRAILER ABS*/
{LINE_IN_LEVEL_HIGH, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_RR_DIFF_LOCK,}, /*B36 RR DIFF LOCK*/
{LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_WEAR_IND,}, /*B38 WEAR IND*/
/*ZH新增：2021.6.28 18:38*/
/*非指示灯信号 硬线输入*/
{LINE_IN_LEVEL_HIGH, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_ILLUMINATION,}, /*A06 ILLUMINATION*/
{LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_RET_BLENDING,}, /*A10 RET_BLENDING*/
{LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_BRAKE,}, /*A21 BRAKE*/
{LINE_IN_LEVEL_HIGH, 200U, 0U, LINE_IN_IG_ONOFF, LINE_IN_Get_TURN_R,}, /*A26 TURN_R*/
{LINE_IN_LEVEL_HIGH, 200U, 0U, LINE_IN_IG_ONOFF, LINE_IN_Get_TURN_L,}, /*A27 TURN_L*/
{LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_ABS_DETECT,}, /*A33 ABS_DETECT*/
{LINE_IN_LEVEL_HIGH, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_PTO,}, /*B01 PTO*/
{LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_GLOW,}, /*B05 GLOW*/
{LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_TRAILER_CONNECT,}, /*B06 TRAILER_CONNECT*/
{LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_LOW_COOLANT,}, /*B32 LOW_COOLANT*/
{LINE_IN_LEVEL_HIGH, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_ACC,}, /*B39 ACC*/
{LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_WEAR2,}, /*B40 WEAR2*/
{LINE_IN_LEVEL_HIGH, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_ILLUMINATION,}, /*A06 ILLUMINATION 背光有效*/
{LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_RET_BLENDING,}, /*A10 RET_BLENDING*/
{LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_BRAKE,}, /*A21 BRAKE*/
{LINE_IN_LEVEL_HIGH, 200U, 0U, LINE_IN_IG_ONOFF, LINE_IN_Get_TURN_R,}, /*A26 TURN_R*/
{LINE_IN_LEVEL_HIGH, 200U, 0U, LINE_IN_IG_ONOFF, LINE_IN_Get_TURN_L,}, /*A27 TURN_L*/
{LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_ABS_DETECT,}, /*A33 ABS_DETECT*/
{LINE_IN_LEVEL_HIGH, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_PTO,}, /*B01 PTO*/
{LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_GLOW,}, /*B05 GLOW*/
{LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_TRAILER_CONNECT,}, /*B06 TRAILER_CONNECT*/
{LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_LOW_COOLANT,}, /*B32 LOW_COOLANT*/
{LINE_IN_LEVEL_HIGH, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_ACC,}, /*B39 ACC*/
{LINE_IN_LEVEL_LOW, 200U, 0U, LINE_IN_IG_ON, LINE_IN_Get_WEAR2,}, /*B40 WEAR2*/
};
/*ZH修改：2021.6.25 08:46*/
......@@ -208,10 +208,10 @@ LINE_IN_TriggerLevel_en_t LINE_IN_Get_WEAR_IND(void)
/*ZH新增：2021.6.29*/
/*A06 ILLUMINATION*/
/*A06 ILLUMINATION 背光有效*/
LINE_IN_TriggerLevel_en_t LINE_IN_Get_ILLUMINATION(void)
{
LINE_IN_TriggerLevel_en_t Res = ILLUMINAION_MCU;
LINE_IN_TriggerLevel_en_t Res = CD4051_COM3_X6_IN;
return Res;
}
......
source/Application/APP/PowerManagement/PowerManagement_user.c
View file @ ef56acce
......@@ -103,11 +103,12 @@ Power_Status_t Power_KL30_Init ( void )
Menu_Init(u8MenuRamData, stMenuItemAttribute, &pstMenuInit);
G_12V_EN_MCU_OUT = 1U; // 12V 电源使能
V_APOWER_MCU_OUT = 1U; // 外设5V 电源使能
D1530_EN_MCU_OUT = 1U; // 1530 使能
D8867_BL_EN_OUT = 1U; //8867 使能
L_FuelSender_OUT = 1U ;//燃油电源 使能
VCC12V0_OUT_EN = 1U; /*12V 电源使能*/
VCC05V0_OUT_EN = 1U; /*外设5V 电源使能*/
D1530_EN_MCU_OUT = 1U; /*1530 使能*/
BL_ACC_EN = 1U; /*8867 使能*/
Fuel_VCC05V_OUT_EN = 1U ; /*燃油电源 使能*/
AIR_5V_OUT_EN = 1u; /*气压 5V*/
IS31_Init();
Sound_Scheduler_Init();
Sound_Player_Init();
......@@ -125,9 +126,6 @@ Power_Status_t Power_KL30_Init ( void )
/*5s不按按键计时清零*/
//LongTimeNoKey_Operation_TimeRest();
BL_Init();
//GPIO_OUT_PORT10_PIN08 = 1u;
//GPIO_OUT_PORT42_PIN12 = 1u;
/*****油耗类****/
Fuel_Consump_K30_Init();
......@@ -141,12 +139,14 @@ void Power_Sleep_Init(void)
{
//TimerB_PWM_Channel_Sleep(TIMERB_2_CH10);
//TimerB_PWM_Channel_Sleep(TIMERB_1_CH10);
//VCCA_EN = 0U;
G_12V_EN_MCU_OUT = 0U; // 12V 电源使能
V_APOWER_MCU_OUT = 0U; // 外设5V 电源使能
D1530_EN_MCU_OUT = 0U; // 1530 使能
D8867_BL_EN_OUT = 0U; //8867 使能
L_FuelSender_OUT = 0U ;//燃油电源 使能
VCC12V0_OUT_EN = 1U; /*12V 电源使能*/
VCC05V0_OUT_EN = 1U; /*外设5V 电源使能*/
D1530_EN_MCU_OUT = 1U; /*1530 使能*/
BL_ACC_EN = 1U; /*8867 使能*/
Fuel_VCC05V_OUT_EN = 1U ; /*燃油电源 使能*/
AIR_5V_OUT_EN = 1u; /*气压 5V*/
IS31_Shutdown();
Speed_Sleep_Init();
......@@ -192,11 +192,13 @@ Power_Status_t Power_Wakeup_Init ( void )
/*安全带 车门部分 李茂军维护结束*/
RTE_PWM_Init();
G_12V_EN_MCU_OUT = 1U; // 12V 电源使能
V_APOWER_MCU_OUT = 1U; // 外设5V 电源使能
D1530_EN_MCU_OUT = 1U; // 1530 使能
D8867_BL_EN_OUT = 1U; //8867 使能
L_FuelSender_OUT = 1U ;//燃油电源 使能
VCC12V0_OUT_EN = 1U; /*12V 电源使能*/
VCC05V0_OUT_EN = 1U; /*外设5V 电源使能*/
D1530_EN_MCU_OUT = 1U; /*1530 使能*/
BL_ACC_EN = 1U; /*8867 使能*/
Fuel_VCC05V_OUT_EN = 1U ; /*燃油电源 使能*/
AIR_5V_OUT_EN = 1u; /*气压 5V*/
IS31_Init();
/*报警调度初始化*/
Popup_Scheduler_Init();
......
source/Application/APP/Telltales/Telltales_user.c
View file @ ef56acce
......@@ -222,8 +222,12 @@ void Test_LED_AllLight(void)
#define XXXX 0u
#define LED_BRIGHTNESS 0xff
/*LED点灯条件判别函数*/
/******************************************************************************
T1 INTER DIFF LOCK
信号接口：
信号定义：
输出信号： T1_LED_OUT
******************************************************************************/
uint8_t LED_INTER_DIFF_LOCK_T_Judgement(void)
{
uint8_t u8Result = 0u;
......@@ -242,6 +246,119 @@ uint8_t LED_INTER_DIFF_LOCK_T_Judgement(void)
return u8Result;
}
void LED_INTER_DIFF_LOCK_T_Execution(uint8_t led_status)
{
//T1_LED_OUT = led_status;
if (led_status == 1)
{
SEG_LED_INTER_DIFF_LOCK_T(7);
}
else
{
SEG_LED_INTER_DIFF_LOCK_T(0);
}
}
/******************************************************************************
R6 ACC_AIR_LED_MCU_OUT
信号接口：
信号定义：
输出信号： R6_LED_OUT
******************************************************************************/
uint8_t LED_ACC_AIR_R_Judgement(void)//done
{
uint8_t u8Result = 0u;
uint8_t m_Condition1 = 0u;
m_Condition1 = (uint8_t)Line_In_Get_Status(LINE_IN_ACC_AIR);
if (m_Condition1 == 1u)
{
u8Result = 1u;
}
else
{
u8Result = 0u;
}
return u8Result;
}
void LED_ACC_AIR_R_Execution(uint8_t led_status)
{
//R6_LED_OUT = led_status;
if (led_status == 1)
{
SEG_LED_ACC_AIR_R(7);
}
else
{
SEG_LED_ACC_AIR_R(0);
}
}
/******************************************************************************
R5
信号接口：
信号定义：
输出信号：BRAKE_AIR/EBS_LED_MCU
******************************************************************************/
/******************************************************************************
U2
信号接口：
信号定义：
输出信号：U2_LED_OUT
******************************************************************************/
uint8_t LED_TRAILER_ABS_U_Judgement(void)//done
{
uint8_t u8Result = 0u;
uint8_t m_Condition1 = 0u;
m_Condition1 = (uint8_t)Line_In_Get_Status(LINE_IN_TRAILER_ABS);
if (m_Condition1 == 1u)
{
u8Result = 1u;
}
else
{
u8Result = 0u;
}
return u8Result;
}
void LED_TRAILER_ABS_U_Execution(uint8_t led_status)
{
//U2_LED_OUT = led_status;
if (led_status == 1)
{
SEG_LED_TRAILER_ABS_U(7);
}
else
{
SEG_LED_TRAILER_ABS_U(0);
}
}
/******************************************************************************
信号接口：
信号定义：
输出信号：
******************************************************************************/
uint8_t LED_FOUR_MUL_FOUR_T_Judgement(void)
{
uint8_t u8Result = 0u;
......@@ -802,23 +919,7 @@ uint8_t LED_BRAKE_AIR_or_EBS_YELLOW_R_Judgement(void)//done
return u8Result;
}
uint8_t LED_ACC_AIR_R_Judgement(void)//done
{
uint8_t u8Result = 0u;
uint8_t m_Condition1 = 0u;
m_Condition1 = (uint8_t)Line_In_Get_Status(LINE_IN_ACC_AIR);
if (m_Condition1 == 1u)
{
u8Result = 1u;
}
else
{
u8Result = 0u;
}
return u8Result;
}
uint8_t LED_ABS_R_Judgement(void)//done
{
......@@ -918,23 +1019,7 @@ uint8_t LED_AIR_SUS_R_Judgement(void)//done
return u8Result;
}
uint8_t LED_TRAILER_ABS_U_Judgement(void)//done
{
uint8_t u8Result = 0u;
uint8_t m_Condition1 = 0u;
m_Condition1 = (uint8_t)Line_In_Get_Status(LINE_IN_TRAILER_ABS);
if (m_Condition1 == 1u)
{
u8Result = 1u;
}
else
{
u8Result = 0u;
}
return u8Result;
}
uint8_t LED_WORKING_LAMP_U_Judgement(void)
{
......@@ -986,20 +1071,7 @@ uint8_t LED_TRAILER_ABS_INFO_U_Judgement(void)//done
/*LED执行函数*/
void LED_INTER_DIFF_LOCK_T_Execution(uint8_t led_status)
{
RR_DIFF_LOCK_MCU = led_status;//由于硬件灯位出错，灯RR DIFF LOCK 和 灯INTER DIFF LOCK灯位画反，因此这里改了输出端子。
if (led_status == 1)
{
SEG_LED_INTER_DIFF_LOCK_T(7);
}
else
{
SEG_LED_INTER_DIFF_LOCK_T(0);
}
}
void LED_FOUR_MUL_FOUR_T_Execution(uint8_t led_status)
{
......@@ -1087,7 +1159,7 @@ void LED_HI_BEAM_T_Execution(uint8_t led_status)
void LED_Rr_FOG_LAMP_T_Execution(uint8_t led_status)
{
Rr_FOG_MCU_OUT = led_status;
//Rr_FOG_MCU_OUT = led_status;
if (led_status == 1)
{
......@@ -1612,23 +1684,11 @@ void LED_BRAKE_AIR_or_EBS_YELLOW_R_Execution(uint8_t led_status)
}
}
void LED_ACC_AIR_R_Execution(uint8_t led_status)
{
ACC_AIR_LED_MCU_OUT = led_status;
if (led_status == 1)
{
SEG_LED_ACC_AIR_R(7);
}
else
{
SEG_LED_ACC_AIR_R(0);
}
}
void LED_ABS_R_Execution(uint8_t led_status)
{
ABS_LED_MCU_OUT = led_status;
//ABS_LED_MCU_OUT = led_status;
if (led_status == 1)
{
......@@ -1663,7 +1723,7 @@ void LED_PARK_BRAKE_R_Execution(uint8_t led_status)
void LED_BRAKE_AIR_or_EBS_RED_R_Execution(uint8_t led_status)
{
BRAKE_AIR_EBS_LED_MCU = led_status;
//BRAKE_AIR_EBS_LED_MCU = led_status;
if (led_status == 1)
{
......@@ -1717,19 +1777,6 @@ void LED_AIR_SUS_R_Execution(uint8_t led_status)
}
}
void LED_TRAILER_ABS_U_Execution(uint8_t led_status)
{
TRAILER_ABS_LED_MCU_OUT = led_status;
if (led_status == 1)
{
SEG_LED_TRAILER_ABS_U(7);
}
else
{
SEG_LED_TRAILER_ABS_U(0);
}
}
void LED_WORKING_LAMP_U_Execution(uint8_t led_status)
{
......
source/Driver/Buzzer/Buzzer.h
View file @ ef56acce
......@@ -67,7 +67,7 @@ typedef enum
/******************************************************************************
信号重定义
******************************************************************************/
#define LINE_BUZZER SD_MODE_MCU_OUT
#define LINE_BUZZER BUZZER_ACC_OUT_EN
//#define BUZZER_PWM_EN PWME_PWME4
//#define BUZZER_FREQ_CTRL PWMPER4 //蜂鸣器频率 = 100kHz / BUZZER_FREQ_CTRL
//#define BUZZER_DUTY_CTRL PWMDTY4
......
source/Driver/GPIO/GPIO.c
View file @ ef56acce
#include "r_typedefs.h"
#include "dr7f701441.dvf.h"
#include "GPIO.h"
#define GPIO_STB_PROTECTED_WRITE(preg, pstatus, reg, value) \
......@@ -97,8 +96,8 @@ const uint32_t g_u32GPIOConfigArray[][2U] =
0x00010010ul, /*Pin_P10_1 GPIO_IN COMS1PDSC:L PU/PD:NULL P:L */
0x00010010ul, /*Pin_P10_1 GPIO_IN COMS1PDSC:L PU/PD:NULL P:L */
0x00010010ul, /*Pin_P10_2 GPIO_IN COMS1PDSC:L PU/PD:NULL P:L */
0x00010010ul, /*Pin_P10_2 GPIO_IN COMS1PDSC:L PU/PD:NULL P:L */
0x00000051ul, /*Pin_P10_2 TAUB0I3 COMS1PDSC:L PU/PD:NULL P:L */
0x00000051ul, /*Pin_P10_2 TAUB0I3 COMS1PDSC:L PU/PD:NULL P:L */
0x00010000ul, /*Pin_P10_3 GPIO_OUT COMS1PDSC:L PU/PD:NULL P:L */
0x00010000ul, /*Pin_P10_3 GPIO_OUT COMS1PDSC:L PU/PD:NULL P:L */
......@@ -112,8 +111,8 @@ const uint32_t g_u32GPIOConfigArray[][2U] =
0x00010010ul, /*Pin_P10_6 GPIO_IN COMS1PDSC:L PU/PD:NULL P:L */
0x00010010ul, /*Pin_P10_6 GPIO_IN COMS1PDSC:L PU/PD:NULL P:L */
0x00000050ul, /*Pin_P10_7 ADCE0TRIGI3 COMS1PDSC:L PU/PD:NULL P:L */
0x00000050ul, /*Pin_P10_7 ADCE0TRIGI3 COMS1PDSC:L PU/PD:NULL P:L */
0x00010010ul, /*Pin_P10_7 GPIO_IN COMS1PDSC:L PU/PD:NULL P:L */
0x00010010ul, /*Pin_P10_7 GPIO_IN COMS1PDSC:L PU/PD:NULL P:L */
0x00010010ul, /*Pin_P10_8 GPIO_IN COMS1PDSC:L PU/PD:NULL P:L */
0x00010010ul, /*Pin_P10_8 GPIO_IN COMS1PDSC:L PU/PD:NULL P:L */
......@@ -148,14 +147,14 @@ const uint32_t g_u32GPIOConfigArray[][2U] =
0x00010000ul, /*Pin_P16_2 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010000ul, /*Pin_P16_2 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00000042ul,//0x00010000ul, /*Pin_P16_3 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00000042ul,//0x00010000ul, /*Pin_P16_3 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010000ul, /*Pin_P16_3 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010000ul, /*Pin_P16_3 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00000060ul, /*Pin_P16_4 ISM21 SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010000ul, /*Pin_P16_4 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00000042ul, //0x00000050ul, /*Pin_P16_5 TAUB0I11 SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00000042ul, //0x00010000ul, /*Pin_P16_5 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00000042ul, /*Pin_P16_5 TAUB0O11 SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00000050ul, /*Pin_P16_5 TAUB0I11 SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010010ul, /*Pin_P16_6 GPIO_IN SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010010ul, /*Pin_P16_6 GPIO_IN SCHMITT1PDSC:L PU/PD:NULL P:L */
......@@ -175,11 +174,11 @@ const uint32_t g_u32GPIOConfigArray[][2U] =
0x00010000ul, /*Pin_P16_11 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010000ul, /*Pin_P16_11 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010010ul, /*Pin_P17_0 GPIO_IN SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010010ul, /*Pin_P17_0 GPIO_IN SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010000ul, /*Pin_P17_0 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010000ul, /*Pin_P17_0 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010010ul, /*Pin_P17_1 GPIO_IN SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010010ul, /*Pin_P17_1 GPIO_IN SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010000ul, /*Pin_P17_1 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010000ul, /*Pin_P17_1 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010010ul, /*Pin_P17_2 GPIO_IN SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010010ul, /*Pin_P17_2 GPIO_IN SCHMITT1PDSC:L PU/PD:NULL P:L */
......@@ -238,8 +237,8 @@ const uint32_t g_u32GPIOConfigArray[][2U] =
0x01000060ul, /*Pin_P21_8 SFMA0O21 COMS1PDSC:H PU/PD:NULL P:L */
0x00000060ul, /*Pin_P21_8 SFMA0O21 COMS1PDSC:L PU/PD:NULL P:L */
0x00010000ul, /*Pin_P21_9 GPIO_OUT COMS1PDSC:L PU/PD:NULL P:L */
0x00010000ul, /*Pin_P21_9 GPIO_OUT COMS1PDSC:L PU/PD:NULL P:L */
0x00000060ul, /*Pin_P21_9 SFMA0O31 COMS1PDSC:L PU/PD:NULL P:L */
0x00000060ul, /*Pin_P21_9 SFMA0O31 COMS1PDSC:L PU/PD:NULL P:L */
0x00010000ul, /*Pin_P22_10 GPIO_OUT COMS1PDSC:L PU/PD:NULL P:L */
0x00010000ul, /*Pin_P22_10 GPIO_OUT COMS1PDSC:L PU/PD:NULL P:L */
......@@ -253,8 +252,8 @@ const uint32_t g_u32GPIOConfigArray[][2U] =
0x00010000ul, /*Pin_P42_2 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010000ul, /*Pin_P42_2 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00000042ul,//0x00010000ul, /*Pin_P42_3 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00000042ul,//0x00010000ul, /*Pin_P42_3 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010000ul, /*Pin_P42_3 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010000ul, /*Pin_P42_3 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010000ul, /*Pin_P42_4 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010000ul, /*Pin_P42_4 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
......@@ -269,28 +268,28 @@ const uint32_t g_u32GPIOConfigArray[][2U] =
0x00010010ul, /*Pin_P42_7 GPIO_IN SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00000042ul, /*Pin_P42_8 TAUB0O15 SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010000ul, /*Pin_P42_8 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00000042ul, /*Pin_P42_8 TAUB0O15 SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010000ul, /*Pin_P42_9 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010000ul, /*Pin_P42_9 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010010ul, /*Pin_P42_9 GPIO_IN SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010010ul, /*Pin_P42_9 GPIO_IN SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010000ul, //0x00000042ul,//0x00010000ul, /*Pin_P42_10 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010000ul, //0x00000042ul,//0x00010000ul, /*Pin_P42_10 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010010ul, /*Pin_P42_10 GPIO_IN SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010010ul, /*Pin_P42_10 GPIO_IN SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00000042ul,//0x00010000ul, /*Pin_P42_11 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00000042ul,//0x00010000ul, /*Pin_P42_11 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010000ul, /*Pin_P42_11 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010000ul, /*Pin_P42_11 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010000ul, /*Pin_P42_12 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010000ul, /*Pin_P42_12 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00000042ul, /*Pin_P42_12 TAUB2O11 SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00000042ul, /*Pin_P42_12 TAUB2O11 SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00000042ul,//0x00000051ul, /*Pin_P42_13 TAUB2I11 SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00000042ul,//0x00010000ul, /*Pin_P42_13 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00000042ul, /*Pin_P42_13 TAUB2O13 SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00000042ul, /*Pin_P42_13 TAUB2O13 SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010000ul, /*Pin_P42_14 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010000ul, /*Pin_P42_14 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00000042ul,//0x00000053ul, /*Pin_P42_15 TAUB1I10 SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00000042ul,//0x00010000ul, /*Pin_P42_15 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00000053ul, /*Pin_P42_15 TAUB1I10 SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010000ul, /*Pin_P42_15 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010000ul, /*Pin_P43_0 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010000ul, /*Pin_P43_0 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
......
source/Driver/GPIO/GPIO.h
View file @ ef56acce
#ifndef GPIO_H__
#define GPIO_H__
#include "dr7f701441.dvf.h"
/* --- PORT Data Direction --- */
#define GPIO_DIR_PORT00_PIN00 PORT_AWOPM0_0
#define GPIO_DIR_PORT00_PIN01 PORT_AWOPM0_1
......@@ -436,42 +437,42 @@
#define USB_SCLK_MCU_OUT GPIO_OUT_PORT01_PIN02
#define MCU_STBYB_LCD_OUT GPIO_OUT_PORT01_PIN03
#define USB_SCS_MCU GPIO_OUT_PORT01_PIN04
#define USB_INT#_MCU GPIO_OUT_PORT01_PIN05
#define USB_INT_MCU GPIO_OUT_PORT01_PIN05
#define MCU_RSTB_LCD_OUT GPIO_OUT_PORT03_PIN00
#define ABS_LED_MCU_OUT GPIO_OUT_PORT03_PIN01
#define V_APOWER_MCU_OUT GPIO_OUT_PORT03_PIN02
#define G_12V_EN_MCU_OUT GPIO_OUT_PORT03_PIN03
#define AIR_5V_MCU_OUT GPIO_OUT_PORT03_PIN04
#define L_FuelSender_OUT GPIO_OUT_PORT03_PIN05
#define SD_MODE_MCU_OUT GPIO_OUT_PORT03_PIN06
#define VCC05V0_OUT_EN GPIO_OUT_PORT03_PIN02
#define VCC12V0_OUT_EN GPIO_OUT_PORT03_PIN03
#define AIR_5V_OUT_EN GPIO_OUT_PORT03_PIN04
#define Fuel_VCC05V_OUT_EN GPIO_OUT_PORT03_PIN05
#define BUZZER_ACC_OUT_EN GPIO_OUT_PORT03_PIN06
#define DIN_MCU_IN GPIO_IN_PORT03_PIN09
#define ADC_KL30 GPIO_IN_PORT10_PIN00
#define SPEED_SIGNAL_MCU_IN GPIO_IN_PORT10_PIN01
#define NTC_AD_MCU GPIO_IN_PORT10_PIN02
#define NTC_AD_MCU GPIO_IN_PORT10_PIN01
#define FUEL_LED_Y_MCU GPIO_OUT_PORT10_PIN03
#define SPEED_SIGNAL2_MCU_IN GPIO_IN_PORT10_PIN04
#define ILLUMINAION_MCU GPIO_IN_PORT10_PIN05
#define ACC_MCU_IN GPIO_IN_PORT10_PIN06
#define FUEL_GAUGE_MCU_IN GPIO_IN_PORT10_PIN08
#define SECONDARY_AIR_MCU_IN GPIO_IN_PORT10_PIN09
#define PRIMARY_AIR_MCU GPIO_IN_PORT10_PIN10
#define METER_SW_MCU_IN GPIO_IN_PORT10_PIN11
#define RR_DIFF_LOCK_MCU GPIO_OUT_PORT11_PIN00
#define BRAKE_AIR_EBS_LED_MCU GPIO_OUT_PORT11_PIN01
#define ACC_MCU_IN GPIO_IN_PORT10_PIN04
#define ADC_WET_AIR GPIO_IN_PORT10_PIN05
#define SPEED_SIGNAL_PWM_IN GPIO_IN_PORT10_PIN06
#define ADC_FUEL_ACC GPIO_IN_PORT10_PIN07
#define ADC_FUEL GPIO_IN_PORT10_PIN08
#define ADC_AIR2 GPIO_IN_PORT10_PIN09
#define ADC_AIR GPIO_IN_PORT10_PIN10
#define ADC_KEY GPIO_IN_PORT10_PIN11
#define T1_LED_OUT GPIO_OUT_PORT11_PIN00
#define R5_LED_OUT GPIO_OUT_PORT11_PIN01
#define CD4051A_COM6_MCU_IN GPIO_IN_PORT11_PIN02
#define CD4051A_COM7_MCU_IN GPIO_IN_PORT11_PIN03
#define CD4051A_COM1_MCU_IN GPIO_IN_PORT16_PIN00
#define BUZZER_MCU_OUT GPIO_OUT_PORT16_PIN01
#define TEMP_LED_R_MCU_OUT GPIO_OUT_PORT16_PIN02
#define TACHO_MCU_OUT GPIO_OUT_PORT16_PIN03
#define TEMP_R_LED_OUT GPIO_OUT_PORT16_PIN02
#define TACHO_A39_OUT GPIO_OUT_PORT16_PIN03
#define WAKE_N_MCU_IN GPIO_IN_PORT16_PIN06
#define CD4051A_A_MCU_OUT GPIO_OUT_PORT16_PIN07
#define CD4051A_B_MCU_OUT GPIO_OUT_PORT16_PIN08
#define TEMP_LED_W_MCU_OUT GPIO_OUT_PORT16_PIN09
#define TEMP_W_LED_OUT GPIO_OUT_PORT16_PIN09
#define CD4051A_C_MCU_OUT GPIO_OUT_PORT16_PIN10
#define FUEL_LED_W_MCU_OUT GPIO_OUT_PORT16_PIN11
#define CD4051A_COM2_MCU_IN GPIO_IN_PORT17_PIN00
#define CD4051A_COM3_MCU_IN GPIO_IN_PORT17_PIN01
#define FUEL_W_LED_OUT GPIO_OUT_PORT16_PIN11
#define BL_PWM_OUT GPIO_OUT_PORT17_PIN00
#define BL_ACC_EN GPIO_OUT_PORT17_PIN01
#define CD4051A_COM4_MCU_IN GPIO_IN_PORT17_PIN02
#define CD4051A_COM5_MCU_IN GPIO_IN_PORT17_PIN03
#define CSB0_MCU_OUT GPIO_OUT_PORT17_PIN04
......@@ -482,20 +483,18 @@
#define CSB1_MCU_OUT GPIO_OUT_PORT17_PIN09
#define SCL1_MCU_OUT GPIO_OUT_PORT17_PIN10
#define SD1_MCU_OUT GPIO_OUT_PORT17_PIN11
#define RR_FOG_MCU_OUT GPIO_OUT_PORT21_PIN09
#define Rr_FOG_MCU_OUT GPIO_OUT_PORT22_PIN10
#define T7_LED_OUT GPIO_OUT_PORT22_PIN10
#define I2C2_3236SDA_MCU GPIO_OUT_PORT42_PIN00
#define I2C2_3236SCL_MCU GPIO_OUT_PORT42_PIN01
#define D_3236SDB_MCU GPIO_OUT_PORT42_PIN02
#define Water_Temp_Led_R_MCU_OUT GPIO_OUT_PORT42_PIN03
#define Water_Temp_Led_W_MCU_OUT GPIO_OUT_PORT42_PIN04
#define Water_Temp_Led_W_MCU_OUT GPIO_OUT_PORT42_PIN03
#define Water_Temp_Led_R_MCU_OUT GPIO_OUT_PORT42_PIN04
#define TRAILER_ABS_LED_MCU_OUT GPIO_OUT_PORT42_PIN05
#define LAMP_CONTROL_MCU_OUT GPIO_OUT_PORT42_PIN06
#define ACC5V_LED_PWM_MCU GPIO_OUT_PORT42_PIN06
#define D8867_FAULT_IN GPIO_IN_PORT42_PIN07
#define D8867_BL_EN_OUT GPIO_OUT_PORT42_PIN09
#define D8867_BL_PWM_OUT GPIO_OUT_PORT42_PIN10
#define SPEED1_PWM_MCU_OUT GPIO_OUT_PORT42_PIN11
#define ACC_AIR_LED_MCU_OUT GPIO_OUT_PORT42_PIN12
#define CD4051A_COM2_MCU_IN GPIO_IN_PORT42_PIN09
#define CD4051A_COM3_MCU_IN GPIO_IN_PORT42_PIN10
#define R6_LED_OUT GPIO_OUT_PORT42_PIN11
#define D1530_EN_MCU_OUT GPIO_OUT_PORT42_PIN14
#define MCU_HS_OUT GPIO_OUT_PORT43_PIN00
#define MCU_VS_OUT GPIO_OUT_PORT43_PIN01
......
source/System/tasks.c
View file @ ef56acce
......@@ -270,12 +270,12 @@ void Sys_Sleep_Mode_Tasks(void)
void Sys_Exact_50us_Tasks(void)
{
static uint16_t PerCounter = 0u;
Sys_Rolling();
Sys_Rolling();·
COM_NM_Process();
COM_TX_Process();
DoCAN_Timer_Update(50);
//TimerB_Fre_Timeout(50);
Cal_Veh_Cycle(SPEED_SIGNAL_MCU_IN);
Cal_Veh_Cycle(SPEED_SIGNAL_PWM_IN); /*车速输入，非捕获方式 20211018*/
PerCounter++;
if (PerCounter >= 20 * 5)
{
......
utility/诊断工具1.10.10 x64/Option/Option.properties
View file @ ef56acce
#new Option
#Fri Oct 15 14:33:36 CST 2021
#Mon Oct 18 14:25:02 CST 2021
=\=\=\=\=\=\=
IsSort=true
MergeFlashIsCompression=false
......
utility/诊断工具1.10.10 x64/升级.exe deleted 100644 → 0
View file @ c35a7385
File deleted
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