Commit c57f1ac3 authored by 李冠华's avatar 李冠华

feat:混动车型增加行走挡位工作逻辑

parent 8cea37da
......@@ -48,35 +48,66 @@ void Data_Gear_Cutterhead_Service(void)
void Data_Gear_Service(void)
{
uint8_t Signal1 = Get_CAN_Num_MMCU_TravelSpeedGear();
uint8_t Signal2 = Get_CAN_Num_MMCU_ParkingGearState();
#if (PART_NUMBER == RMR42E_60)
uint8_t Signal1 = Get_CAN_Num_MMCU_TravelSpeedGear();
uint8_t Signal2 = Get_CAN_Num_MMCU_ParkingGearState();
if ((Common_Get_IG_Sts() == COMMON_POWER_ON) && (Get_CAN_Power_State() >= KEY_ACC) && (Get_CAN_Power_State() < CHRGEND) && (System_Indicator_CANFlag != 1))
{
if (Signal2 != 0x1)
if ((Common_Get_IG_Sts() == COMMON_POWER_ON) && (Get_CAN_Power_State() >= KEY_ACC) && (Get_CAN_Power_State() < CHRGEND) && (System_Indicator_CANFlag != 1))
{
if ((Signal1 == 0x1) || (Signal1 == 0x2))
if (Signal2 != 0x1)
{
Gear.GearNum = Signal1;
Gear.GearValid = 1U;
if ((Signal1 == 0x1) || (Signal1 == 0x2))
{
Gear.GearNum = Signal1;
Gear.GearValid = 1U;
}
else
{
Gear.GearNum = Gear_OFF;
Gear.GearValid = 1U;
}
}
else
{
Gear.GearNum = Gear_OFF;
Gear.GearNum = Gear_P;
Gear.GearValid = 1U;
}
}
else
{
Gear.GearNum = Gear_P;
Gear.GearValid = 1U;
Gear.GearNum = Gear_OFF;
Gear.GearValid = 0U;
}
}
else
{
Gear.GearNum = 0U;
Gear.GearValid = 0U;
}
#else
uint8_t Signal = Get_CAN_CH0_ID_220_Sig_VCU_DrvSpdGear();
if ((Common_Get_IG_Sts() == COMMON_POWER_ON) && (System_Indicator_CANFlag != 1))
{
if (CAN_MSG_Status(&CAN_CH0_CanMsgOp, Co_Can_ConvertSubID_CAN_CH0(CAN_CH0_ID_CAN_0x220_Msg)) == CAN_SIG_NORMAL)
{
if (Signal == 0U)
{
Gear.GearNum = Gear_L;
Gear.GearValid = 1U;
}
else if(Signal == 1U)
{
Gear.GearNum = Gear_H;
Gear.GearValid = 1U;
}
}
else
{
Gear.GearNum = Gear_OFF;
Gear.GearValid = 0U;
}
}
else
{
Gear.GearNum = Gear_OFF;
Gear.GearValid = 0U;
}
#endif
}
/******************************************************************************
......
......@@ -38,6 +38,8 @@ enum
Gear_1, //R
Gear_2, //N
Gear_OFF, //D
Gear_H, /*混动车型H挡*/
Gear_L, /*混动车型L挡*/
};
typedef enum
......
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