diff options
| author | Anton Babushkin <anton.babushkin@me.com> | 2013-12-25 13:16:10 +0400 |
|---|---|---|
| committer | Anton Babushkin <anton.babushkin@me.com> | 2013-12-25 13:16:10 +0400 |
| commit | 69218d2bd58a12a2ce89066a5e6a9e8682529cd5 (patch) | |
| tree | e255b3c3efb5d2ff5dba264c0f30066efc1d3299 | |
| parent | bbeb97df6737f89291db4bb97ebf4c821edd9114 (diff) | |
| parent | 107bb54b33dd4360fd5fee538f7a87b79279b8ab (diff) | |
| download | px4-firmware-69218d2bd58a12a2ce89066a5e6a9e8682529cd5.tar.gz px4-firmware-69218d2bd58a12a2ce89066a5e6a9e8682529cd5.tar.bz2 px4-firmware-69218d2bd58a12a2ce89066a5e6a9e8682529cd5.zip | |
Merge branch 'master' into mathlib_new
| -rw-r--r-- | ROMFS/px4fmu_logging/logging/conv.zip | bin | 0 -> 10087 bytes | |||
| -rw-r--r-- | src/drivers/stm32/drv_hrt.c | 2 | ||||
| -rw-r--r-- | src/modules/sdlog2/sdlog2.c | 1 | ||||
| -rw-r--r-- | src/modules/sdlog2/sdlog2_messages.h | 3 |
4 files changed, 4 insertions, 2 deletions
diff --git a/ROMFS/px4fmu_logging/logging/conv.zip b/ROMFS/px4fmu_logging/logging/conv.zip Binary files differnew file mode 100644 index 000000000..7cb837e56 --- /dev/null +++ b/ROMFS/px4fmu_logging/logging/conv.zip diff --git a/src/drivers/stm32/drv_hrt.c b/src/drivers/stm32/drv_hrt.c index 36226c941..f105251f0 100644 --- a/src/drivers/stm32/drv_hrt.c +++ b/src/drivers/stm32/drv_hrt.c @@ -342,7 +342,7 @@ static void hrt_call_invoke(void); #define PPM_MAX_CHANNELS 20 /* Number of same-sized frames required to 'lock' */ -#define PPM_CHANNEL_LOCK 2 /* should be less than the input timeout */ +#define PPM_CHANNEL_LOCK 4 /* should be less than the input timeout */ __EXPORT uint16_t ppm_buffer[PPM_MAX_CHANNELS]; __EXPORT unsigned ppm_decoded_channels = 0; diff --git a/src/modules/sdlog2/sdlog2.c b/src/modules/sdlog2/sdlog2.c index 2adb13f5c..e94b1e13c 100644 --- a/src/modules/sdlog2/sdlog2.c +++ b/src/modules/sdlog2/sdlog2.c @@ -1193,6 +1193,7 @@ int sdlog2_thread_main(int argc, char *argv[]) log_msg.msg_type = LOG_RC_MSG; /* Copy only the first 8 channels of 14 */ memcpy(log_msg.body.log_RC.channel, buf.rc.chan, sizeof(log_msg.body.log_RC.channel)); + log_msg.body.log_RC.channel_count = buf.rc.chan_count; LOGBUFFER_WRITE_AND_COUNT(RC); } diff --git a/src/modules/sdlog2/sdlog2_messages.h b/src/modules/sdlog2/sdlog2_messages.h index 90093a407..ab4dc9b00 100644 --- a/src/modules/sdlog2/sdlog2_messages.h +++ b/src/modules/sdlog2/sdlog2_messages.h @@ -159,6 +159,7 @@ struct log_STAT_s { #define LOG_RC_MSG 11 struct log_RC_s { float channel[8]; + uint8_t channel_count; }; /* --- OUT0 - ACTUATOR_0 OUTPUT --- */ @@ -281,7 +282,7 @@ static const struct log_format_s log_formats[] = { LOG_FORMAT(GPS, "QBffLLfffff", "GPSTime,FixType,EPH,EPV,Lat,Lon,Alt,VelN,VelE,VelD,Cog"), LOG_FORMAT(ATTC, "ffff", "Roll,Pitch,Yaw,Thrust"), LOG_FORMAT(STAT, "BBBfffBB", "MainState,NavState,ArmState,BatV,BatC,BatRem,BatWarn,Landed"), - LOG_FORMAT(RC, "ffffffff", "Ch0,Ch1,Ch2,Ch3,Ch4,Ch5,Ch6,Ch7"), + LOG_FORMAT(RC, "ffffffffB", "Ch0,Ch1,Ch2,Ch3,Ch4,Ch5,Ch6,Ch7,Count"), LOG_FORMAT(OUT0, "ffffffff", "Out0,Out1,Out2,Out3,Out4,Out5,Out6,Out7"), LOG_FORMAT(AIRS, "ff", "IndSpeed,TrueSpeed"), LOG_FORMAT(ARSP, "fff", "RollRateSP,PitchRateSP,YawRateSP"), |