|
@@ -213,7 +213,8 @@ void executeDecition(const iv::brain::decition &decition)
|
|
|
byte_1C4[1] = ((_m1C4.ACC_MotorTorqueMaxLimitRequest & (0x07U)) << 5) | ((_m1C4.ACC_MotorTorqueMinLimitRequest >> 6) & (0x1FU));
|
|
|
byte_1C4[2] = ((_m1C4.ACC_MotorTorqueMinLimitRequest & (0x3FU)) << 2) | ((_m1C4.ACC_LatAngReq >> 12) & (0x03U));
|
|
|
byte_1C4[3] = (((_m1C4.ACC_LatAngReq>>4 )& (0xFFU)));
|
|
|
- byte_1C4[4] = (((_m1C4.ACC_LatAngReq<<4) & (0xF0U)))|((_m1C4.ACC_LatAngReqActive&(0x01U))<<3);
|
|
|
+ // byte_1C4[4] = (((_m1C4.ACC_LatAngReq<<4) & (0xF0U)))|((_m1C4.ACC_LatAngReqActive&(0x01U))<<3);
|
|
|
+ byte_1C4[4] = (((_m1C4.ACC_LatAngReq)& (0x0fU))<<4)|((_m1C4.ACC_LatAngReqActive&(0x01U))<<3);
|
|
|
//byte_1C4[5] = ((_m144.ACC_ADCReqType & (0x03U)) << 6);
|
|
|
|
|
|
// _m24B.ACC_AEBTargetDeceleration = 0;
|
|
@@ -281,7 +282,8 @@ void executeDecition(const iv::brain::decition &decition)
|
|
|
byte_24E[10] = ((_m24E.ACC_AEBActive & (0x01U)) << 7);
|
|
|
byte_24E[11] = ((_m24E.ACC_AccTrqReq>>13 )& (0x03U));
|
|
|
byte_24E[12] = ((_m24E.ACC_AccTrqReq>>5 )& (0xFFU));
|
|
|
- byte_24E[13] = ((_m24E.ACC_AccTrqReq & (0x1FU)<<3))| ((_m24E.ACC_AccTrqReqActive & (0x01U)) << 2);
|
|
|
+ //byte_24E[13] = ((_m24E.ACC_AccTrqReq & (0x1FU)<<3))| ((_m24E.ACC_AccTrqReqActive & (0x01U)) << 2);
|
|
|
+ byte_24E[13] = (((_m24E.ACC_AccTrqReq & (0x1FU))<<3))| ((_m24E.ACC_AccTrqReqActive & (0x01U)) << 2);
|
|
|
|
|
|
// if(decition.leftlamp() == true && decition.rightlamp() == false)
|
|
|
// _m36E.ADS_UDLCTurnLightReq = 3;
|