diff options
| author | px4dev <px4@purgatory.org> | 2012-08-20 18:03:12 -0700 |
|---|---|---|
| committer | px4dev <px4@purgatory.org> | 2012-08-20 18:03:12 -0700 |
| commit | a043702af5e8b778917de2bc3a429880a2e88a38 (patch) | |
| tree | 933a76ab5fad092abee0cf043fd73655495e10c2 | |
| parent | 7127c106cb3e00427fd1a5737c98b5e7b08e7af1 (diff) | |
| parent | 3246568c82b8882e6b54f15d56523fc35f606089 (diff) | |
| download | px4-firmware-a043702af5e8b778917de2bc3a429880a2e88a38.tar.gz px4-firmware-a043702af5e8b778917de2bc3a429880a2e88a38.tar.bz2 px4-firmware-a043702af5e8b778917de2bc3a429880a2e88a38.zip | |
Merge branch 'master' into px4dev_new_param
| -rw-r--r-- | apps/systemlib/mixer/mixer_group.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/apps/systemlib/mixer/mixer_group.cpp b/apps/systemlib/mixer/mixer_group.cpp index bc944ccd9..44a33bf8b 100644 --- a/apps/systemlib/mixer/mixer_group.cpp +++ b/apps/systemlib/mixer/mixer_group.cpp @@ -217,7 +217,7 @@ mixer_load_multirotor(Mixer::ControlCallback control_cb, uintptr_t cb_handle, co char geomname[8]; int s[4]; - if (sscanf(buf, "R: %7s %d %d %d %d", geomname, &s[0], &s[1], &s[2], &s[3]) != 5) { + if (sscanf(buf, "R: %s %d %d %d %d", geomname, &s[0], &s[1], &s[2], &s[3]) != 5) { debug("multirotor parse failed on '%s'", buf); return nullptr; } |