Skip to content

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

调整报警库，增加转速频率外发，增加时间发送。

parent eb3c323b
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 215 additions and 233 deletions
source/Application/APP/Data_EngineSpeed/Data_EngineSpeed.c
View file @ 5304ada8
......@@ -106,8 +106,14 @@ void Tacho_Processing_Service(void)
u32Result /= 60u;
Fre = (uint16_t)u32Result;
RTE_PWM_Set_Tacho_Out(Fre, 500u);
if (Fre != 0)
{
RTE_PWM_Set_Tacho_Out(Fre, 500u);
}
else
{
RTE_PWM_Set_Tacho_Out(Fre, 0);
}
}
/*-------------------------------------------------------------------------
* Function Name : Tacho_Display
......
source/Application/Alarm/Popup_Lib.a
View file @ 5304ada8
No preview for this file type
source/Application/Alarm/Popup_Lib.h
View file @ 5304ada8
This diff is collapsed.
source/Application/Alarm/Popup_Message_List.h
View file @ 5304ada8
......@@ -208,6 +208,4 @@ static const PopupMsgAttributeStruct PopupMsgAttributeTable[] =
};
#define POPUP_MSG_NUMBER_TOTAL (sizeof(PopupMsgAttributeTable) / sizeof(PopupMsgAttributeStruct))
#endif
source/Application/Alarm/Popup_Scheduler.c
View file @ 5304ada8
......@@ -763,7 +763,6 @@ static void Popup_Update_Status ( uint16_t PopupID )
{
if ( ( p1->Status == POPUP_STATUS_CLEAR ) || ( p1->Status == POPUP_STATUS_DELETE ) )
{
;
Popup_Delete_Request ( p1->PopupID );
}
else if ( p1->Status != POPUP_STATUS_MASKED )
......@@ -814,16 +813,6 @@ static struct PopupList *Popup_Polling_Next ( struct PopupList *CurPopup )
#endif
while ( NextPopup != POPUPLIB_NULL )
{
/*原始部分*/
/*
if ( ( NextPopup->Status == POPUP_STATUS_LOOP ) || ( NextPopup->Status == POPUP_STATUS_FIRST ) )
{
break;
}
NextPopup = NextPopup->next;
*/
/*----test----*/
if (PopupAttributeTable[NextPopup->PopupID].Type != POPUP_TYPE_WARNING)
{
if ((NextPopup->Status == POPUP_STATUS_LOOP) || (NextPopup->Status == POPUP_STATUS_FIRST))
......@@ -838,11 +827,6 @@ static struct PopupList *Popup_Polling_Next ( struct PopupList *CurPopup )
else if (NextPopup->Status == POPUP_STATUS_LOOP)
{
/*----test----*/
hyq_1 = CurPopup->PopupID ;
hyq_2 = NextPopup->PopupID;
/*----test----*/
if (PopupAttributeTable[NextPopup->PopupID].Priority == PopupAttributeTable[CurPopup->PopupID].Priority)
break;
else
......@@ -853,7 +837,6 @@ static struct PopupList *Popup_Polling_Next ( struct PopupList *CurPopup )
}
}
NextPopup = NextPopup->next;
/*----test----*/
}
}
......@@ -1485,7 +1468,7 @@ static void Popup_IRQ_Disable(void)
******************************************************************************/
void Popup_Hint_Mask_Request ( uint16_t PopupID )
{
(void)PopupID;
}
/**********************************************************************************************************
......
source/Application/Alarm/Popups.c
View file @ 5304ada8
......@@ -1144,7 +1144,7 @@ void Popups_Polling(void)
--------------------------------------------------------------------------*/
void Popups_Displaying(uint16_t PopupMsg)
{
if (PopupMsg < POPUP_MSG_NUMBER_TOTAL)
if (PopupMsg < POPUP_MSG_MAX)
{
switch (PopupMsgAttributeTable[PopupMsg].Type)
{
......
source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.c
View file @ 5304ada8
......@@ -208,31 +208,29 @@ void Can_Set_Buff_18FED917(uint8_t CopyData[])
Blanding_SW_Signal = Line_In_Get_Status(LINE_IN_RET_BLENDING); /*A10*/
if (Line_In_Get_Status(LINE_IN_TRAILER_CONNECT) == 1u) /*B06*/
/*根据禅道编号5102内容修改----start----*/
if (Line_In_Get_Status(LINE_IN_TRAILER_ABS) == 1u) /*B33*/
{
if (Line_In_Get_Status(LINE_IN_TRAILER_ABS) == 1u) /*B33*/
{
Tralier_ABS_Fully_Operational = 0x00u;
}
else
{
Tralier_ABS_Fully_Operational = 0x01u;
}
Tralier_ABS_Fully_Operational = 0x00u;
}
else
{
Tralier_ABS_Fully_Operational = 0x01u;
}
if (Line_In_Get_Status(LINE_IN_ABS_DETECT) == 1u) /*A33*/
{
Tlailer_ABS_Detect = 0x00u;
}
else
{
Tlailer_ABS_Detect = 0x01u;
}
if (
(Line_In_Get_Status(LINE_IN_TRAILER_CONNECT) == 1u) && /*B06 LOW*/
(Line_In_Get_Status(LINE_IN_ABS_DETECT) == 0u) && /*A33 HIGH*/
(Line_In_Get_Status(LINE_IN_TRAILER_ABS_INFO) == 0u) /*B03 HIGH*/
)
{
Tlailer_ABS_Detect = 0x1u;
}
else
{
Tlailer_ABS_Detect = 0x03u;
Tralier_ABS_Fully_Operational = 0x03u;
Tlailer_ABS_Detect = 0x0u;
}
/*根据禅道编号5102内容修改----end----*/
Tlailer_Connected = Line_In_Get_Status(LINE_IN_TRAILER_CONNECT); /*B6*/
......@@ -372,11 +370,21 @@ void Can_Set_Buff_18FF2517(uint8_t CopyData[])
uint8_t Minute = 0u;
uint32_t ODO_Meter = 0u;
Year = Get_RTC_YEAR();
Month = Get_RTC_MONTH();
Day = Get_RTC_DATE();
Hour = Get_RTC_HOUR();
Minute = Get_RTC_MINUTE();
//Year = Get_RTC_YEAR();
//Month = Get_RTC_MONTH();
//Day = Get_RTC_DATE();
//Hour = Get_RTC_HOUR();
//Minute = Get_RTC_MINUTE();
/*根据禅道编号5095内容修改----start----*/
Year = (uint16_t)Get_ID_18FEE64A_Sig_TBOX_Year();
Year = (Year & 0xFF) + 1985u;
Month = (uint8_t)Get_ID_18FEE64A_Sig_TBOX_Month();
Day = (uint8_t)Get_ID_18FEE64A_Sig_TBOX_Day();
Day = Day / 4;
Hour = (uint8_t)Get_ID_18FEE64A_Sig_TBOX_Hours();
Minute = (uint8_t)Get_ID_18FEE64A_Sig_TBOX_Minutes();
/*根据禅道编号5095内容修改----end----*/
CopyData[0] = (uint8_t)(Year & 0xFFu); /* 1 */
CopyData[1] = (uint8_t)Month; /* 2 */
......
source/Application/Graphic/GUI/GUI.c
View file @ 5304ada8
......@@ -6866,7 +6866,7 @@ void GUI_General_Popup_Display(uint16_t PopupMsg)
{
uint16_t V_Speed = 0u;
if (PopupMsg >= POPUP_MSG_NUMBER_TOTAL)
if (PopupMsg >= POPUP_MSG_MAX)
{
return;
}
......
source/Application/Graphic/GUI/GUI.h
View file @ 5304ada8
......@@ -17,7 +17,7 @@
#define FState_COilTimeOutNum 60u /*3S*/
#define SystemSupplierECUHardwareVersionNumberApp ((uint16_t)(10202)) /*硬件版本号 HV:01.02.02*/
#define SystemSupplierECUSoftwareInformationApp ((uint16_t)(10105)) /*软件版本号 SV:01.01.05*/
#define SystemSupplierECUSoftwareInformationApp ((uint16_t)(10106)) /*软件版本号 SV:01.01.05*/
#define systemSupplierECUFlashInformationApp ((uint16_t)(14)) /*FLASH版本号 FV:00.14*/
typedef struct
......
source/Application/RTE/Common_Interface.c
View file @ 5304ada8
......@@ -315,7 +315,7 @@ void Common_Input_Para(void)
OilValue = Common_Get_Disp_E_Speed();
//车速
/*车速*/
wbyTest = Speed_Get_Display_Value();
Common_Set_Disp_V_Speed(wbyTest);
Common_Set_Act_V_Speed(Speed_Get_ActualValue());
......@@ -331,7 +331,9 @@ void Common_Input_Para(void)
Common_Set_Disp_V_Speed_Valid(COMMON_InValid);
}
/*转速*/
Common_Set_Act_E_Speed(RevSpeedManage(Tacho_Get_ActualValue()));
Common_Set_Disp_E_Speed(RevSpeedManage(Tacho_Get_ActualValue()));
PowerIgnOffTimeLine = 0ul;
if (PowerIgnOnTimeLine < 0x7ffffffful)
......
source/Driver/GPIO/GPIO.c
View file @ 5304ada8
......@@ -147,7 +147,7 @@ const uint32_t g_u32GPIOConfigArray[][2U] =
0x00010010ul, /*Pin_P16_2 GPIO_IN SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010010ul, /*Pin_P16_2 GPIO_IN SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010000ul, /*Pin_P16_3 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00000042ul, /*Pin_P16_3 TAUB0O7 SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010000ul, /*Pin_P16_3 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010000ul, /*Pin_P16_4 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
......
source/Driver/GPIO/GPIO.h
View file @ 5304ada8
......@@ -465,7 +465,6 @@
#define CD4051A_COM1_MCU_IN GPIO_IN_PORT16_PIN00
#define BUZZER_MCU_OUT GPIO_OUT_PORT16_PIN01
#define CD4051A_COM2_MCU_IN GPIO_IN_PORT16_PIN02
#define TACHO_A39_OUT GPIO_OUT_PORT16_PIN03
#define LIN_SLP_N_MCU GPIO_OUT_PORT16_PIN04
#define WAKE_N_MCU_IN GPIO_OUT_PORT16_PIN06
#define CD4051A_A_MCU_OUT GPIO_OUT_PORT16_PIN07
......
source/Driver/Timer/TimerB.c
View file @ 5304ada8
......@@ -545,9 +545,9 @@ static void TimerB_VehFreOut_Init(void)
/*转速频率输出PWM初始化*/
static void TimerB_EngFreOut_Init(void)
{
//TimerB_PWM_Channel_Init(TIMERB_0_CH7, TIMERB_CLOCK_3, TIMERB_HIGH);
//TimerB_PWM_Channel_Fre_Set(TIMERB_0_CH7, 0u, 0u);
//TimerB_PWM_Channel_Start(TIMERB_0_CH7);
TimerB_PWM_Channel_Init(TIMERB_0_CH7, TIMERB_CLOCK_3, TIMERB_LOW);
TimerB_PWM_Channel_Fre_Set(TIMERB_0_CH7, 0u, 0u);
TimerB_PWM_Channel_Start(TIMERB_0_CH7);
}
/*蜂鸣器PWM初始化*/
void TimerB_Buzzer_Init(void)
......
utility/GPIO/GPIO.c
View file @ 5304ada8
......@@ -148,7 +148,7 @@ const uint32_t g_u32GPIOConfigArray[][2U] =
0x00010010ul, /*Pin_P16_2 GPIO_IN SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010010ul, /*Pin_P16_2 GPIO_IN SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010000ul, /*Pin_P16_3 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00000042ul, /*Pin_P16_3 TAUB0O7 SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010000ul, /*Pin_P16_3 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
0x00010000ul, /*Pin_P16_4 GPIO_OUT SCHMITT1PDSC:L PU/PD:NULL P:L */
......
utility/GPIO/GPIO.h
View file @ 5304ada8
......@@ -463,7 +463,6 @@
#define CD4051A_COM1_MCU_IN GPIO_IN_PORT16_PIN00
#define BUZZER_MCU_OUT GPIO_OUT_PORT16_PIN01
#define CD4051A_COM2_MCU_IN GPIO_IN_PORT16_PIN02
#define TACHO_A39_OUT GPIO_OUT_PORT16_PIN03
#define LIN_SLP_N_MCU GPIO_OUT_PORT16_PIN04
#define WAKE_N_MCU_IN GPIO_OUT_PORT16_PIN06
#define CD4051A_A_MCU_OUT GPIO_OUT_PORT16_PIN07
......
utility/GPIO/GPIO_RH850_D1M1A_CFG.json
View file @ 5304ada8
......@@ -2737,7 +2737,7 @@
"pinName": "TACHO_A39_OUT",
"pinAddress": "18A",
"wakeupPin": {
"pinModeName": "GPIO_OUT",
"pinModeName": "TAUB0O7",
"circuitName": "SCHMITT1",
"PINV": false,
"PODC": false,
......@@ -2747,14 +2747,14 @@
"PU": false,
"PD": false,
"PBDC": false,
"PIBC": true,
"PIBC": false,
"P": false,
"PPR": false,
"PMC": false,
"PMC": true,
"PIPC": false,
"PM": false,
"PFCAE": false,
"PFCE": false,
"PFCE": true,
"PFC": false
},
"sleepPin": {
......
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