✨ feat:增加电量正常显示以及充电显示动画

Firmware/Source/Application/CAN_User/Can_User.c

@@ -41,90 +41,117 @@ void Can_RX_Apply_Buff(void)
     CAN_RecvMsg.CacheType = CAN_CacheType_Rx_NoMask;
     CAN_RecvMsg.RTR = CAN_RTR_Data;
     CAN_RecvMsg.Interrupt = ENABLE;
-    CAN_MessageCache_DeInit(CAN0MSG01);
-    CAN_MessageCache_Init(CAN0MSG01, &CAN_RecvMsg);
-    CAN_MessageCache_OverWriteConfig(CAN0MSG01, ENABLE);
+    CAN_MessageCache_DeInit(CAN0MSG00);
+    CAN_MessageCache_Init(CAN0MSG00, &CAN_RecvMsg);
+    CAN_MessageCache_OverWriteConfig(CAN0MSG00, ENABLE);
 
     CAN_RecvMsg.Id = 0x134;
     CAN_RecvMsg.IDE = CAN_Id_Standard;
     CAN_RecvMsg.CacheType = CAN_CacheType_Rx_NoMask;
     CAN_RecvMsg.RTR = CAN_RTR_Data;
     CAN_RecvMsg.Interrupt = ENABLE;
-    CAN_MessageCache_DeInit(CAN0MSG02);
-    CAN_MessageCache_Init(CAN0MSG02, &CAN_RecvMsg);
-    CAN_MessageCache_OverWriteConfig(CAN0MSG02, ENABLE);
+    CAN_MessageCache_DeInit(CAN0MSG01);
+    CAN_MessageCache_Init(CAN0MSG01, &CAN_RecvMsg);
+    CAN_MessageCache_OverWriteConfig(CAN0MSG01, ENABLE);
 
     CAN_RecvMsg.Id = 0x157;
     CAN_RecvMsg.IDE = CAN_Id_Standard;
     CAN_RecvMsg.CacheType = CAN_CacheType_Rx_NoMask;
     CAN_RecvMsg.RTR = CAN_RTR_Data;
     CAN_RecvMsg.Interrupt = ENABLE;
-    CAN_MessageCache_DeInit(CAN0MSG06);
-    CAN_MessageCache_Init(CAN0MSG06, &CAN_RecvMsg);
-    CAN_MessageCache_OverWriteConfig(CAN0MSG06, ENABLE);
+    CAN_MessageCache_DeInit(CAN0MSG02);
+    CAN_MessageCache_Init(CAN0MSG02, &CAN_RecvMsg);
+    CAN_MessageCache_OverWriteConfig(CAN0MSG02, ENABLE);
 
     CAN_RecvMsg.Id = 0x38E;
     CAN_RecvMsg.IDE = CAN_Id_Standard;
     CAN_RecvMsg.CacheType = CAN_CacheType_Rx_NoMask;
     CAN_RecvMsg.RTR = CAN_RTR_Data;
     CAN_RecvMsg.Interrupt = ENABLE;
-    CAN_MessageCache_DeInit(CAN0MSG07);
-    CAN_MessageCache_Init(CAN0MSG07, &CAN_RecvMsg);
-    CAN_MessageCache_OverWriteConfig(CAN0MSG07, ENABLE);
+    CAN_MessageCache_DeInit(CAN0MSG03);
+    CAN_MessageCache_Init(CAN0MSG03, &CAN_RecvMsg);
+    CAN_MessageCache_OverWriteConfig(CAN0MSG03, ENABLE);
 
     CAN_RecvMsg.Id = 0x3A2;
     CAN_RecvMsg.IDE = CAN_Id_Standard;
     CAN_RecvMsg.CacheType = CAN_CacheType_Rx_NoMask;
     CAN_RecvMsg.RTR = CAN_RTR_Data;
     CAN_RecvMsg.Interrupt = ENABLE;
-    CAN_MessageCache_DeInit(CAN0MSG08);
-    CAN_MessageCache_Init(CAN0MSG08, &CAN_RecvMsg);
-    CAN_MessageCache_OverWriteConfig(CAN0MSG08, ENABLE);
+    CAN_MessageCache_DeInit(CAN0MSG04);
+    CAN_MessageCache_Init(CAN0MSG04, &CAN_RecvMsg);
+    CAN_MessageCache_OverWriteConfig(CAN0MSG04, ENABLE);
 
     CAN_RecvMsg.Id = 0x339;
     CAN_RecvMsg.IDE = CAN_Id_Standard;
     CAN_RecvMsg.CacheType = CAN_CacheType_Rx_NoMask;
     CAN_RecvMsg.RTR = CAN_RTR_Data;
     CAN_RecvMsg.Interrupt = ENABLE;
-    CAN_MessageCache_DeInit(CAN0MSG11);
-    CAN_MessageCache_Init(CAN0MSG11, &CAN_RecvMsg);
-    CAN_MessageCache_OverWriteConfig(CAN0MSG11, ENABLE);
+    CAN_MessageCache_DeInit(CAN0MSG05);
+    CAN_MessageCache_Init(CAN0MSG05, &CAN_RecvMsg);
+    CAN_MessageCache_OverWriteConfig(CAN0MSG05, ENABLE);
     
     CAN_RecvMsg.Id = 0x18202922;
     CAN_RecvMsg.IDE = CAN_Id_Extended;
     CAN_RecvMsg.CacheType = CAN_CacheType_Rx_NoMask;
     CAN_RecvMsg.RTR = CAN_RTR_Data;
     CAN_RecvMsg.Interrupt = ENABLE;
+    CAN_MessageCache_DeInit(CAN0MSG06);
+    CAN_MessageCache_Init(CAN0MSG06, &CAN_RecvMsg);
+    CAN_MessageCache_OverWriteConfig(CAN0MSG06, ENABLE);
+
+    CAN_RecvMsg.Id = 0x18200A20;
+    CAN_RecvMsg.IDE = CAN_Id_Extended;
+    CAN_RecvMsg.CacheType = CAN_CacheType_Rx_NoMask;
+    CAN_RecvMsg.RTR = CAN_RTR_Data;
+    CAN_RecvMsg.Interrupt = ENABLE;
+    CAN_MessageCache_DeInit(CAN0MSG07);
+    CAN_MessageCache_Init(CAN0MSG07, &CAN_RecvMsg);
+    CAN_MessageCache_OverWriteConfig(CAN0MSG07, ENABLE);
+
+    CAN_RecvMsg.Id = 0x18200A21;
+    CAN_RecvMsg.IDE = CAN_Id_Extended;
+    CAN_RecvMsg.CacheType = CAN_CacheType_Rx_NoMask;
+    CAN_RecvMsg.RTR = CAN_RTR_Data;
+    CAN_RecvMsg.Interrupt = ENABLE;
+    CAN_MessageCache_DeInit(CAN0MSG12);
+    CAN_MessageCache_Init(CAN0MSG12, &CAN_RecvMsg);
+    CAN_MessageCache_OverWriteConfig(CAN0MSG12, ENABLE);
+
+    CAN_RecvMsg.Id = 0x18203220;
+    CAN_RecvMsg.IDE = CAN_Id_Extended;
+    CAN_RecvMsg.CacheType = CAN_CacheType_Rx_NoMask;
+    CAN_RecvMsg.RTR = CAN_RTR_Data;
+    CAN_RecvMsg.Interrupt = ENABLE;
     CAN_MessageCache_DeInit(CAN0MSG09);
     CAN_MessageCache_Init(CAN0MSG09, &CAN_RecvMsg);
     CAN_MessageCache_OverWriteConfig(CAN0MSG09, ENABLE);
 
-    CAN_RecvMsg.Id = 0x18203220;
+    CAN_RecvMsg.Id = 0x18203020;
     CAN_RecvMsg.IDE = CAN_Id_Extended;
     CAN_RecvMsg.CacheType = CAN_CacheType_Rx_NoMask;
     CAN_RecvMsg.RTR = CAN_RTR_Data;
     CAN_RecvMsg.Interrupt = ENABLE;
-    CAN_MessageCache_DeInit(CAN0MSG10);
-    CAN_MessageCache_Init(CAN0MSG10, &CAN_RecvMsg);
-    CAN_MessageCache_OverWriteConfig(CAN0MSG10, ENABLE);
+    CAN_MessageCache_DeInit(CAN0MSG13);
+    CAN_MessageCache_Init(CAN0MSG13, &CAN_RecvMsg);
+    CAN_MessageCache_OverWriteConfig(CAN0MSG13, ENABLE);
 
     CAN_RecvMsg.Id = DIAG_ID_Rx_PHY;
     CAN_RecvMsg.IDE = CAN_Id_Standard;
     CAN_RecvMsg.CacheType = CAN_CacheType_Rx_NoMask;
     CAN_RecvMsg.RTR = CAN_RTR_Data;
     CAN_RecvMsg.Interrupt = ENABLE;
-    CAN_MessageCache_DeInit(CAN0MSG03);
-    CAN_MessageCache_Init(CAN0MSG03, &CAN_RecvMsg);
-    CAN_MessageCache_OverWriteConfig(CAN0MSG03, ENABLE);
+    CAN_MessageCache_DeInit(CAN0MSG10);
+    CAN_MessageCache_Init(CAN0MSG10, &CAN_RecvMsg);
+    CAN_MessageCache_OverWriteConfig(CAN0MSG10, ENABLE);
 
     CAN_RecvMsg.Id = DIAG_ID_Rx_FUN;
     CAN_RecvMsg.IDE = CAN_Id_Standard;
     CAN_RecvMsg.CacheType = CAN_CacheType_Rx_NoMask;
     CAN_RecvMsg.RTR = CAN_RTR_Data;
     CAN_RecvMsg.Interrupt = ENABLE;
-    CAN_MessageCache_DeInit(CAN0MSG04);
-    CAN_MessageCache_Init(CAN0MSG04, &CAN_RecvMsg);
-    CAN_MessageCache_OverWriteConfig(CAN0MSG04, ENABLE);
+    CAN_MessageCache_DeInit(CAN0MSG11);
+    CAN_MessageCache_Init(CAN0MSG11, &CAN_RecvMsg);
+    CAN_MessageCache_OverWriteConfig(CAN0MSG11, ENABLE);
 }
 
 /**
@@ -146,8 +173,8 @@ void Can_Tx_Apply_Buff(void)
         CAN_SendMsg.Data[i] = 0;
     }
 
-    CAN_MessageCache_DeInit(CAN0MSG08);
-    CAN_MessageCache_Init(CAN0MSG08, &CAN_SendMsg);
+    CAN_MessageCache_DeInit(CAN1MSG00);
+    CAN_MessageCache_Init(CAN1MSG00, &CAN_SendMsg);
 
     CAN_SendMsg.Id = 0x3A7;
 	CAN_SendMsg.IDE = CAN_Id_Standard;
@@ -160,8 +187,8 @@ void Can_Tx_Apply_Buff(void)
         CAN_SendMsg.Data[i] = 0;
     }
 
-    CAN_MessageCache_DeInit(CAN0MSG10);
-    CAN_MessageCache_Init(CAN0MSG10, &CAN_SendMsg);
+    CAN_MessageCache_DeInit(CAN1MSG01);
+    CAN_MessageCache_Init(CAN1MSG01, &CAN_SendMsg);
 
     
 	CAN_SendMsg_Diag_Tx.Id = DIAG_ID_Tx;
@@ -175,8 +202,8 @@ void Can_Tx_Apply_Buff(void)
         CAN_SendMsg_Diag_Tx.Data[i] = 0;
     }
 
-    CAN_MessageCache_DeInit(CAN0MSG09);
-    CAN_MessageCache_Init(CAN0MSG09, &CAN_SendMsg_Diag_Tx);
+    CAN_MessageCache_DeInit(CAN1MSG02);
+    CAN_MessageCache_Init(CAN1MSG02, &CAN_SendMsg_Diag_Tx);
 }
 /**
  * @brief 用于接收回调函数

Firmware/Source/Application/GUI_Display/GUI_Display.h

@@ -37,14 +37,14 @@ typedef struct
 
 #define POWERON_SCAN_TIMER   3000ul
 
-// void Gauge_Power_1_SOC_Display(void);
-void Gauge_Power_2_SOC_Display(void);
+void Gauge_Power_SOC_pull_Display(void);
+// void Gauge_Power_2_SOC_Display(void);
 
 void Gauge_Power_Display(void);
 void Gauge_Battery_Display(void);
 
-
 void Gauge_Clock_Display(void);
+// void Gauge_Gear_Display(void);
 void Gauge_Clock_All_Display(void);
 void Gauge_DrivingRange_Display(void);
 //void Gauge_Gear_Display(void);
@@ -61,4 +61,5 @@ void Temp_Calc_Init(void);
 void Temp_Calc_Send(void);
 uint32_t Get_Temp_Calc(void);
 
+
 #endif

Firmware/Source/Application/SEG_DISPLAY/SEG_DISPLAY.h

@@ -112,7 +112,7 @@ void SEG_Scan_SET_EspeedDial(void);
 extern void Checkself_Init (void);
 extern void Checkself_SEG_Display(void);
 
-
+extern uint8_t SOC_charge_seg_Flag;