Skip to content

Commit af34853

Browse files
author
Maximiliano Palay
committed
added torques callback as private variable, and addressed it on the ontorques callback
1 parent 8822d34 commit af34853

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

src/ODriveCAN.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,7 +159,7 @@ void ODriveCAN::onReceive(uint32_t id, uint8_t length, const uint8_t* data) {
159159
Get_Torques_msg_t estimates;
160160
estimates.decode_buf(data);
161161
if (torques_callback_)
162-
torques_callback_(estimates, feedback_user_data_);
162+
torques_callback_(estimates, torques_user_data_);
163163
break;
164164
}
165165
case Heartbeat_msg_t::cmd_id: {

src/ODriveCAN.h

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@ class ODriveCAN {
219219
*/
220220
void onTorques(void (*callback)(Get_Torques_msg_t& feedback, void* user_data), void* user_data = nullptr) {
221221
torques_callback_ = callback;
222-
feedback_user_data_ = user_data;
222+
torques_user_data_ = user_data;
223223
}
224224

225225
/**
@@ -330,6 +330,7 @@ class ODriveCAN {
330330

331331
void* axis_state_user_data_;
332332
void* feedback_user_data_;
333+
void* torques_user_data_;
333334

334335
void (*axis_state_callback_)(Heartbeat_msg_t& feedback, void* user_data) = nullptr;
335336
void (*feedback_callback_)(Get_Encoder_Estimates_msg_t& feedback, void* user_data) = nullptr;

0 commit comments

Comments
 (0)