aboutsummaryrefslogtreecommitdiff
path: root/src/modules/sdlog2/sdlog2.c
diff options
context:
space:
mode:
authorJulian Oes <julian@oes.ch>2013-06-16 14:59:00 +0200
committerJulian Oes <julian@oes.ch>2013-06-16 14:59:00 +0200
commitbd7f86bb6adf768169fe23b63d627a252586f6b7 (patch)
tree53c4db34057e2d76f57fca0640b7f74faaf22245 /src/modules/sdlog2/sdlog2.c
parentb52d561b11298abb2982b786676f49eea96259d8 (diff)
downloadpx4-firmware-bd7f86bb6adf768169fe23b63d627a252586f6b7.tar.gz
px4-firmware-bd7f86bb6adf768169fe23b63d627a252586f6b7.tar.bz2
px4-firmware-bd7f86bb6adf768169fe23b63d627a252586f6b7.zip
Tried to add ctrl debug values to sdlog2 (WIP)
Diffstat (limited to 'src/modules/sdlog2/sdlog2.c')
-rw-r--r--src/modules/sdlog2/sdlog2.c24
1 files changed, 14 insertions, 10 deletions
diff --git a/src/modules/sdlog2/sdlog2.c b/src/modules/sdlog2/sdlog2.c
index 844e02268..a86623304 100644
--- a/src/modules/sdlog2/sdlog2.c
+++ b/src/modules/sdlog2/sdlog2.c
@@ -91,6 +91,7 @@
#define LOGBUFFER_WRITE_AND_COUNT(_msg) if (logbuffer_write(&lb, &log_msg, LOG_PACKET_SIZE(_msg))) { \
log_msgs_written++; \
+ printf("size: %d\n", LOG_PACKET_SIZE(_msg)); \
} else { \
log_msgs_skipped++; \
/*printf("skip\n");*/ \
@@ -1071,25 +1072,28 @@ int sdlog2_thread_main(int argc, char *argv[])
/* --- CONTROL DEBUG --- */
if (fds[ifds++].revents & POLLIN) {
orb_copy(ORB_ID(vehicle_control_debug), subs.control_debug_sub, &buf.control_debug);
-
- log_msg.body.log_CTRL.roll_p = buf.control_debug.roll_p;
- log_msg.body.log_CTRL.roll_i = buf.control_debug.roll_i;
- log_msg.body.log_CTRL.roll_d = buf.control_debug.roll_d;
+ printf("copied control debug\n");
+
+ // log_msg.body.log_CTRL.roll_p = buf.control_debug.roll_p;
+ // log_msg.body.log_CTRL.roll_i = buf.control_debug.roll_i;
+ // log_msg.body.log_CTRL.roll_d = buf.control_debug.roll_d;
log_msg.body.log_CTRL.roll_rate_p = buf.control_debug.roll_rate_p;
log_msg.body.log_CTRL.roll_rate_i = buf.control_debug.roll_rate_i;
log_msg.body.log_CTRL.roll_rate_d = buf.control_debug.roll_rate_d;
- log_msg.body.log_CTRL.pitch_p = buf.control_debug.pitch_p;
- log_msg.body.log_CTRL.pitch_i = buf.control_debug.pitch_i;
- log_msg.body.log_CTRL.pitch_d = buf.control_debug.pitch_d;
+ // log_msg.body.log_CTRL.pitch_p = buf.control_debug.pitch_p;
+ // log_msg.body.log_CTRL.pitch_i = buf.control_debug.pitch_i;
+ // log_msg.body.log_CTRL.pitch_d = buf.control_debug.pitch_d;
log_msg.body.log_CTRL.pitch_rate_p = buf.control_debug.pitch_rate_p;
log_msg.body.log_CTRL.pitch_rate_i = buf.control_debug.pitch_rate_i;
log_msg.body.log_CTRL.pitch_rate_d = buf.control_debug.pitch_rate_d;
- log_msg.body.log_CTRL.yaw_p = buf.control_debug.yaw_p;
- log_msg.body.log_CTRL.yaw_i = buf.control_debug.yaw_i;
- log_msg.body.log_CTRL.yaw_d = buf.control_debug.yaw_d;
+ // log_msg.body.log_CTRL.yaw_p = buf.control_debug.yaw_p;
+ // log_msg.body.log_CTRL.yaw_i = buf.control_debug.yaw_i;
+ // log_msg.body.log_CTRL.yaw_d = buf.control_debug.yaw_d;
log_msg.body.log_CTRL.yaw_rate_p = buf.control_debug.yaw_rate_p;
log_msg.body.log_CTRL.yaw_rate_i = buf.control_debug.yaw_rate_i;
log_msg.body.log_CTRL.yaw_rate_d = buf.control_debug.yaw_rate_d;
+
+ LOGBUFFER_WRITE_AND_COUNT(CTRL);
}
/* --- FLOW --- */