More work to convert to C++
Merge branch 'master' of https://github.com/DonLakeFlyer/ardupilot