Skip to content

J
jiancetai
Commit e493a481 authored by 何锐's avatar 何锐
Browse files
Options

✨ feat:完成老化台

parent f6bf1b91
Expand all Hide whitespace changes
Inline Side-by-side
Showing with 703 additions and 92 deletions
Test_Bench/Api_Sources/APP_CAN.c
View file @ e493a481
...@@ -102,6 +102,8 @@ void Format_CAN_Msg() ...@@ -102,6 +102,8 @@ void Format_CAN_Msg()
CanMsg_200.ID = 0x200; CanMsg_200.ID = 0x200;
CanMsg_687.ID = 0x687; CanMsg_687.ID = 0x687;
CanMsg_600.ID = 0x600; CanMsg_600.ID = 0x600;
CanMsg_6A0.ID = 0x6A0;
CanMsg_6A2.ID = 0x6A2;
// CanMsg_SOC.ID = 0x18203020; // CanMsg_SOC.ID = 0x18203020;
// CanMsg_SOC1.ID = 0x18200A20; // CanMsg_SOC1.ID = 0x18200A20;
// CanMsg_SOC2.ID = 0x18200A21; // CanMsg_SOC2.ID = 0x18200A21;
...@@ -116,6 +118,8 @@ void Format_CAN_Msg() ...@@ -116,6 +118,8 @@ void Format_CAN_Msg()
CanMsg_200.Length = 8; CanMsg_200.Length = 8;
CanMsg_687.Length = 8; CanMsg_687.Length = 8;
CanMsg_600.Length = 8; CanMsg_600.Length = 8;
CanMsg_6A0.Length = 8;
CanMsg_6A2.Length = 8;
// CanMsg_SOC.Length = 8; // CanMsg_SOC.Length = 8;
// CanMsg_SOC1.Length = 8; // CanMsg_SOC1.Length = 8;
// CanMsg_SOC2.Length = 8; // CanMsg_SOC2.Length = 8;
...@@ -129,6 +133,8 @@ void Format_CAN_Msg() ...@@ -129,6 +133,8 @@ void Format_CAN_Msg()
CanMsg_200.ID_EN = 1; CanMsg_200.ID_EN = 1;
CanMsg_687.ID_EN = 1; CanMsg_687.ID_EN = 1;
CanMsg_600.ID_EN = 1; CanMsg_600.ID_EN = 1;
CanMsg_6A0.ID_EN = 1;
CanMsg_6A2.ID_EN = 1;
// CanMsg_SOC.ID_EN = 1; // CanMsg_SOC.ID_EN = 1;
// CanMsg_SOC1.ID_EN = 1; // CanMsg_SOC1.ID_EN = 1;
// CanMsg_SOC2.ID_EN = 1; // CanMsg_SOC2.ID_EN = 1;
...@@ -145,6 +151,8 @@ void Disable_CAN_Tx(void){ ...@@ -145,6 +151,8 @@ void Disable_CAN_Tx(void){
CanMsg_200.ID_EN = 0; CanMsg_200.ID_EN = 0;
CanMsg_687.ID_EN = 0; CanMsg_687.ID_EN = 0;
CanMsg_600.ID_EN = 0; CanMsg_600.ID_EN = 0;
CanMsg_6A0.ID_EN = 0;
CanMsg_6A2.ID_EN = 0;
// CanMsg_157.ID_EN = 0; // CanMsg_157.ID_EN = 0;
// CanMsg_SOC.ID_EN = 0; // CanMsg_SOC.ID_EN = 0;
// CanMsg_SOC1.ID_EN = 0; // CanMsg_SOC1.ID_EN = 0;
...@@ -221,11 +229,11 @@ void App_Can_Proc(void) ...@@ -221,11 +229,11 @@ void App_Can_Proc(void)
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_180); bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_180);
Clear_CAN_Msg((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); bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_687);
Clear_CAN_Msg((CAN_message *)&CanMsg_687); Clear_CAN_Msg((CAN_message *)&CanMsg_687);
} // }
} }
...@@ -245,6 +253,26 @@ void App_Can_Proc(void) ...@@ -245,6 +253,26 @@ void App_Can_Proc(void)
Clear_CAN_Msg((CAN_message *)&CanMsg_100); Clear_CAN_Msg((CAN_message *)&CanMsg_100);
bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_200); bReturn = Api_CANSendFrame((CAN_message *)&CanMsg_200);
Clear_CAN_Msg((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){ if(GetCtrlTime(CANMsgSend_200ms) >= 200){
......
Test_Bench/Api_Sources/APP_Test.c
View file @ e493a481
This diff is collapsed.
Test_Bench/App_Headers/APP_Test.h
View file @ e493a481
...@@ -59,6 +59,15 @@ enum ...@@ -59,6 +59,15 @@ enum
Smartphone_battery, Smartphone_battery,
Music_ico, Music_ico,
HHGLevel, 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_clock_Minutes,
// Sync_Request, // Sync_Request,
// Sync_clock_Hours, // Sync_clock_Hours,
...@@ -104,26 +113,35 @@ EXTERN_APP_TEST volatile s_CurValue CurValueStr[CAN_List_Num]; ...@@ -104,26 +113,35 @@ EXTERN_APP_TEST volatile s_CurValue CurValueStr[CAN_List_Num];
static const s_CAN_List CAN_List[] = static const s_CAN_List CAN_List[] =
{ {
{&CanMsg_260, 1, 0, 16, 0, Offset_Plus, 100, 1, &CurValueStr[VELVEIC_ABS_F ], Motorola}, {&CanMsg_260, 1, 0, 16, 0, Offset_Plus, 100, 1, &CurValueStr[VELVEIC_ABS_F ], Motorola},
{&CanMsg_260, 3, 0, 16, 0, Offset_Plus, 100, 1, &CurValueStr[VELVEIC_ABS_R ], Motorola}, {&CanMsg_260, 3, 0, 16, 0, Offset_Plus, 100, 1, &CurValueStr[VELVEIC_ABS_R ], Motorola},
{&CanMsg_180, 2, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[TH2OC ], Motorola}, {&CanMsg_180, 2, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[TH2OC ], Motorola},
{&CanMsg_100, 5, 2, 2, 0, Offset_Plus, 1, 1, &CurValueStr[MIL_Lamp ], Motorola}, {&CanMsg_100, 5, 2, 2, 0, Offset_Plus, 1, 1, &CurValueStr[MIL_Lamp ], Motorola},
{&CanMsg_153, 0, 0, 2, 0, Offset_Plus, 1, 1, &CurValueStr[ABS_warning_lamp ], Motorola}, {&CanMsg_153, 0, 0, 2, 0, Offset_Plus, 1, 1, &CurValueStr[ABS_warning_lamp ], Motorola},
{&CanMsg_100, 5, 0, 1, 0, Offset_Plus, 1, 1, &CurValueStr[OIL_TALE_STOP ], Motorola}, {&CanMsg_100, 5, 0, 1, 0, Offset_Plus, 1, 1, &CurValueStr[OIL_TALE_STOP ], Motorola},
{&CanMsg_120, 4, 6, 1, 0, Offset_Plus, 1, 1, &CurValueStr[CENACC ], Motorola}, {&CanMsg_120, 4, 6, 1, 0, Offset_Plus, 1, 1, &CurValueStr[CENACC ], Motorola},
{&CanMsg_200, 4, 6, 2, 0, Offset_Plus, 1, 1, &CurValueStr[ASR_indicator ], Motorola}, {&CanMsg_200, 4, 6, 2, 0, Offset_Plus, 1, 1, &CurValueStr[ASR_indicator ], Motorola},
{&CanMsg_200, 2, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[AB_SET ], Motorola}, {&CanMsg_200, 2, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[AB_SET ], Motorola},
{&CanMsg_687, 1, 4, 1, 0, Offset_Plus, 1, 1, &CurValueStr[Telephone_lcon ], Motorola}, {&CanMsg_687, 1, 4, 1, 0, Offset_Plus, 1, 1, &CurValueStr[Telephone_lcon ], Motorola},
{&CanMsg_687, 1, 1, 1, 0, Offset_Plus, 1, 1, &CurValueStr[Device_connected ], Motorola}, {&CanMsg_687, 1, 1, 1, 0, Offset_Plus, 1, 1, &CurValueStr[Device_connected ], Motorola},
{&CanMsg_687, 1, 2, 1, 0, Offset_Plus, 1, 1, &CurValueStr[App_lcon_status ], Motorola}, {&CanMsg_687, 1, 2, 1, 0, Offset_Plus, 1, 1, &CurValueStr[App_lcon_status ], Motorola},
{&CanMsg_687, 1, 6, 1, 0, Offset_Plus, 1, 1, &CurValueStr[Lost_call_icon ], Motorola}, {&CanMsg_687, 1, 6, 1, 0, Offset_Plus, 1, 1, &CurValueStr[Lost_call_icon ], Motorola},
{&CanMsg_687, 1, 5, 1, 0, Offset_Plus, 1, 1, &CurValueStr[Notincaton_lcon ], Motorola}, {&CanMsg_687, 1, 5, 1, 0, Offset_Plus, 1, 1, &CurValueStr[Notincaton_lcon ], Motorola},
{&CanMsg_100, 5, 7, 1, 0, Offset_Plus, 1, 1, &CurValueStr[CSTAMPLAT ], Motorola}, {&CanMsg_100, 5, 7, 1, 0, Offset_Plus, 1, 1, &CurValueStr[CSTAMPLAT ], Motorola},
{&CanMsg_687, 0, 0, 3, 0, Offset_Plus, 1, 1, &CurValueStr[GSM ], Motorola}, {&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, 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, 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, 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}, // {&CanMsg_600, 3, 0, 1, 0, Offset_Plus, 1, 1, &CurValueStr[Sync_Request ], Motorola},
// {&CanMsg_600, 4, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Sync_clock_Hours ], Motorola}, // {&CanMsg_600, 4, 0, 8, 0, Offset_Plus, 1, 1, &CurValueStr[Sync_clock_Hours ], Motorola},
...@@ -173,6 +191,7 @@ extern unsigned int CAN_init_flag; ...@@ -173,6 +191,7 @@ extern unsigned int CAN_init_flag;
extern unsigned int water_value; extern unsigned int water_value;
extern unsigned int count_flag_a; extern unsigned int count_flag_a;
extern unsigned int speed_value; extern unsigned int speed_value;
extern unsigned int Meterfieldstep;
EXTERN_APP_TEST void APP_Button_Proc(void); EXTERN_APP_TEST void APP_Button_Proc(void);
EXTERN_APP_TEST void Message_Value_Calculate(s_CAN_List list); EXTERN_APP_TEST void Message_Value_Calculate(s_CAN_List list);
......
Test_Bench/App_Headers/Globals_Var.h
View file @ e493a481
...@@ -117,6 +117,8 @@ ...@@ -117,6 +117,8 @@
EXTERN_VAR CAN_message CanMsg_200; EXTERN_VAR CAN_message CanMsg_200;
EXTERN_VAR CAN_message CanMsg_687; EXTERN_VAR CAN_message CanMsg_687;
EXTERN_VAR CAN_message CanMsg_600; 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_600;
// EXTERN_VAR CAN_message CanMsg_SOC1; // EXTERN_VAR CAN_message CanMsg_SOC1;
// EXTERN_VAR CAN_message CanMsg_SOC2; // EXTERN_VAR CAN_message CanMsg_SOC2;
......
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