diff --git a/source/Application/APP/Telltales/Telltales_user.c b/source/Application/APP/Telltales/Telltales_user.c
index a707268026910a013f6b07b85b779980c39eb99d..07d908251060b19a3d829129fcab162d6d602d23 100644
--- a/source/Application/APP/Telltales/Telltales_user.c
+++ b/source/Application/APP/Telltales/Telltales_user.c
@@ -1454,26 +1454,26 @@ void LED_eco_stop_OFF_L_Execution(uint8_t led_status)
/******************************************************************************
L14 AMT
- ä¿¡å·æŽ¥å£ï¼š æ— å¤šåŒ…å¤„ç† /18EBFF03/18ECFF03 PGN:65226 DM1
+ ä¿¡å·æŽ¥å£ï¼š 20220616 æ¡ä»¶å˜æ›´
ä¿¡å·å®šä¹‰ï¼š
输出信å·ï¼š
******************************************************************************/
uint8_t LED_AMT_L_Judgement(void)
{
uint8_t u8Result = 0u;
- uint8_t m_Condition1 = 0u;
- uint8_t m_Condition2 = 0u;
uint8_t m_Condition3 = 0u;
uint8_t m_Condition4 = 0u;
- uint8_t m_Condition5 = 0u;
- uint8_t m_Condition6 = 0u;
+ uint8_t CanStatus = 0u;
- m_Condition1 = (uint8_t)Get_ID_18FECA03_Sig_Amber_Warning_Lamp_Status();
- m_Condition2 = (uint8_t)Get_ID_18FECA03_Sig_Malfunction_indicator_Lamp();
+ //m_Condition1 = (uint8_t)Get_ID_18FECA03_Sig_Amber_Warning_Lamp_Status();
+ //m_Condition2 = (uint8_t)Get_ID_18FECA03_Sig_Malfunction_indicator_Lamp();
+ m_Condition3 = (uint8_t)Get_ID_18FF8503_Sig_Stop_Warning();
+ m_Condition4 = (uint8_t)Get_ID_18FF8503_Sig_Spanner_Warning();
+ CanStatus = CAN_MSG_Status(ID_CanMsg18FF8503_Msg_Count);
if (K_Line_Set.K_Line_LID41 == 0x13u)
{
- if ((m_Condition1 == 1u) || (m_Condition2 == 1u))
+ if ((m_Condition3 == 1u) || (m_Condition4 == 1u) || (CanStatus == CAN_SIG_LOST))
{
u8Result = 1u;
}
diff --git a/source/Application/CAN_APP_NM/CAN_App/CAN_Communication_Matrix.c b/source/Application/CAN_APP_NM/CAN_App/CAN_Communication_Matrix.c
index e983de9e62f5d60b0e210cbb9f3e3972221a0036..0288b33e90960935634ae8eafbab299a3b067a71 100644
--- a/source/Application/CAN_APP_NM/CAN_App/CAN_Communication_Matrix.c
+++ b/source/Application/CAN_APP_NM/CAN_App/CAN_Communication_Matrix.c
@@ -18,8 +18,8 @@ const st_CAN_SendAttribute st_CANSendAttr[ID_SEND_TOTAL] =
{0x18FFE517ul, 0ul * 1000ul, 29ul, 0u, MSG_EXT, 13u, 8u, CAN_MSG_TX_CYCKE_EVENT, Can_Set_Buff_18FFE517, Common_SetId18FFE517Msg_TXSUCCESS},
//{0x18EF2D17ul, 1000ul * 1000ul, 31ul, 0u, MSG_EXT, 13u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18EF2D17, (void *)0},
{0x18033317ul, 0ul * 1000ul, 34ul, 0u, MSG_EXT, 14u, 8u, CAN_MSG_TX_CYCKE_EVENT, Can_Set_Buff_18033317, (void *)0},
- {0x180433A2ul, 100ul * 1000ul, 47ul, 0u, MSG_EXT, 15u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_180433A2, (void *)0},
- {0x18EA0017ul, 5000ul * 1000ul, 47ul, 0u, MSG_EXT, 16u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18EA0017, (void *)0},
+ //{0x180433A2ul, 100ul * 1000ul, 47ul, 0u, MSG_EXT, 15u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_180433A2, (void *)0},
+ {0x18EA0017ul, 5000ul * 1000ul, 47ul, 0u, MSG_EXT, 15u, 8u, CAN_MSG_TX_CYCLE, Can_Set_Buff_18EA0017, (void *)0},
};
const st_CANMsgAttribute CAN_MSG_CONST_ARRAY[ID_TOTAL_MAX] =
@@ -108,7 +108,7 @@ const st_CANMsgAttribute CAN_MSG_CONST_ARRAY[ID_TOTAL_MAX] =
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
- 3000ul,
+ 7500ul,
0xCF02F2Aul,
(( void * )0),
(( void * )0),
@@ -118,7 +118,7 @@ const st_CANMsgAttribute CAN_MSG_CONST_ARRAY[ID_TOTAL_MAX] =
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
- 3000ul,
+ 7500ul,
0xCF02FA1ul,
(( void * )0),
(( void * )0),
@@ -128,7 +128,7 @@ const st_CANMsgAttribute CAN_MSG_CONST_ARRAY[ID_TOTAL_MAX] =
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
- 3000ul,
+ 7500ul,
0xCF02FA0ul,
(( void * )0),
(( void * )0),
@@ -474,6 +474,19 @@ const st_CANMsgAttribute CAN_MSG_CONST_ARRAY[ID_TOTAL_MAX] =
(( void * )0),
(( void * )0),
},
+ {
+ {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
+ {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
+ {0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
+ 5000ul,
+ 0x18FEE64Aul,
+ (( void * )0),
+ (( void * )0),
+ (( void * )0),
+ },
+
+
+
{
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
{0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u, 0x00u},
@@ -1357,6 +1370,36 @@ uint8_t Get_ID_18FF064A_Sig_TBOX_Sig_Error(void)
return ((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18FF064A_Msg_Count, 1u) >> 4u) & 0x0Fu);
}
+uint8_t Get_ID_18FEE64A_Sig_TBOX_Seconds(void)
+{
+ return ((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18FEE64A_Msg_Count, 0u) >> 0u) & 0xFFu);
+}
+
+uint8_t Get_ID_18FEE64A_Sig_TBOX_Minutes(void)
+{
+ return ((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18FEE64A_Msg_Count, 1u) >> 0u) & 0xFFu);
+}
+
+uint8_t Get_ID_18FEE64A_Sig_TBOX_Hours(void)
+{
+ return ((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18FEE64A_Msg_Count, 2u) >> 0u) & 0xFFu);
+}
+
+uint8_t Get_ID_18FEE64A_Sig_TBOX_Month(void)
+{
+ return ((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18FEE64A_Msg_Count, 3u) >> 0u) & 0xFFu);
+}
+
+uint8_t Get_ID_18FEE64A_Sig_TBOX_Day(void)
+{
+ return ((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18FEE64A_Msg_Count, 4u) >> 0u) & 0xFFu);
+}
+
+uint8_t Get_ID_18FEE64A_Sig_TBOX_Year(void)
+{
+ return ((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18FEE64A_Msg_Count, 5u) >> 0u) & 0xFFu);
+}
+
uint8_t Get_ID_18ECFFA0_Sig_PRIO(void)
{
return ((uint8_t)((uint8_t)CAN_MSG_Read(ID_CanMsg18ECFFA0_Msg_Count, 0u) >> 0u) & 0xFFu);
@@ -1575,6 +1618,10 @@ uint8_t Co_Can_ConvertSubID(uint32_t MsgID)
case ID_CanMsg18FF064A_Msg:
u8Result = ID_CanMsg18FF064A_Msg_Count;
break;
+ case ID_CanMsg18FEE64A_Msg:
+ u8Result = ID_CanMsg18FEE64A_Msg_Count;
+ break;
+
case ID_CanMsg18FECA00_Msg:
u8Result = ID_CanMsg18FECA00_Msg_Count;
diff --git a/source/Application/CAN_APP_NM/CAN_App/CAN_Communication_Matrix.h b/source/Application/CAN_APP_NM/CAN_App/CAN_Communication_Matrix.h
index 590953cc86f3695419447abc7a0bbde148b48546..23e1a3ff5754c9d518fa1d51ef4043b652000388 100644
--- a/source/Application/CAN_APP_NM/CAN_App/CAN_Communication_Matrix.h
+++ b/source/Application/CAN_APP_NM/CAN_App/CAN_Communication_Matrix.h
@@ -51,6 +51,7 @@ typedef enum
/*42*/ID_CanMsg18FECAA1_Msg_Count,
/*43*/ID_CanMsg18FECAA0_Msg_Count,
/*44*/ID_CanMsg18FF064A_Msg_Count,
+ /*45*/ID_CanMsg18FEE64A_Msg_Count,
ID_CanMsg18FECA00_Msg_Count,
ID_CanMsg18FECA10_Msg_Count,
@@ -83,7 +84,7 @@ typedef enum
MSGID_18FFE517,
//MSGID_18EF2D17,
MSGID_18033317,
- MSGID_180433A2,
+ //MSGID_180433A2,
MSGID_18EA0017,
ID_SEND_TOTAL,
@@ -137,6 +138,7 @@ extern const st_CAN_SendAttribute st_CANSendAttr[ID_SEND_TOTAL] ;
#define ID_CanMsg18FECAA1_Msg 0x18FECAA1u
#define ID_CanMsg18FECAA0_Msg 0x18FECAA0u
#define ID_CanMsg18FF064A_Msg 0x18FF064Au
+#define ID_CanMsg18FEE64A_Msg 0x18FEE64Au
#define ID_CanMsg18FECA00_Msg 0x18FECA00u
#define ID_CanMsg18FECA10_Msg 0x18FECA10u
@@ -260,6 +262,12 @@ extern uint8_t Get_ID_18FEED00_Sig_Maximum_Vehicle_Speed_Limit(void);
extern uint8_t Get_ID_18FF064A_Sig_TBOX_Sta(void);
extern uint8_t Get_ID_18FF064A_Sig_TBOX_Sig(void);
extern uint8_t Get_ID_18FF064A_Sig_TBOX_Sig_Error(void);
+extern uint8_t Get_ID_18FEE64A_Sig_TBOX_Seconds(void);
+extern uint8_t Get_ID_18FEE64A_Sig_TBOX_Minutes(void);
+extern uint8_t Get_ID_18FEE64A_Sig_TBOX_Hours(void);
+extern uint8_t Get_ID_18FEE64A_Sig_TBOX_Month(void);
+extern uint8_t Get_ID_18FEE64A_Sig_TBOX_Day(void);
+extern uint8_t Get_ID_18FEE64A_Sig_TBOX_Year(void);
//extern uint32_t Get_ID_18EA0021_Sig_CruiseControl_VehicleSpeedSetup(void);
extern uint8_t Get_ID_0C010305_Sig_Auto_EcoPow(void);
extern uint32_t Get_ID_18FECA03_Sig_SPN(void);
diff --git a/source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.c b/source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.c
index c876c82e416f7396cb9685e0e81073f60f3c8bde..3fb2d2fee192d33a75f21c31fa116643b7789f28 100644
--- a/source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.c
+++ b/source/Application/CAN_APP_NM/CAN_App/CAN_FUNC.c
@@ -267,12 +267,19 @@ void Can_Set_Buff_18FEE617(uint8_t CopyData[])
uint8_t Day = 0u;
uint8_t Year = 0u;
- Seconds = Get_RTC_SECOND() * 4u;
- Minutes = Get_RTC_MINUTE();
- Hours = Get_RTC_HOUR();
- Month = Get_RTC_MONTH();
- Day = Get_RTC_DATE() * 4u;
- Year = (uint8_t)((Get_RTC_YEAR() + 2000u - 1985u) & 0xFFu);
+ //Seconds = Get_RTC_SECOND() * 4u;
+ //Minutes = Get_RTC_MINUTE();
+ //Hours = Get_RTC_HOUR();
+ //Month = Get_RTC_MONTH();
+ //Day = Get_RTC_DATE() * 4u;
+ //Year = (uint8_t)((Get_RTC_YEAR() + 2000u - 1985u) & 0xFFu);
+
+ Seconds = (uint8_t)Get_ID_18FEE64A_Sig_TBOX_Seconds();
+ Minutes = (uint8_t)Get_ID_18FEE64A_Sig_TBOX_Minutes();
+ Hours = (uint8_t)Get_ID_18FEE64A_Sig_TBOX_Hours();
+ Month = (uint8_t)Get_ID_18FEE64A_Sig_TBOX_Month();
+ Day = (uint8_t)Get_ID_18FEE64A_Sig_TBOX_Day();
+ Year = (uint8_t)Get_ID_18FEE64A_Sig_TBOX_Year();
CopyData[0] = (uint8_t)Seconds; /* 1 */
CopyData[1] = (uint8_t)Minutes; /* 2 */
diff --git a/source/Application/Graphic/GUI/GUI.c b/source/Application/Graphic/GUI/GUI.c
index c3f32e62639f35b587a79c66dd7c5624e6678454..c1a6c3f6e3fcc0983404e9729cfaaa1346924a24 100644
--- a/source/Application/Graphic/GUI/GUI.c
+++ b/source/Application/Graphic/GUI/GUI.c
@@ -445,46 +445,62 @@ void GUI_Time_Dispaly(uint8_t Mode)
{
uint8_t Time_Hours = 0u;
uint8_t Time_Minutes = 0u;
-
+ uint8_t CanStatus = 0u;
if (Mode == GUI_DISP_MODE_NORMAL)
{
/*æ—¶*/
- Time_Hours = Get_RTC_HOUR();
+ //Time_Hours = Get_RTC_HOUR();
+ //if (0u) /*12å°æ—¶*/
+ //{
+ // if (Time_Hours == 0)
+ // {
+ // GUI_General_Digit_Display(Time_Sprite, (Time_Hours + 12u), CN_RC_Nb_21_0, 2u, 1u, GUI_DISP_Hours, 37, GUI_BLENDMODE_SRC_OVER);
+ // }
+ // else if (Time_Hours > 12u)
+ // {
+ // GUI_General_Digit_Display(Time_Sprite, (Time_Hours - 12u), CN_RC_Nb_21_0, 2u, 1u, GUI_DISP_Hours, 37, GUI_BLENDMODE_SRC_OVER); /* PM */
+ // }
+ // else
+ // {
+ // GUI_General_Digit_Display(Time_Sprite, Time_Hours, CN_RC_Nb_21_0, 2u, 1u, GUI_DISP_Hours, 37, GUI_BLENDMODE_SRC_OVER); /* AM */
+ // }
+ //}
+ //else
+ //{
+ // GUI_General_Digit_Display(Time_Sprite, Time_Hours, CN_RC_Nb_21_0, 2u, 0u, GUI_DISP_Hours, 37, GUI_BLENDMODE_SRC_OVER); /*显示å°æ—¶*/
+ //}
+ //
+ /*分钟*/
+ //if (FLASH_SYNC_1Hz)
+ //{
+ // GUI_Translate_Display(Time_Sprite, Nb_21_maohao, 396u, 45u, GUI_BLENDMODE_SRC_OVER); /*显示冒å·*/
+ //}
+ //else
+ //{
+ // GUI_General_Display(Time_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
+ //}
+ //
+ //Time_Minutes = Get_RTC_MINUTE();
+ //
+ //GUI_General_Digit_Display(Time_Sprite, Time_Minutes, CN_RC_Nb_21_0, 2u, 0u, GUI_DISP_Minutes, 37, GUI_BLENDMODE_SRC_OVER); /*显示分钟*/
- if (0u) /*12å°æ—¶*/
- {
- if (Time_Hours == 0)
- {
- GUI_General_Digit_Display(Time_Sprite, (Time_Hours + 12u), CN_RC_Nb_21_0, 2u, 1u, GUI_DISP_Hours, 37, GUI_BLENDMODE_SRC_OVER);
- }
- else if (Time_Hours > 12u)
- {
- GUI_General_Digit_Display(Time_Sprite, (Time_Hours - 12u), CN_RC_Nb_21_0, 2u, 1u, GUI_DISP_Hours, 37, GUI_BLENDMODE_SRC_OVER); /* PM */
- }
- else
- {
- GUI_General_Digit_Display(Time_Sprite, Time_Hours, CN_RC_Nb_21_0, 2u, 1u, GUI_DISP_Hours, 37, GUI_BLENDMODE_SRC_OVER); /* AM */
- }
- }
- else
- {
- GUI_General_Digit_Display(Time_Sprite, Time_Hours, CN_RC_Nb_21_0, 2u, 0u, GUI_DISP_Hours, 37, GUI_BLENDMODE_SRC_OVER); /*显示å°æ—¶*/
- }
+ /*T_BOX 时间显示*/
+ CanStatus = CAN_MSG_Status(ID_CanMsg18FEE64A_Msg_Count);
- /*分钟*/
- if (FLASH_SYNC_1Hz)
+ if (CanStatus == CAN_SIG_NORMAL)
{
+ Time_Minutes = (uint8_t)Get_ID_18FEE64A_Sig_TBOX_Minutes();
+
+ Time_Hours = (uint8_t)Get_ID_18FEE64A_Sig_TBOX_Hours();
+
GUI_Translate_Display(Time_Sprite, Nb_21_maohao, 396u, 45u, GUI_BLENDMODE_SRC_OVER); /*显示冒å·*/
+ GUI_General_Digit_Display(Time_Sprite, Time_Minutes, CN_RC_Nb_21_0, 2u, 0u, GUI_DISP_Minutes, 37, GUI_BLENDMODE_SRC_OVER); /*显示分钟*/
+ GUI_General_Digit_Display(Time_Sprite, Time_Hours, CN_RC_Nb_21_0, 2u, 0u, GUI_DISP_Hours, 37, GUI_BLENDMODE_SRC_OVER); /*显示å°æ—¶*/
}
else
{
GUI_General_Display(Time_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
-
- Time_Minutes = Get_RTC_MINUTE();
-
- GUI_General_Digit_Display(Time_Sprite, Time_Minutes, CN_RC_Nb_21_0, 2u, 0u, GUI_DISP_Minutes, 37, GUI_BLENDMODE_SRC_OVER); /*显示分钟*/
-
}
else
{
@@ -500,28 +516,68 @@ void GUI_Time_Dispaly(uint8_t Mode)
* Return : None
* onther : 区域 8 Calendar_Sprite
--------------------------------------------------------------------------*/
+uint8_t Cal_RTC_Week(uint16_t Year, uint8_t Month, uint8_t Day)
+{
+ if (Month < 3)
+ {
+ Month += 12;
+ Year--;
+ }
+
+ uint8_t tmp_0 = (uint8_t)(Year % 100);
+ uint8_t tmp_1 = (uint8_t)(Year / 100);
+ uint8_t week = (uint8_t)((tmp_0 + (tmp_0 >> 2) + (tmp_1 >> 2) + 13 * (Month + 1) / 5 + Day - 1 - (tmp_1 << 1)) % 7);
+
+ return week;
+}
void GUI_Data_Dispaly(uint8_t Mode)
{
uint16_t Year = 0u; /*å¹´*/
uint8_t Month = 0u; /*月*/
uint8_t Date = 0u; /*æ—¥*/
uint8_t Week = 0u; /*星期*/
+ uint8_t CanStatus = 0u;
if (Mode == GUI_DISP_MODE_NORMAL)
{
- Year = 2000 + Get_RTC_YEAR();
- Month = Get_RTC_MONTH();
- Date = Get_RTC_DATE();
- Week = Get_RTC_WEEK();
+ //Year = 2000 + Get_RTC_YEAR();
+ //Month = Get_RTC_MONTH();
+ //Date = Get_RTC_DATE();
+ //Week = Get_RTC_WEEK();
+ //
+ //GUI_Translate_Display(Calendar_Sprite, Nb_14_dian, 591u, 64u, GUI_BLENDMODE_SRC_OVER); /*显示年份åŽé¢çš„ “ . †*/
+ //GUI_Translate_Display(Calendar_Sprite, Nb_14_dian, 642u, 64u, GUI_BLENDMODE_SRC_OVER); /*显示月份åŽé¢çš„ “ . †*/
+ //
+ //GUI_General_Digit_Display(Calendar_Sprite, Year, CN_RC_Nb_14_0, 4u, 0u, GUI_DISP_Year, 48, GUI_BLENDMODE_SRC_OVER); /*显示年*/
+ //GUI_General_Digit_Display(Calendar_Sprite, Month, CN_RC_Nb_14_0, 2u, 0u, GUI_DISP_Month, 48, GUI_BLENDMODE_SRC_OVER); /*显示月*/
+ //GUI_General_Digit_Display(Calendar_Sprite, Date, CN_RC_Nb_14_0, 2u, 0u, GUI_DISP_Date, 48, GUI_BLENDMODE_SRC_OVER); /*显示日*/
+ //
+ //GUI_General_Display(Calendar_Sprite, GUIWedk[Week], GUI_BLENDMODE_SRC_OVER); /*星期 */
+
+ CanStatus = CAN_MSG_Status(ID_CanMsg18FEE64A_Msg_Count);
+
+ Year = (uint16_t)Get_ID_18FEE64A_Sig_TBOX_Year();
+ Year = (Year & 0xFF) + 1985u;
+ Month = (uint8_t)Get_ID_18FEE64A_Sig_TBOX_Month();
+ Date = (uint8_t)Get_ID_18FEE64A_Sig_TBOX_Day();
- GUI_Translate_Display(Calendar_Sprite, Nb_14_dian, 591u, 64u, GUI_BLENDMODE_SRC_OVER); /*显示年份åŽé¢çš„ “ . †*/
- GUI_Translate_Display(Calendar_Sprite, Nb_14_dian, 642u, 64u, GUI_BLENDMODE_SRC_OVER); /*显示月份åŽé¢çš„ “ . †*/
+ Week = Cal_RTC_Week(Year, Month, Date);
+
+ if (CanStatus == CAN_SIG_NORMAL)
+ {
+ GUI_Translate_Display(Calendar_Sprite, Nb_14_dian, 591u, 64u, GUI_BLENDMODE_SRC_OVER); /*显示年份åŽé¢çš„ “ . †*/
+ GUI_Translate_Display(Calendar_Sprite, Nb_14_dian, 642u, 64u, GUI_BLENDMODE_SRC_OVER); /*显示月份åŽé¢çš„ “ . †*/
- GUI_General_Digit_Display(Calendar_Sprite, Year, CN_RC_Nb_14_0, 4u, 0u, GUI_DISP_Year, 48, GUI_BLENDMODE_SRC_OVER); /*显示年*/
- GUI_General_Digit_Display(Calendar_Sprite, Month, CN_RC_Nb_14_0, 2u, 0u, GUI_DISP_Month, 48, GUI_BLENDMODE_SRC_OVER); /*显示月*/
- GUI_General_Digit_Display(Calendar_Sprite, Date, CN_RC_Nb_14_0, 2u, 0u, GUI_DISP_Date, 48, GUI_BLENDMODE_SRC_OVER); /*显示日*/
+ GUI_General_Digit_Display(Calendar_Sprite, Year, CN_RC_Nb_14_0, 4u, 0u, GUI_DISP_Year, 48, GUI_BLENDMODE_SRC_OVER); /*显示年*/
+ GUI_General_Digit_Display(Calendar_Sprite, Month, CN_RC_Nb_14_0, 2u, 0u, GUI_DISP_Month, 48, GUI_BLENDMODE_SRC_OVER); /*显示月*/
+ GUI_General_Digit_Display(Calendar_Sprite, Date, CN_RC_Nb_14_0, 2u, 0u, GUI_DISP_Date, 48, GUI_BLENDMODE_SRC_OVER); /*显示日*/
- GUI_General_Display(Calendar_Sprite, GUIWedk[Week], GUI_BLENDMODE_SRC_OVER); /*星期 */
+ GUI_General_Display(Calendar_Sprite, GUIWedk[Week], GUI_BLENDMODE_SRC_OVER); /*星期 */
+ }
+ else
+ {
+ GUI_General_Display(Calendar_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
+ }
}
else
{
@@ -760,39 +816,39 @@ void GUI_AdBlue_Dispaly(uint8_t Mode)
GUI_General_Display(AdBlue_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
}
- }
- /*段*/
- Tank_value = Get_ID_18FF2300_Sig_Tank_Level();
+ /*段*/
+ Tank_value = Get_ID_18FF2300_Sig_Tank_Level();
- switch (Tank_value)
- {
- case 0x3Cu:
- GUI_Translate_Display(AdBlue_Sprite, CN_tianlanyezouge_01, (152u + 31u * 0x04u), 450u, GUI_BLENDMODE_SRC_OVER);
+ switch (Tank_value)
+ {
+ case 0x3Cu:
+ GUI_Translate_Display(AdBlue_Sprite, CN_tianlanyezouge_01, (152u + 31u * 0x04u), 450u, GUI_BLENDMODE_SRC_OVER);
- case 0x1Cu:
- GUI_Translate_Display(AdBlue_Sprite, CN_tianlanyezouge_01, (152u + 31u * 0x03u), 450u, GUI_BLENDMODE_SRC_OVER);
+ case 0x1Cu:
+ GUI_Translate_Display(AdBlue_Sprite, CN_tianlanyezouge_01, (152u + 31u * 0x03u), 450u, GUI_BLENDMODE_SRC_OVER);
- case 0x0Cu:
- GUI_Translate_Display(AdBlue_Sprite, CN_tianlanyezouge_01, (152u + 31u * 0x02u), 450u, GUI_BLENDMODE_SRC_OVER);
+ case 0x0Cu:
+ GUI_Translate_Display(AdBlue_Sprite, CN_tianlanyezouge_01, (152u + 31u * 0x02u), 450u, GUI_BLENDMODE_SRC_OVER);
- case 0x04u:
- GUI_Translate_Display(AdBlue_Sprite, CN_tianlanyezouge_01, (152u + 31u * 0x01u), 450u, GUI_BLENDMODE_SRC_OVER);
+ case 0x04u:
+ GUI_Translate_Display(AdBlue_Sprite, CN_tianlanyezouge_01, (152u + 31u * 0x01u), 450u, GUI_BLENDMODE_SRC_OVER);
- case 0x02u:
- GUI_General_Display(AdBlue_Sprite, CN_tianlanye, GUI_BLENDMODE_SRC_OVER); /*框*/
- GUI_Translate_Display(AdBlue_Sprite, CN_tianlanyezouge_01, (152u + 31u * 0x00u), 450u, GUI_BLENDMODE_SRC_OVER);
- break;
+ case 0x02u:
+ GUI_General_Display(AdBlue_Sprite, CN_tianlanye, GUI_BLENDMODE_SRC_OVER); /*框*/
+ GUI_Translate_Display(AdBlue_Sprite, CN_tianlanyezouge_01, (152u + 31u * 0x00u), 450u, GUI_BLENDMODE_SRC_OVER);
+ break;
- case 0x01u:
- case 0x00u:
- GUI_General_Display(AdBlue_Sprite, CN_tianlanye, GUI_BLENDMODE_SRC_OVER); /*框*/
- GUI_General_Display(AdBlue_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
- break;
+ case 0x01u:
+ case 0x00u:
+ GUI_General_Display(AdBlue_Sprite, CN_tianlanye, GUI_BLENDMODE_SRC_OVER); /*框*/
+ GUI_General_Display(AdBlue_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
+ break;
- default:
- GUI_General_Display(AdBlue_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
- break;
+ default:
+ GUI_General_Display(AdBlue_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
+ break;
+ }
}
}
else
@@ -2063,15 +2119,100 @@ void GUI_Year_Month_Data_Display(uint8_t Mode)
uint8_t Date = 0u; /*æ—¥*/
uint8_t Week = 0u; /*星期*/
uint16_t Year = 0u; /*å¹´*/
+ uint8_t CanStatus = 0u;
if (Mode == GUI_DISP_MODE_NORMAL)
{
- Year = 2000 + Get_RTC_YEAR();
- Month = Get_RTC_MONTH();
- Date = Get_RTC_DATE();
- /*年月日*/
- if (1u)
+// Year = 2000 + Get_RTC_YEAR();
+// Month = Get_RTC_MONTH();
+// Date = Get_RTC_DATE();
+// /*年月日*/
+// if (1u)
+// {
+// GUI_General_Display(MultiPurpose_Sprite, CN_nian, GUI_BLENDMODE_SRC_OVER); /*å¹´*/
+// GUI_General_Display(MultiPurpose_Sprite, CN_yue, GUI_BLENDMODE_SRC_OVER); /*月*/
+// GUI_General_Display(MultiPurpose_Sprite, CN_ri, GUI_BLENDMODE_SRC_OVER); /*æ—¥*/
+//
+// GUI_General_Digit_Display(MultiPurpose_Sprite, Year, Nb_17_0, 4u, 0u, GUI_DISP_MENUYear, 243u, GUI_BLENDMODE_SRC_OVER);
+// GUI_General_Digit_Display(MultiPurpose_Sprite, Month, Nb_17_0, 2u, 1u, GUI_DISP_MENUMonth, 243u, GUI_BLENDMODE_SRC_OVER);
+// GUI_General_Digit_Display(MultiPurpose_Sprite, Date, Nb_17_0, 2u, 1u, GUI_DISP_MENUDate, 243u, GUI_BLENDMODE_SRC_OVER);
+// }
+// /*月日年*/
+// else if (0)
+// {
+// GUI_General_Display(MultiPurpose_Sprite, CN_nian, GUI_BLENDMODE_SRC_OVER); /*å¹´*/
+// GUI_General_Display(MultiPurpose_Sprite, CN_yue, GUI_BLENDMODE_SRC_OVER); /*月*/
+// GUI_General_Display(MultiPurpose_Sprite, CN_ri, GUI_BLENDMODE_SRC_OVER); /*æ—¥*/
+// GUI_General_Digit_Display(MultiPurpose_Sprite, Year, Nb_17_0, 4u, 1u, GUI_DISP_MENUYear1, 243u, GUI_BLENDMODE_SRC_OVER);
+// GUI_General_Digit_Display(MultiPurpose_Sprite, Month, Nb_17_0, 2u, 1u, GUI_DISP_MENUMonth1, 243u, GUI_BLENDMODE_SRC_OVER);
+// GUI_General_Digit_Display(MultiPurpose_Sprite, Date, Nb_17_0, 2u, 1u, GUI_DISP_MENUDate1, 243u, GUI_BLENDMODE_SRC_OVER);
+// }
+// /*日月年*/
+// else
+// {
+// GUI_General_Display(MultiPurpose_Sprite, CN_nian, GUI_BLENDMODE_SRC_OVER); /*å¹´*/
+// GUI_General_Display(MultiPurpose_Sprite, CN_yue, GUI_BLENDMODE_SRC_OVER); /*月*/
+// GUI_General_Display(MultiPurpose_Sprite, CN_ri, GUI_BLENDMODE_SRC_OVER); /*æ—¥*/
+// GUI_General_Digit_Display(MultiPurpose_Sprite, Year, Nb_17_0, 4u, 1u, GUI_DISP_MENUYear1, 243u, GUI_BLENDMODE_SRC_OVER);
+// GUI_General_Digit_Display(MultiPurpose_Sprite, Month, Nb_17_0, 2u, 1u, GUI_DISP_MENUDate1, 243u, GUI_BLENDMODE_SRC_OVER);
+// GUI_General_Digit_Display(MultiPurpose_Sprite, Date, Nb_17_0, 2u, 1u, GUI_DISP_MENUMonth1, 243u, GUI_BLENDMODE_SRC_OVER);
+// }
+// /*星期 */
+// Week = Get_RTC_WEEK();
+// GUI_General_Display(MultiPurpose_Sprite, CN_kuohao, GUI_BLENDMODE_SRC_OVER); /*括å·*/
+// GUI_General_Display(MultiPurpose_Sprite, GUIMenuWedk[Week], GUI_BLENDMODE_CUSTOM);
+//
+// Time_Hours = Get_RTC_HOUR();
+// /*时间*/
+// if (0u)
+// {
+// if (Time_Hours < 12)
+// {
+// GUI_General_Display(MultiPurpose_Sprite, CN_AM, GUI_BLENDMODE_SRC_OVER); /*AM*/
+// }
+// else
+// {
+// GUI_General_Display(MultiPurpose_Sprite, CN_PM, GUI_BLENDMODE_SRC_OVER); /*PM*/
+// }
+//
+// if (Time_Hours == 0)
+// {
+// GUI_General_Digit_Display(MultiPurpose_Sprite, (Time_Hours + 12u), Nb_17_0, 2u, 1u, GUI_DISP_MENUHours, 279u, GUI_BLENDMODE_SRC_OVER);
+// }
+// else if (Time_Hours > 12)
+// {
+// GUI_General_Digit_Display(MultiPurpose_Sprite, (Time_Hours - 12u), Nb_17_0, 2u, 1u, GUI_DISP_MENUHours, 279u, GUI_BLENDMODE_SRC_OVER); /*PM*/
+// }
+// else
+// {
+// GUI_General_Digit_Display(MultiPurpose_Sprite, Time_Hours, Nb_17_0, 2u, 1u, GUI_DISP_MENUHours, 279u, GUI_BLENDMODE_SRC_OVER); /*AM*/
+// }
+// }
+// else
+// {
+// GUI_General_Digit_Display(MultiPurpose_Sprite, Time_Hours, Nb_17_0, 2u, 0u, GUI_DISP_MENUHours, 279u, GUI_BLENDMODE_SRC_OVER);
+// }
+//
+// Time_Minutes = Get_RTC_MINUTE();
+// GUI_General_Digit_Display(MultiPurpose_Sprite, Time_Minutes, Nb_17_0, 2u, 0u, GUI_DISP_MENUMinutes, 279u, GUI_BLENDMODE_SRC_OVER); /*分钟*/
+//
+// GUI_Translate_Display(MultiPurpose_Sprite, Nb_17_maohao, 592u, 282u, GUI_BLENDMODE_CUSTOM); /*冒å·*/
+
+ Year = (uint16_t)Get_ID_18FEE64A_Sig_TBOX_Year();
+ Year = (Year & 0xFF) + 1985u;
+ Month = (uint8_t)Get_ID_18FEE64A_Sig_TBOX_Month();
+ Date = (uint8_t)Get_ID_18FEE64A_Sig_TBOX_Day();
+
+ Week = Cal_RTC_Week(Year, Month, Date);
+
+ Time_Hours = (uint8_t)Get_ID_18FEE64A_Sig_TBOX_Hours();
+ Time_Minutes = (uint8_t)Get_ID_18FEE64A_Sig_TBOX_Minutes();
+
+ CanStatus = CAN_MSG_Status(ID_CanMsg18FEE64A_Msg_Count);
+
+ if (CanStatus == CAN_SIG_NORMAL)
{
+ /*年月日*/
GUI_General_Display(MultiPurpose_Sprite, CN_nian, GUI_BLENDMODE_SRC_OVER); /*å¹´*/
GUI_General_Display(MultiPurpose_Sprite, CN_yue, GUI_BLENDMODE_SRC_OVER); /*月*/
GUI_General_Display(MultiPurpose_Sprite, CN_ri, GUI_BLENDMODE_SRC_OVER); /*æ—¥*/
@@ -2079,67 +2220,23 @@ void GUI_Year_Month_Data_Display(uint8_t Mode)
GUI_General_Digit_Display(MultiPurpose_Sprite, Year, Nb_17_0, 4u, 0u, GUI_DISP_MENUYear, 243u, GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(MultiPurpose_Sprite, Month, Nb_17_0, 2u, 1u, GUI_DISP_MENUMonth, 243u, GUI_BLENDMODE_SRC_OVER);
GUI_General_Digit_Display(MultiPurpose_Sprite, Date, Nb_17_0, 2u, 1u, GUI_DISP_MENUDate, 243u, GUI_BLENDMODE_SRC_OVER);
+
+ /*星期*/
+ GUI_General_Display(MultiPurpose_Sprite, CN_kuohao, GUI_BLENDMODE_SRC_OVER); /*括å·*/
+ GUI_General_Display(MultiPurpose_Sprite, GUIMenuWedk[Week], GUI_BLENDMODE_CUSTOM);
+
+ /*时分*/
+ GUI_General_Digit_Display(MultiPurpose_Sprite, Time_Hours, Nb_17_0, 2u, 0u, GUI_DISP_MENUHours, 279u, GUI_BLENDMODE_SRC_OVER);
+ GUI_General_Digit_Display(MultiPurpose_Sprite, Time_Minutes, Nb_17_0, 2u, 0u, GUI_DISP_MENUMinutes, 279u, GUI_BLENDMODE_SRC_OVER); /*分钟*/
+ GUI_Translate_Display(MultiPurpose_Sprite, Nb_17_maohao, 592u, 282u, GUI_BLENDMODE_CUSTOM); /*冒å·*/
}
- /*月日年*/
- else if (0)
- {
- GUI_General_Display(MultiPurpose_Sprite, CN_nian, GUI_BLENDMODE_SRC_OVER); /*å¹´*/
- GUI_General_Display(MultiPurpose_Sprite, CN_yue, GUI_BLENDMODE_SRC_OVER); /*月*/
- GUI_General_Display(MultiPurpose_Sprite, CN_ri, GUI_BLENDMODE_SRC_OVER); /*æ—¥*/
- GUI_General_Digit_Display(MultiPurpose_Sprite, Year, Nb_17_0, 4u, 1u, GUI_DISP_MENUYear1, 243u, GUI_BLENDMODE_SRC_OVER);
- GUI_General_Digit_Display(MultiPurpose_Sprite, Month, Nb_17_0, 2u, 1u, GUI_DISP_MENUMonth1, 243u, GUI_BLENDMODE_SRC_OVER);
- GUI_General_Digit_Display(MultiPurpose_Sprite, Date, Nb_17_0, 2u, 1u, GUI_DISP_MENUDate1, 243u, GUI_BLENDMODE_SRC_OVER);
- }
- /*日月年*/
else
{
GUI_General_Display(MultiPurpose_Sprite, CN_nian, GUI_BLENDMODE_SRC_OVER); /*å¹´*/
GUI_General_Display(MultiPurpose_Sprite, CN_yue, GUI_BLENDMODE_SRC_OVER); /*月*/
GUI_General_Display(MultiPurpose_Sprite, CN_ri, GUI_BLENDMODE_SRC_OVER); /*æ—¥*/
- GUI_General_Digit_Display(MultiPurpose_Sprite, Year, Nb_17_0, 4u, 1u, GUI_DISP_MENUYear1, 243u, GUI_BLENDMODE_SRC_OVER);
- GUI_General_Digit_Display(MultiPurpose_Sprite, Month, Nb_17_0, 2u, 1u, GUI_DISP_MENUDate1, 243u, GUI_BLENDMODE_SRC_OVER);
- GUI_General_Digit_Display(MultiPurpose_Sprite, Date, Nb_17_0, 2u, 1u, GUI_DISP_MENUMonth1, 243u, GUI_BLENDMODE_SRC_OVER);
- }
- /*星期 */
- Week = Get_RTC_WEEK();
- GUI_General_Display(MultiPurpose_Sprite, CN_kuohao, GUI_BLENDMODE_SRC_OVER); /*括å·*/
- GUI_General_Display(MultiPurpose_Sprite, GUIMenuWedk[Week], GUI_BLENDMODE_CUSTOM);
-
- Time_Hours = Get_RTC_HOUR();
- /*时间*/
- if (0u)
- {
- if (Time_Hours < 12)
- {
- GUI_General_Display(MultiPurpose_Sprite, CN_AM, GUI_BLENDMODE_SRC_OVER); /*AM*/
- }
- else
- {
- GUI_General_Display(MultiPurpose_Sprite, CN_PM, GUI_BLENDMODE_SRC_OVER); /*PM*/
- }
-
- if (Time_Hours == 0)
- {
- GUI_General_Digit_Display(MultiPurpose_Sprite, (Time_Hours + 12u), Nb_17_0, 2u, 1u, GUI_DISP_MENUHours, 279u, GUI_BLENDMODE_SRC_OVER);
- }
- else if (Time_Hours > 12)
- {
- GUI_General_Digit_Display(MultiPurpose_Sprite, (Time_Hours - 12u), Nb_17_0, 2u, 1u, GUI_DISP_MENUHours, 279u, GUI_BLENDMODE_SRC_OVER); /*PM*/
- }
- else
- {
- GUI_General_Digit_Display(MultiPurpose_Sprite, Time_Hours, Nb_17_0, 2u, 1u, GUI_DISP_MENUHours, 279u, GUI_BLENDMODE_SRC_OVER); /*AM*/
- }
- }
- else
- {
- GUI_General_Digit_Display(MultiPurpose_Sprite, Time_Hours, Nb_17_0, 2u, 0u, GUI_DISP_MENUHours, 279u, GUI_BLENDMODE_SRC_OVER);
+ GUI_General_Display(MultiPurpose_Sprite, SpriteSize, GUI_BLENDMODE_SRC_OVER);
}
-
- Time_Minutes = Get_RTC_MINUTE();
- GUI_General_Digit_Display(MultiPurpose_Sprite, Time_Minutes, Nb_17_0, 2u, 0u, GUI_DISP_MENUMinutes, 279u, GUI_BLENDMODE_SRC_OVER); /*分钟*/
-
- GUI_Translate_Display(MultiPurpose_Sprite, Nb_17_maohao, 592u, 282u, GUI_BLENDMODE_CUSTOM); /*冒å·*/
}
else
{
@@ -2959,41 +3056,57 @@ void GUI_BG_UserSet_Menu_Display(uint8_t Mode)
GUI_General_Display(MENU_Sprite, CN_fengexian, GUI_BLENDMODE_SRC_OVER); /*line*/
GUI_General_Display(MENU_Sprite, CN_gundongtiao, GUI_BLENDMODE_SRC_OVER); /*长度æ¡*/
- if (bCurMenuIDX <= _MN_DSP_LEVEL2_4_MENU_3)
+ if (bCurMenuIDX <= _MN_DSP_LEVEL2_4_MENU_5)
{
- if (bCurMenuIDX != _MN_DSP_LEVEL2_4_MENU_1)
+ //if (bCurMenuIDX != _MN_DSP_LEVEL2_4_MENU_1)
+ //{
+ // GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_1black + State_Flag.USER_DATE), 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
+ //}
+ //if (bCurMenuIDX != _MN_DSP_LEVEL2_4_MENU_2)
+ //{
+ // GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_2black + State_Flag.USER_TIME), 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
+ //}
+ if (bCurMenuIDX != _MN_DSP_LEVEL2_4_MENU_7)
{
- GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_1black + State_Flag.USER_DATE), 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
+ GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_9black + State_Flag.USER_LIGHT), 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
}
- if (bCurMenuIDX != _MN_DSP_LEVEL2_4_MENU_2)
+ if (bCurMenuIDX != _MN_DSP_LEVEL2_4_MENU_3)
{
- GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_2black + State_Flag.USER_TIME), 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
+ GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_7black + State_Flag.USER_LANGUAGE), 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
}
- if (bCurMenuIDX != _MN_DSP_LEVEL2_4_MENU_7)
+ if (bCurMenuIDX != _MN_DSP_LEVEL2_4_MENU_4)
{
- GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_9black + State_Flag.USER_LIGHT), 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
+ GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_4black + State_Flag.USER_PROPOSAL), 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
}
- if (bCurMenuIDX != _MN_DSP_LEVEL2_4_MENU_3)
+ if (bCurMenuIDX != _MN_DSP_LEVEL2_4_MENU_5)
{
- GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_7black + State_Flag.USER_LANGUAGE), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
+ if (K_Line_Set.K_Line_LID3E != 0x01u)
+ {
+ GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_10black + 1u), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
+ }
+ else
+ {
+ GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_10black + State_Flag.FState_TPMSSET), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
+ }
}
}
- else if (bCurMenuIDX == _MN_DSP_LEVEL2_4_MENU_4)
- {
- GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_2black + State_Flag.USER_TIME), 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
- GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_9black + State_Flag.USER_LIGHT), 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
- GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_7black + State_Flag.USER_LANGUAGE), 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
- }
- else if (bCurMenuIDX == _MN_DSP_LEVEL2_4_MENU_5)
- {
- GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_9black + State_Flag.USER_LIGHT), 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
- GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_7black + State_Flag.USER_LANGUAGE), 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
- GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_4black + State_Flag.USER_PROPOSAL), 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
- }
+ //else if (bCurMenuIDX == _MN_DSP_LEVEL2_4_MENU_4)
+ //{
+ // GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_2black + State_Flag.USER_TIME), 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
+ // GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_9black + State_Flag.USER_LIGHT), 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
+ // GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_7black + State_Flag.USER_LANGUAGE), 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
+ //}
+ //else if (bCurMenuIDX == _MN_DSP_LEVEL2_4_MENU_5)
+ //{
+ // GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_9black + State_Flag.USER_LIGHT), 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
+ // GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_7black + State_Flag.USER_LANGUAGE), 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
+ // GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_4black + State_Flag.USER_PROPOSAL), 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
+ //}
else
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_7black + State_Flag.USER_LANGUAGE), 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_4black + State_Flag.USER_PROPOSAL), 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
+
if (K_Line_Set.K_Line_LID3E != 0x01u)
{
GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_10black + 1u), 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
@@ -3068,7 +3181,7 @@ void GUI_BG_UserSetMenu3_Display(uint8_t Mode)
if (Mode == GUI_DISP_MODE_NORMAL)
{
- GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_7black + Flag), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
+ GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_7black + Flag), 225u, GUI_DISP_MENU_Y[1u], GUI_BLENDMODE_SRC_OVER);
}
else
{
@@ -3090,7 +3203,7 @@ void GUI_BG_UserSetMenu8_Display(uint8_t Mode)
if (Mode == GUI_DISP_MODE_NORMAL)
{
- GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_9black + Flag), 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
+ GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_9black + Flag), 225u, GUI_DISP_MENU_Y[0u], GUI_BLENDMODE_SRC_OVER);
}
else
{
@@ -3112,7 +3225,7 @@ void GUI_BG_UserSetMenu4_Display(uint8_t Mode)
if (Mode == GUI_DISP_MODE_NORMAL)
{
- GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_4black + Flag), 225u, GUI_DISP_MENU_Y[3u], GUI_BLENDMODE_SRC_OVER);
+ GUI_Translate_Display(MENU_Sprite, (CN_User_Menu2_04_4black + Flag), 225u, GUI_DISP_MENU_Y[2u], GUI_BLENDMODE_SRC_OVER);
}
else
{
diff --git a/source/Application/Graphic/Menu/Menu_user.c b/source/Application/Graphic/Menu/Menu_user.c
index c33862b27daa2aceabf2dc5d105b7642128596cb..fdf8355df0be49f58228cc211fc64b2b7d6924ce 100644
--- a/source/Application/Graphic/Menu/Menu_user.c
+++ b/source/Application/Graphic/Menu/Menu_user.c
@@ -42,7 +42,7 @@ const _MenuOptTab MenuOptTab[] =
/*07*/{ _MN_DSP_LEVEL2_1_MENU_1, _MN_IDX_NULL, _MN_DSP_LEVEL2MENU_2, _MN_IDX_NULL, Level2Menu_1Enter, Level2Menu_1Do, Level2Menu_1Exit},
/*08*/{ _MN_DSP_LEVEL2_2_MENU_1, _MN_DSP_LEVEL2MENU_1, _MN_DSP_LEVEL2MENU_3, _MN_IDX_NULL, Level2Menu_2Enter, Level2Menu_2Do, Level2Menu_2Exit},
/*09*/{ _MN_DSP_LEVEL2_3_MENU_1, _MN_DSP_LEVEL2MENU_2, _MN_DSP_LEVEL2MENU_4, _MN_IDX_NULL, Level2Menu_3Enter, Level2Menu_3Do, Level2Menu_3Exit},
- /*10*/{ _MN_DSP_LEVEL2_4_MENU_1, _MN_DSP_LEVEL2MENU_3, _MN_DSP_LEVEL2MENU_5, _MN_IDX_NULL, Level2Menu_4Enter, Level2Menu_4Do, Level2Menu_4Exit},
+ /*10*/{ _MN_DSP_LEVEL2_4_MENU_7, _MN_DSP_LEVEL2MENU_3, _MN_DSP_LEVEL2MENU_5, _MN_IDX_NULL, Level2Menu_4Enter, Level2Menu_4Do, Level2Menu_4Exit},
/*11*/{ _MN_DSP_LEVEL2_5_MENU_1, _MN_DSP_LEVEL2MENU_4, _MN_DSP_LEVEL2MENU_6, _MN_IDX_NULL, Level2Menu_5Enter, Level2Menu_5Do, Level2Menu_5Exit},
/*12*/{ _MN_DSP_LEVEL2_6_MENU_1, _MN_DSP_LEVEL2MENU_5, _MN_IDX_NULL, _MN_IDX_NULL, Level2Menu_6Enter, Level2Menu_6Do, Level2Menu_6Exit},
@@ -70,7 +70,7 @@ const _MenuOptTab MenuOptTab[] =
/*31*/{ _MN_DSP_LEVEL3_4_MENU_11, _MN_IDX_NULL, _MN_DSP_LEVEL2_4_MENU_2, _MN_DSP_LEVEL2MENU_4, Level2_4Menu_1Enter, Level2_4Menu_1Do, Level2_4Menu_1Exit},
/*32*/{ _MN_DSP_LEVEL3_4_MENU_21, _MN_DSP_LEVEL2_4_MENU_1, _MN_DSP_LEVEL2_4_MENU_7, _MN_DSP_LEVEL2MENU_4, Level2_4Menu_2Enter, Level2_4Menu_2Do, Level2_4Menu_2Exit},
- /*33*/{ _MN_DSP_LEVEL3_7_MENU_1, _MN_DSP_LEVEL2_4_MENU_2, _MN_DSP_LEVEL2_4_MENU_3, _MN_DSP_LEVEL2MENU_4, Level2_4Menu_7Enter, Level2_4Menu_7Do, Level2_4Menu_7Exit},
+ /*33*/{ _MN_DSP_LEVEL3_7_MENU_1, _MN_IDX_NULL, _MN_DSP_LEVEL2_4_MENU_3, _MN_DSP_LEVEL2MENU_4, Level2_4Menu_7Enter, Level2_4Menu_7Do, Level2_4Menu_7Exit},
/*34*/{ _MN_DSP_LEVEL3_4_MENU_3, _MN_DSP_LEVEL2_4_MENU_7, _MN_DSP_LEVEL2_4_MENU_4, _MN_DSP_LEVEL2MENU_4, Level2_4Menu_3Enter, Level2_4Menu_3Do, Level2_4Menu_3Exit},
/*35*/{ _MN_DSP_LEVEL3_4_MENU_41, _MN_DSP_LEVEL2_4_MENU_3, _MN_DSP_LEVEL2_4_MENU_5, _MN_DSP_LEVEL2MENU_4, Level2_4Menu_4Enter, Level2_4Menu_4Do, Level2_4Menu_4Exit},
/*36*/{ _MN_DSP_LEVEL3_4_MENU_5, _MN_DSP_LEVEL2_4_MENU_4, _MN_DSP_LEVEL2_4_MENU_6, _MN_DSP_LEVEL2MENU_4, Level2_4Menu_5Enter, Level2_4Menu_5Do, Level2_4Menu_5Exit},
diff --git a/source/Driver/Clock/RTC.h b/source/Driver/Clock/RTC.h
index 1cbb4e83ec7ed37aaa7054cda2a9a4fb8d3eab7c..3e07a2ae7d355c5a1ee4b2aac230fb0077e2d290 100644
--- a/source/Driver/Clock/RTC.h
+++ b/source/Driver/Clock/RTC.h
@@ -17,13 +17,13 @@
//#endif
typedef struct
{
- uint8_t u8RTCYear; /*00~~99 in Dec*/
- uint8_t u8RTCMonth; /*01~~12 in Dec*/
- uint8_t u8RTCDayOfMonth; /*01~~31 in Dec*/
- uint8_t u8RTCHour; /*fix 24Hour Format 00~~23 in Dec*/
- uint8_t u8RTCMinute; /*0~~59 in Dec*/
- uint8_t u8RTCSecond; /*0~~59 in Dec*/
- uint8_t u8RTCWeek ; /*1~7 in Dec*/
+ uint8_t u8RTCYear; /*00~~99 in Dec*/
+ uint8_t u8RTCMonth; /*01~~12 in Dec*/
+ uint8_t u8RTCDayOfMonth; /*01~~31 in Dec*/
+ uint8_t u8RTCHour; /*fix 24Hour Format 00~~23 in Dec*/
+ uint8_t u8RTCMinute; /*0~~59 in Dec*/
+ uint8_t u8RTCSecond; /*0~~59 in Dec*/
+ uint8_t u8RTCWeek ; /*1~7 in Dec*/
} RTC_Information_st_t;
extern RTC_Information_st_t g_stRTCInformation;
@@ -45,5 +45,4 @@ extern void RTC_Set_Time(uint8_t year, uint8_t month, uint16_t day, uint8_t hour
extern void RTC_Get_Time(void);
extern void RTC_Backup_Time(void);
extern void Rtc_Restore_Time(void);
-
#endif