diff options
author | Bdale Garbee <bdale@gag.com> | 2017-08-12 00:59:03 -0400 |
---|---|---|
committer | Bdale Garbee <bdale@gag.com> | 2017-08-12 00:59:03 -0400 |
commit | 59c6167b9f1e9de30455af1632e9a0b65d64ad63 (patch) | |
tree | d27e4b3df53300081aa6ac0a30820c58a1c968ef /src/kernel/ao_log_mega.c | |
parent | 41eedf88751910ea9c0a299444fbac769edb8427 (diff) | |
parent | fccfa54bb3b746cecfcdc1fd497cf736bbfe3ef3 (diff) |
Merge branch 'branch-1.8' into debian
Diffstat (limited to 'src/kernel/ao_log_mega.c')
-rw-r--r-- | src/kernel/ao_log_mega.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/kernel/ao_log_mega.c b/src/kernel/ao_log_mega.c index a0212198..b86abe7a 100644 --- a/src/kernel/ao_log_mega.c +++ b/src/kernel/ao_log_mega.c @@ -135,8 +135,8 @@ ao_log(void) #endif #if HAS_HMC5883 log.u.sensor.mag_x = ao_data_ring[ao_log_data_pos].hmc5883.x; - log.u.sensor.mag_y = ao_data_ring[ao_log_data_pos].hmc5883.y; log.u.sensor.mag_z = ao_data_ring[ao_log_data_pos].hmc5883.z; + log.u.sensor.mag_y = ao_data_ring[ao_log_data_pos].hmc5883.y; #endif log.u.sensor.accel = ao_data_accel(&ao_data_ring[ao_log_data_pos]); ao_log_mega(&log); |