✨ feat:完成老化台

Test_Bench/Api_Sources/APP_CAN.c

@@ -102,6 +102,8 @@ void Format_CAN_Msg()
     CanMsg_200.ID = 0x200;
     CanMsg_687.ID = 0x687;
     CanMsg_600.ID = 0x600;
+    CanMsg_6A0.ID = 0x6A0;
+    CanMsg_6A2.ID = 0x6A2;
     // CanMsg_SOC.ID = 0x18203020;
     // CanMsg_SOC1.ID = 0x18200A20;
     // CanMsg_SOC2.ID = 0x18200A21;
@@ -116,6 +118,8 @@ void Format_CAN_Msg()
     CanMsg_200.Length = 8;
     CanMsg_687.Length = 8;
     CanMsg_600.Length = 8;
+    CanMsg_6A0.Length = 8;
+    CanMsg_6A2.Length = 8;
     // CanMsg_SOC.Length = 8;
     // CanMsg_SOC1.Length = 8;
     // CanMsg_SOC2.Length = 8;  
@@ -129,6 +133,8 @@ void Format_CAN_Msg()
     CanMsg_200.ID_EN = 1;
     CanMsg_687.ID_EN = 1;
     CanMsg_600.ID_EN = 1;
+    CanMsg_6A0.ID_EN = 1;
+    CanMsg_6A2.ID_EN = 1;
     // CanMsg_SOC.ID_EN = 1;
     // CanMsg_SOC1.ID_EN = 1;
     // CanMsg_SOC2.ID_EN = 1;
@@ -145,6 +151,8 @@ void Disable_CAN_Tx(void){
     CanMsg_200.ID_EN = 0;
     CanMsg_687.ID_EN = 0;
     CanMsg_600.ID_EN = 0;
+    CanMsg_6A0.ID_EN = 0;
+    CanMsg_6A2.ID_EN = 0;
     // CanMsg_157.ID_EN = 0;
     // CanMsg_SOC.ID_EN = 0;
     // CanMsg_SOC1.ID_EN = 0;
@@ -221,11 +229,11 @@ void App_Can_Proc(void)
         bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_180);
         Clear_CAN_Msg((CAN_message *)&CanMsg_180); 
 
-        if(Key.CAN_Step != 0)
-        {
+        // if(Key.CAN_Step != 0)
+        // {
             bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_687);
             Clear_CAN_Msg((CAN_message *)&CanMsg_687);
-        }
+        // }
         
     }
 
@@ -245,6 +253,26 @@ void App_Can_Proc(void)
         Clear_CAN_Msg((CAN_message *)&CanMsg_100);  
         bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_200);
         Clear_CAN_Msg((CAN_message *)&CanMsg_200);
+
+        if(Meterfieldstep == 0)
+        {
+            bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_6A0);
+            Clear_CAN_Msg((CAN_message *)&CanMsg_6A0);
+        }
+        else
+        {
+            bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_6A2);
+            Clear_CAN_Msg((CAN_message *)&CanMsg_6A2); 
+        }
+
+        if(Meterfieldstep < 4)
+        {
+            Meterfieldstep++;
+        }
+        else
+        {
+            Meterfieldstep = 0;
+        }
     }
 
     if(GetCtrlTime(CANMsgSend_200ms) >= 200){

Test_Bench/App_Headers/APP_Test.h

@@ -59,6 +59,15 @@ enum
     Smartphone_battery,
     Music_ico,
     HHGLevel,
+    Meter_field_begin,
+    Meter_field_setdata_bit1,
+    Meter_field_setdata_bit2,
+    Meter_field_setdata_bit3,
+    Meter_field_setdata_bit4,
+    Meter_field_setdata_bit5,
+    Meter_field_setdata_bit6,
+    Meter_field_setdata_bit7,
+    Meter_field_setdata_bit8,
     // Sync_clock_Minutes,
     // Sync_Request,
     // Sync_clock_Hours,
@@ -122,7 +131,16 @@ static const s_CAN_List CAN_List[] =
     {&CanMsg_687,      0,  0,  3,    0,   Offset_Plus,    1,          1, &CurValueStr[GSM                     ], Motorola},
     {&CanMsg_687,      0,  3,  4,    0,   Offset_Plus,    1,          1, &CurValueStr[Smartphone_battery      ], Motorola},
     {&CanMsg_687,      1,  7,  1,    0,   Offset_Plus,    1,          1, &CurValueStr[Music_ico               ], Motorola},
-    {&CanMsg_687,      3,  1,  4,    0,   Offset_Plus,    1,          1, &CurValueStr[HHGLevel           ], Motorola}
+    {&CanMsg_687,      3,  1,  4,    0,   Offset_Plus,    1,          1, &CurValueStr[HHGLevel                ], Motorola},
+    {&CanMsg_6A0,      0,  0,  8,    0,   Offset_Plus,    1,          1, &CurValueStr[Meter_field_begin       ], Motorola},
+    {&CanMsg_6A2,      0,  0,  8,    0,   Offset_Plus,    1,          1, &CurValueStr[Meter_field_setdata_bit1], Motorola},
+    {&CanMsg_6A2,      1,  0,  8,    0,   Offset_Plus,    1,          1, &CurValueStr[Meter_field_setdata_bit2], Motorola},
+    {&CanMsg_6A2,      2,  0,  8,    0,   Offset_Plus,    1,          1, &CurValueStr[Meter_field_setdata_bit3], Motorola},
+    {&CanMsg_6A2,      3,  0,  8,    0,   Offset_Plus,    1,          1, &CurValueStr[Meter_field_setdata_bit4], Motorola},
+    {&CanMsg_6A2,      4,  0,  8,    0,   Offset_Plus,    1,          1, &CurValueStr[Meter_field_setdata_bit5], Motorola},
+    {&CanMsg_6A2,      5,  0,  8,    0,   Offset_Plus,    1,          1, &CurValueStr[Meter_field_setdata_bit6], Motorola},
+    {&CanMsg_6A2,      6,  0,  8,    0,   Offset_Plus,    1,          1, &CurValueStr[Meter_field_setdata_bit7], Motorola},
+    {&CanMsg_6A2,      7,  0,  8,    0,   Offset_Plus,    1,          1, &CurValueStr[Meter_field_setdata_bit8], Motorola},
 
     // {&CanMsg_600,      3,  1,  7,    0,   Offset_Plus,    1,          1, &CurValueStr[Sync_clock_Minutes ], Motorola},
     // {&CanMsg_600,      3,  0,  1,    0,   Offset_Plus,    1,          1, &CurValueStr[Sync_Request       ], Motorola},
@@ -173,6 +191,7 @@ extern unsigned int CAN_init_flag;
 extern unsigned int water_value;
 extern unsigned int count_flag_a;
 extern unsigned int speed_value;
+extern unsigned int Meterfieldstep;
 EXTERN_APP_TEST             void                APP_Button_Proc(void);
 EXTERN_APP_TEST             void                Message_Value_Calculate(s_CAN_List list);
 

Test_Bench/App_Headers/Globals_Var.h

@@ -117,6 +117,8 @@
     EXTERN_VAR      CAN_message                 CanMsg_200;
     EXTERN_VAR      CAN_message                 CanMsg_687;
     EXTERN_VAR      CAN_message                 CanMsg_600;
+    EXTERN_VAR      CAN_message                 CanMsg_6A0;
+    EXTERN_VAR      CAN_message                 CanMsg_6A2;
     // EXTERN_VAR      CAN_message                 CanMsg_600;
     // EXTERN_VAR      CAN_message                 CanMsg_SOC1;
     // EXTERN_VAR      CAN_message                 CanMsg_SOC2;