search

UbiquityRobotics / ubiquity_motor

Package that provides a ROS interface for the motors in UbiquityRobotics robots
BSD 3-Clause "New" or "Revised" License
24 stars 23 forks source link

Updating fixWheelSlipOverheat1 #116

Closed MoffKalast closed 3 years ago

MoffKalast commented 3 years ago

Merging new features into avalon's currently used branch.

MoffKalast commented 3 years ago

Okay so I figured it would be possible to just merge and I did solve some of the conflicts, but for a few I can't exactly tell what's right since both sides have conflicting changes. Could you take a look @mjstn?

MoffKalast commented 3 years ago

Alright so we'll be needing parts of this on the next image if we want to kill the motor. Seems like there are no remaining conflicts so I'll merge for now.

MoffKalast commented 3 years ago

Ah no wait, there ARE still conflicts. Well in that case, probably best not to.