Merge branch 'jdev' of github.com:odriverobotics/ODrive into jdev

This commit is contained in:
Jascha Wilcox
2021-07-29 12:10:41 -07:00
2 changed files with 7 additions and 3 deletions
+6 -3
View File
@@ -138,12 +138,15 @@ void CANSimple::do_command(Axis& axis, const can_Message_t& msg) {
if (msg.rtr)
get_vbus_voltage_callback(axis);
break;
case MSG_ENCODER_REF_UPDATE:
encoder_ref_update(axis, msg);
break;
case MSG_CLEAR_ERRORS:
clear_errors_callback(axis, msg);
break;
case MSG_SET_LINEAR_COUNT:
set_linear_count_callback(axis, msg);
break;
case MSG_ENCODER_REF_UPDATE:
encoder_ref_update(axis, msg);
break;
default:
break;
}
@@ -32,6 +32,7 @@ class CANSimple {
MSG_RESET_ODRIVE,
MSG_GET_VBUS_VOLTAGE,
MSG_CLEAR_ERRORS,
MSG_SET_LINEAR_COUNT,
MSG_ENCODER_REF_UPDATE,
MSG_CO_HEARTBEAT_CMD = 0x700, // CANOpen NMT Heartbeat SEND
};