diff --git a/.gitignore b/.gitignore index 8c76af6..ac572a3 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ !.vscode/settings.json -.vscode \ No newline at end of file +.vscode +.DS_Store \ No newline at end of file diff --git a/Inc/mmr_can_message_id.h b/Inc/mmr_can_message_id.h index cdeb956..5a3060f 100644 --- a/Inc/mmr_can_message_id.h +++ b/Inc/mmr_can_message_id.h @@ -122,10 +122,32 @@ enum MmrCanMessageId { // DRIVE MMR_CAN_MESSAGE_ID_D_STEERING_ANGLE = 160, MMR_CAN_MESSAGE_ID_D_BREAKING_PERCENTAGE, + MMR_CAN_MESSAGE_ID_D_ACCELERATOR_PERCENTAGE, + 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_