Fixed switch mapping / names
Merge branch 'master' of github.com:mavlink/qgroundcontrol into thread_test