Motor merge

[AntonOstman]

• [ ] My code follows the style guidelines of this project
• [ ] Any changed pins has been updated here.
• [ ] I've set an responsible reviewer and pinged this person on Discord.