diff options
| author | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-31 11:37:32 +0200 |
|---|---|---|
| committer | Lorenz Meier <lm@inf.ethz.ch> | 2014-07-31 11:37:32 +0200 |
| commit | 93a822fee4d1245bd74800781e2638efc147c4e8 (patch) | |
| tree | 16cd8abca9691af516ff2a2b43cef60d31907865 /src/modules/commander/mag_calibration.cpp | |
| parent | 1b3a775e1b8341cdc32e7c9a497acba9da5a9802 (diff) | |
| parent | 75dfb0d84d73e56d624c062ba3f35b88505a2f93 (diff) | |
| download | px4-firmware-93a822fee4d1245bd74800781e2638efc147c4e8.tar.gz px4-firmware-93a822fee4d1245bd74800781e2638efc147c4e8.tar.bz2 px4-firmware-93a822fee4d1245bd74800781e2638efc147c4e8.zip | |
Merged master
Diffstat (limited to 'src/modules/commander/mag_calibration.cpp')
| -rw-r--r-- | src/modules/commander/mag_calibration.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/modules/commander/mag_calibration.cpp b/src/modules/commander/mag_calibration.cpp index 0ead22f77..23900f386 100644 --- a/src/modules/commander/mag_calibration.cpp +++ b/src/modules/commander/mag_calibration.cpp @@ -145,7 +145,7 @@ int do_mag_calibration(int mavlink_fd) } if (res == OK) { - int sub_mag = orb_subscribe(ORB_ID(sensor_mag)); + int sub_mag = orb_subscribe(ORB_ID(sensor_mag0)); struct mag_report mag; /* limit update rate to get equally spaced measurements over time (in ms) */ @@ -170,7 +170,7 @@ int do_mag_calibration(int mavlink_fd) int poll_ret = poll(fds, 1, 1000); if (poll_ret > 0) { - orb_copy(ORB_ID(sensor_mag), sub_mag, &mag); + orb_copy(ORB_ID(sensor_mag0), sub_mag, &mag); x[calibration_counter] = mag.x; y[calibration_counter] = mag.y; |