File tree 3 files changed +21
-15
lines changed
3 files changed +21
-15
lines changed Original file line number Diff line number Diff line change @@ -82,11 +82,15 @@ class MoveGroupMessageHandler {
82
82
can_client.send_can_message (can::ids::NodeId::host, response);
83
83
}
84
84
85
- void handle (const can::messages::ClearAllMoveGroupsRequest& m) {
86
- LOG (" Received clear move groups request" );
85
+ void clear_move_groups () {
87
86
for (auto & group : move_groups) {
88
87
group.clear ();
89
88
}
89
+ }
90
+
91
+ void handle (const can::messages::ClearAllMoveGroupsRequest& m) {
92
+ LOG (" Received clear move groups request" );
93
+ this ->clear_move_groups ();
90
94
can_client.send_can_message (can::ids::NodeId::host,
91
95
can::messages::ack_from_request (m));
92
96
}
@@ -104,9 +108,7 @@ class MoveGroupMessageHandler {
104
108
105
109
void handle (const can::messages::StopRequest& m) {
106
110
LOG (" Recieved StopRequest in MoveGroup" );
107
- auto clear_req =
108
- can::messages::ClearAllMoveGroupsRequest{.message_index = 0 };
109
- this ->handle (clear_req);
111
+ this ->clear_move_groups ();
110
112
// pass the stop message to motion controller to kill pwm
111
113
// and any running moves
112
114
mc_client.send_brushed_motion_controller_queue (m);
Original file line number Diff line number Diff line change @@ -80,11 +80,15 @@ class MoveGroupMessageHandler {
80
80
can_client.send_can_message (can::ids::NodeId::host, response);
81
81
}
82
82
83
- void handle (const can::messages::ClearAllMoveGroupsRequest& m) {
84
- LOG (" Received clear move groups request" );
83
+ void clear_move_groups () {
85
84
for (auto & group : move_groups) {
86
85
group.clear ();
87
86
}
87
+ }
88
+
89
+ void handle (const can::messages::ClearAllMoveGroupsRequest& m) {
90
+ LOG (" Received clear move groups request" );
91
+ this ->clear_move_groups ();
88
92
can_client.send_can_message (can::ids::NodeId::host,
89
93
can::messages::ack_from_request (m));
90
94
}
@@ -102,9 +106,7 @@ class MoveGroupMessageHandler {
102
106
103
107
void handle (const can::messages::StopRequest& m) {
104
108
LOG (" Received StopRequest in MoveGroup" );
105
- auto clear_req =
106
- can::messages::ClearAllMoveGroupsRequest{.message_index = 0 };
107
- this ->handle (clear_req);
109
+ this ->clear_move_groups ();
108
110
// pass the stop message to motion controller to kill pwm
109
111
// and any running moves
110
112
mc_client.send_motion_controller_queue (m);
Original file line number Diff line number Diff line change @@ -72,11 +72,15 @@ class MoveGroupMessageHandler {
72
72
can_client.send_can_message (can::ids::NodeId::host, response);
73
73
}
74
74
75
- void handle (const can::messages::ClearAllMoveGroupsRequest& m) {
76
- LOG (" Received clear move groups request" );
75
+ void clear_move_groups () {
77
76
for (auto & group : move_groups) {
78
77
group.clear ();
79
78
}
79
+ }
80
+
81
+ void handle (const can::messages::ClearAllMoveGroupsRequest& m) {
82
+ LOG (" Received clear move groups request" );
83
+ this ->clear_move_groups ();
80
84
can_client.send_can_message (can::ids::NodeId::host,
81
85
can::messages::ack_from_request (m));
82
86
}
@@ -94,9 +98,7 @@ class MoveGroupMessageHandler {
94
98
95
99
void handle (const can::messages::StopRequest& m) {
96
100
LOG (" Received StopRequest in MoveGroup" );
97
- auto clear_req =
98
- can::messages::ClearAllMoveGroupsRequest{.message_index = 0 };
99
- this ->handle (clear_req);
101
+ this ->clear_move_groups ();
100
102
// pass the stop message to motion controller to kill pwm
101
103
// and any running moves
102
104
mc_client.send_motion_controller_queue (m);
You can’t perform that action at this time.
0 commit comments