Merge master

This commit is contained in:
Stefano Calabretti
2022-05-18 09:04:06 +02:00
parent f34e2a1fc6
commit bf81796125
+21 -1
View File
@@ -126,8 +126,28 @@ enum MmrCanMessageId {
MMR_CAN_MESSAGE_ID_D_SPEED_ODOMETRY,
// !DRIVE
// ECU_BOSCH
MMR_CAN_MESSAGE_ID_ECU_BOSCH_ = 192,
MMR_CAN_MESSAGE_ID_ECU_BOSCH_SPEED = 192,
MMR_CAN_MESSAGE_ID_ECU_BOSCH_GEAR,
MMR_CAN_MESSAGE_ID_ECU_BOSCH_RPM,
MMR_CAN_MESSAGE_ID_ECU_BOSCH_THROTTLE,
MMR_CAN_MESSAGE_ID_ECU_BOSCH_TEMP_OIL,
MMR_CAN_MESSAGE_ID_ECU_BOSCH_TEMP_WATER,
MMR_CAN_MESSAGE_ID_ECU_BOSCH_TORQUE,
// !ECU_BOSCH
// CONTROL_SIGNAL
MMR_CAN_MESSAGE_ID_CS_CLUTCH_SIGNAL = 224,
MMR_CAN_MESSAGE_ID_CS_CLUTCH_FEEDBACK,
// !CONTROL_SIGNAL
// STEERING
MMR_CAN_MESSAGE_ID_ST_PROPORTIONAL_ERROR_LEFT_X = 256,
MMR_CAN_MESSAGE_ID_ST_PROPORTIONAL_ERROR_RIGHT_X,
MMR_CAN_MESSAGE_ID_ST_PROPORTIONAL_ODOMETRY_MIN_SPEED_LEFT_X,
MMR_CAN_MESSAGE_ID_ST_PROPORTIONAL_ODOMETRY_MIN_SPEED_LEFT_Y,
MMR_CAN_MESSAGE_ID_ST_PROPORTIONAL_ODOMETRY_MIN_SPEED_RIGHT_X,
MMR_CAN_MESSAGE_ID_ST_PROPORTIONAL_ODOMETRY_MIN_SPEED_RIGHT_Y,
MMR_CAN_MESSAGE_ID_ST_PROPORTIONAL_ODOMETRY_MAX_SPEED_LEFT_Y,
MMR_CAN_MESSAGE_ID_ST_PROPORTIONAL_ODOMETRY_MAX_SPEED_RIGHT_Y,
// !STEERING
};
#endif // !INC_MMR_CAN_MESSAGE_ID_H_