diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2014-01-02 14:52:00 +0400 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2014-01-02 14:52:00 +0400 |
| commit | 5bedd8c714685b73eff67da1586c90c874d990ab (patch) | |
| tree | 387b8ac2f0a326beab9d249347e9f9ad434b1f24 /src/modules/sdlog2 | |
| parent | 61ef2e00a96badcd2d30d91e4f14b479114ee7f1 (diff) | |
| parent | 6a5d5f7136c8f317594bcc768131fe1779eabf2c (diff) | |
| download | px4-firmware-5bedd8c714685b73eff67da1586c90c874d990ab.tar.gz px4-firmware-5bedd8c714685b73eff67da1586c90c874d990ab.tar.bz2 px4-firmware-5bedd8c714685b73eff67da1586c90c874d990ab.zip | |
Merge branch 'navigator_new' into navigator_new_vector
Diffstat (limited to 'src/modules/sdlog2')
| -rw-r--r-- | src/modules/sdlog2/sdlog2.c | 4 | ||||
| -rw-r--r-- | src/modules/sdlog2/sdlog2_messages.h | 4 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/modules/sdlog2/sdlog2.c b/src/modules/sdlog2/sdlog2.c index 10404211e..7b6ffd922 100644 --- a/src/modules/sdlog2/sdlog2.c +++ b/src/modules/sdlog2/sdlog2.c @@ -1176,9 +1176,7 @@ int sdlog2_thread_main(int argc, char *argv[]) log_msg.body.log_GPSP.nav_cmd = buf.triplet.current.nav_cmd; log_msg.body.log_GPSP.loiter_radius = buf.triplet.current.loiter_radius; log_msg.body.log_GPSP.loiter_direction = buf.triplet.current.loiter_direction; - log_msg.body.log_GPSP.loiter_radius = buf.triplet.current.loiter_radius; - log_msg.body.log_GPSP.loiter_direction = buf.triplet.current.loiter_direction; - log_msg.body.log_GPSP.radius = buf.triplet.current.radius; + log_msg.body.log_GPSP.acceptance_radius = buf.triplet.current.acceptance_radius; log_msg.body.log_GPSP.time_inside = buf.triplet.current.time_inside; log_msg.body.log_GPSP.pitch_min = buf.triplet.current.pitch_min; LOGBUFFER_WRITE_AND_COUNT(GPSP); diff --git a/src/modules/sdlog2/sdlog2_messages.h b/src/modules/sdlog2/sdlog2_messages.h index ff58d23f6..ff3ca1163 100644 --- a/src/modules/sdlog2/sdlog2_messages.h +++ b/src/modules/sdlog2/sdlog2_messages.h @@ -217,7 +217,7 @@ struct log_GPSP_s { uint8_t nav_cmd; float loiter_radius; int8_t loiter_direction; - float radius; + float acceptance_radius; float time_inside; float pitch_min; }; @@ -297,7 +297,7 @@ static const struct log_format_s log_formats[] = { LOG_FORMAT(ARSP, "fff", "RollRateSP,PitchRateSP,YawRateSP"), LOG_FORMAT(FLOW, "hhfffBB", "RawX,RawY,CompX,CompY,Dist,Q,SensID"), LOG_FORMAT(GPOS, "LLffff", "Lat,Lon,Alt,VelN,VelE,VelD"), - LOG_FORMAT(GPSP, "BLLffBfbfff", "AltRel,Lat,Lon,Alt,Yaw,NavCmd,LoitRad,LoitDir,Rad,TimeIn,pitMin"), + LOG_FORMAT(GPSP, "BLLffBfbfff", "AltRel,Lat,Lon,Alt,Yaw,NavCmd,LoitR,LoitDir,AccR,TimeIn,PitMin"), LOG_FORMAT(ESC, "HBBBHHHHHHfH", "Counter,NumESC,Conn,N,Ver,Adr,Volt,Amp,RPM,Temp,SetP,SetPRAW"), LOG_FORMAT(GVSP, "fff", "VX,VY,VZ"), LOG_FORMAT(DIST, "ffB", "Bottom,BottomRate,Flags"), |