fix variable naming and merge conflict in hoverboard guide
fix variable naming and merge conflict in hoverboard guide

madcowswe/ODriveFirmware,madcowswe/ODriveFirmware,madcowswe/ODrive,madcowswe/ODrive,madcowswe/ODrive,madcowswe/ODrive,madcowswe/ODriveFirmware,madcowswe/ODrive,madcowswe/ODriveFirmware