Skip to content

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

修改小问题

parent fbaacfcd
Hide whitespace changes
Inline Side-by-side
Showing with 121 additions and 4 deletions
source/Application/APP/Key/Key_user.c
View file @ 34523dd1
...@@ -453,6 +453,66 @@ void Key_Operation_Up(Key_Event_en_t enKeyEvent) ...@@ -453,6 +453,66 @@ void Key_Operation_Up(Key_Event_en_t enKeyEvent)
User_set_Num.Minute = 0u; User_set_Num.Minute = 0u;
} }
} }
/*高速路*/
else if (bCurMenuIDX == _MN_DSP_LEVEL4_4_MENU_1)
{
if (User_set_Num.User_Gsl < 110)
{
User_set_Num.User_Gsl++;
}
else if (User_set_Num.User_Gsl == 0xFF)
{
User_set_Num.User_Gsl = 20;
}
}
/*一般路*/
else if (bCurMenuIDX == _MN_DSP_LEVEL4_4_MENU_2)
{
if (User_set_Num.User_Ybl < 110)
{
User_set_Num.User_Ybl++;
}
else if (User_set_Num.User_Ybl == 0xFF)
{
User_set_Num.User_Ybl = 20;
}
}
/*发动机转速*/
else if (bCurMenuIDX == _MN_DSP_LEVEL4_4_MENU_3)
{
if (User_set_Num.User_Speed < 99)
{
User_set_Num.User_Speed++;
}
else if (User_set_Num.User_Speed == 0xFF)
{
User_set_Num.User_Speed = 0;
}
}
/*急加速*/
else if (bCurMenuIDX == _MN_DSP_LEVEL4_4_MENU_4)
{
if (User_set_Num.User_JADD < 99)
{
User_set_Num.User_JADD++;
}
else if (User_set_Num.User_JADD == 0xFF)
{
User_set_Num.User_JADD = 5;
}
}
/*急减速*/
else if (bCurMenuIDX == _MN_DSP_LEVEL4_4_MENU_5)
{
if (User_set_Num.User_JSUB < 99)
{
User_set_Num.User_JSUB++;
}
else if (User_set_Num.User_JSUB == 0xFF)
{
User_set_Num.User_JSUB = 5;
}
}
} }
} }
} }
...@@ -965,6 +1025,62 @@ void Key_Operation_Down(Key_Event_en_t enKeyEvent) ...@@ -965,6 +1025,62 @@ void Key_Operation_Down(Key_Event_en_t enKeyEvent)
User_set_Num.Minute = 59u; User_set_Num.Minute = 59u;
} }
} }
/*高速路*/
else if (bCurMenuIDX == _MN_DSP_LEVEL4_4_MENU_1)
{
if ((User_set_Num.User_Gsl > 20) && (User_set_Num.User_Gsl <= 110))
{
User_set_Num.User_Gsl--;
}
else
{
User_set_Num.User_Gsl = 0xFF;
}
}
/*一般路*/
else if (bCurMenuIDX == _MN_DSP_LEVEL4_4_MENU_2)
{
if ((User_set_Num.User_Ybl > 20) && (User_set_Num.User_Ybl <= 110))
{
User_set_Num.User_Ybl--;
}
else
{
User_set_Num.User_Ybl = 0xFF;
}
}
/*发动机转速*/
else if (bCurMenuIDX == _MN_DSP_LEVEL4_4_MENU_3)
{
if ((User_set_Num.User_Speed >= 0) && (User_set_Num.User_Speed <= 99))
{
User_set_Num.User_Speed--;
}
}
/*急加速*/
else if (bCurMenuIDX == _MN_DSP_LEVEL4_4_MENU_4)
{
if ((User_set_Num.User_JADD > 5) && (User_set_Num.User_JADD <= 99))
{
User_set_Num.User_JADD--;
}
else
{
User_set_Num.User_JADD = 0xFF;
}
}
/*急减速*/
else if (bCurMenuIDX == _MN_DSP_LEVEL4_4_MENU_5)
{
if ((User_set_Num.User_JSUB > 5) && (User_set_Num.User_JSUB <= 99))
{
User_set_Num.User_JSUB--;
}
else
{
User_set_Num.User_JSUB = 0xFF;
}
}
} }
} }
} }
......
source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.c
View file @ 34523dd1
...@@ -663,7 +663,7 @@ void Can_Set_Buff_18FF2A17(uint8_t CopyData[]) ...@@ -663,7 +663,7 @@ void Can_Set_Buff_18FF2A17(uint8_t CopyData[])
} }
else else
{ {
IGN_Voltage = 90; IGN_Voltage = 0;
} }
MJX_MEB9_Manual_TM_Range_Low = 0u; MJX_MEB9_Manual_TM_Range_Low = 0u;
......
source/Application/Graphic/GUI/GUI.c
View file @ 34523dd1
...@@ -1060,6 +1060,7 @@ void Gui_ADAS_Display(uint8_t Mode) ...@@ -1060,6 +1060,7 @@ void Gui_ADAS_Display(uint8_t Mode)
{ {
if (K_Line_Set.K_Line_LID28 == 0x01) if (K_Line_Set.K_Line_LID28 == 0x01)
{ {
/*方便看到ADAS在线状态7.5s*/
CanStatusA1 = CAN_MSG_Status(ID_CanMsg0CF02FA1_Msg_Count); CanStatusA1 = CAN_MSG_Status(ID_CanMsg0CF02FA1_Msg_Count);
CanStatus2A = CAN_MSG_Status(ID_CanMsg0CF02F2A_Msg_Count); CanStatus2A = CAN_MSG_Status(ID_CanMsg0CF02F2A_Msg_Count);
CanStatusA0 = CAN_MSG_Status(ID_CanMsg0CF02FA0_Msg_Count); CanStatusA0 = CAN_MSG_Status(ID_CanMsg0CF02FA0_Msg_Count);
......
source/Application/Graphic/GUI/GUI.h
View file @ 34523dd1
...@@ -17,7 +17,7 @@ ...@@ -17,7 +17,7 @@
#define FState_COilTimeOutNum 60u /*3S*/ #define FState_COilTimeOutNum 60u /*3S*/
#define SystemSupplierECUHardwareVersionNumberApp ((uint16_t)(10301)) /*硬件版本号 HV:01.02.02*/ #define SystemSupplierECUHardwareVersionNumberApp ((uint16_t)(10301)) /*硬件版本号 HV:01.02.02*/
#define SystemSupplierECUSoftwareInformationApp ((uint16_t)(10002)) /*软件版本号 SV:01.01.05*/ #define SystemSupplierECUSoftwareInformationApp ((uint16_t)(10003)) /*软件版本号 SV:01.01.05*/
#define systemSupplierECUFlashInformationApp ((uint16_t)(2)) /*FLASH版本号 FV:00.14*/ #define systemSupplierECUFlashInformationApp ((uint16_t)(2)) /*FLASH版本号 FV:00.14*/
typedef struct typedef struct
......
source/Application/Sound_Alarm/Sound_Source.h
View file @ 34523dd1
...@@ -106,7 +106,7 @@ static const SndAttributeStruct SndAttributeTable[SND_SRC_INDEX_MAX] = ...@@ -106,7 +106,7 @@ static const SndAttributeStruct SndAttributeTable[SND_SRC_INDEX_MAX] =
{/*14 SND_SRC_EVSC_SPEED */ 0x01u, 15, SND_CYCLE_NONSTOP, SND_MODE_LOOP , 250u, },/*14 4HZ 2 EVSC */ {/*14 SND_SRC_EVSC_SPEED */ 0x01u, 15, SND_CYCLE_NONSTOP, SND_MODE_LOOP , 250u, },/*14 4HZ 2 EVSC */
{/*15 SND_SRC_DPD_SPEED */ 0x03u, 16, 3, SND_MODE_SINGLE, 1000u, },/*15 1HZ 4 DPD 手动再生 */ {/*15 SND_SRC_DPD_SPEED */ 0x03u, 16, 3, SND_MODE_SINGLE, 1000u, },/*15 1HZ 4 DPD 手动再生 */
{/*15 SND_SRC_DPD_SPEED */ 0x03u, 16, 3, SND_MODE_SINGLE, 500u, },/*15 2HZ 4 DPD 手动再生 */ {/*15 SND_SRC_DPD_SPEED */ 0x03u, 16, 3, SND_MODE_SINGLE, 500u, },/*15 2HZ 4 DPD 手动再生 */
{/*15 SND_SRC_DPD_SPEED */ 0x03u, 16, 3, SND_MODE_LOOP , 250u, },/*15 4HZ 4 DPD 手动再生 */ {/*15 SND_SRC_DPD_SPEED */ 0x03u, 16, 3, SND_MODE_SINGLE, 250u, },/*15 4HZ 4 DPD 手动再生 */
{/*16 SND_SRC_NEES */ 0x00u, 17, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*16 NEES */ {/*16 SND_SRC_NEES */ 0x00u, 17, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*16 NEES */
{/*17 SND_SRC_ECO_STOP */ 0x00u, 18, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*17 eco stop */ {/*17 SND_SRC_ECO_STOP */ 0x00u, 18, SND_CYCLE_NONSTOP, SND_MODE_SINGLE, 1000u, },/*17 eco stop */
{/*18 SND_SRC_Cyclone_High */ 0x03u, 19, SND_CYCLE_NONSTOP, SND_MODE_LOOP , 250u, },/*18 4HZ 4 气悬车高调整 */ {/*18 SND_SRC_Cyclone_High */ 0x03u, 19, SND_CYCLE_NONSTOP, SND_MODE_LOOP , 250u, },/*18 4HZ 4 气悬车高调整 */
......
source/Driver/Graphic/han00002ce20.h
View file @ 34523dd1
...@@ -4,7 +4,7 @@ static const HanSansCNFontPos_t Hansans00002ce20[] = ...@@ -4,7 +4,7 @@ static const HanSansCNFontPos_t Hansans00002ce20[] =
{ {
//{charid, xpos, ypos, width, height, xoffset, yoffset, xadvance} //{charid, xpos, ypos, width, height, xoffset, yoffset, xadvance}
{ 0 , 3995 , 552 , 4 , 22 , 0 , 0 , 4 }, { 0 , 3995 , 552 , 4 , 22 , 0 , 0 , 4 },
#if 0 #if 1
{ 1 , 3995 , 23 , 4 , 22 , 0 , 0 , 4 }, { 1 , 3995 , 23 , 4 , 22 , 0 , 0 , 4 },
{ 2 , 3995 , 805 , 4 , 22 , 0 , 0 , 4 }, { 2 , 3995 , 805 , 4 , 22 , 0 , 0 , 4 },
{ 3 , 3995 , 759 , 4 , 22 , 0 , 0 , 4 }, { 3 , 3995 , 759 , 4 , 22 , 0 , 0 , 4 },
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