dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity

sdlog2: Compile fixes for system power logging

This commit is contained in:
Lorenz Meier 2014-04-05 13:03:52 +02:00
parent 03c80deb96
commit 06d5c6ad28
2 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/modules/sdlog2/sdlog2.c
View File

@ -84,6 +84,8 @@
#include <uORB/topics/esc_status.h>
#include <uORB/topics/telemetry_status.h>
#include <uORB/topics/estimator_status.h>
#include <uORB/topics/system_power.h>
#include <uORB/topics/servorail_status.h>
#include <systemlib/systemlib.h>
#include <systemlib/param/param.h>
@ -1236,7 +1238,7 @@ int sdlog2_thread_main(int argc, char *argv[])
/* --- SYSTEM POWER RAILS --- */
if (copy_if_updated(ORB_ID(system_power), subs.system_power_sub, &buf.system_power)) {
log_msg.msg_type = LOG_PWR_MSG;
log_msg.body.log_PWR.5v_peripherals = buf.system_power.voltage_5V_v;
log_msg.body.log_PWR.peripherals_5v = buf.system_power.voltage5V_v;
log_msg.body.log_PWR.usb_ok = buf.system_power.usb_connected;
log_msg.body.log_PWR.brick_ok = buf.system_power.brick_valid;
log_msg.body.log_PWR.servo_ok = buf.system_power.servo_valid;
@ -1245,8 +1247,8 @@ int sdlog2_thread_main(int argc, char *argv[])
/* copy servo rail status topic here too */
orb_copy(ORB_ID(servorail_status), subs.servorail_status_sub, &buf.servorail_status);
log_msg.body.log_PWR.5v_servo_rail = buf.servorail_status.voltage_v;
log_msg.body.log_PWR.5v_servo_rssi = buf.servorail_status.rssi_v;
log_msg.body.log_PWR.servo_rail_5v = buf.servorail_status.voltage_v;
log_msg.body.log_PWR.servo_rssi_5v = buf.servorail_status.rssi_v;
LOGBUFFER_WRITE_AND_COUNT(PWR);
}

8
src/modules/sdlog2/sdlog2_messages.h
View File

@ -319,9 +319,9 @@ struct log_ESTM_s {
/* --- PWR - ONBOARD POWER SYSTEM --- */
#define LOG_PWR_MSG 133
struct log_PWR_s {
float 5v_peripherals;
float 5v_servo_rail;
float 5v_servo_rssi;
float peripherals_5v;
float servo_rail_5v;
float servo_rssi_5v;
uint8_t usb_ok;
uint8_t brick_ok;
uint8_t servo_ok;
@ -362,7 +362,7 @@ static const struct log_format_s log_formats[] = {
LOG_FORMAT(VER, "NZ", "Arch,FwGit"),
LOG_FORMAT(PARM, "Nf", "Name,Value"),
LOG_FORMAT(ESTM, "ffffffffffBBBB", "s0,s1,s2,s3,s4,s5,s6,s7,s8,s9,n_states,states_nan,cov_nan,kgain_nan"),
LOG_FORMAT(PWR, "fffBBBBB", "5V_PERIPH, 5V_SRV,USB_OK,BRICK_OK,SRV_OK,PERIPH_OC,HIPWR_OC");
LOG_FORMAT(PWR, "fffBBBBB", "5V_PERIPH, 5V_SRV,USB_OK,BRICK_OK,SRV_OK,PERIPH_OC,HIPWR_OC"),
//LOG_FORMAT(ESTM, "ffffffffffffffffffffffffffffffffBBBB", "s0,s1,s2,s3,s4,s5,s6,s7,s8,s9,s10,s11,s12,s13,s14,s15,s16,s17,s18,s19,s20,s21,s22,s23,s24,s25,s26,s27,s28,s29,s30,s31,n_states,states_nan,cov_nan,kgain_nan"),
};