aboutsummaryrefslogtreecommitdiff
path: root/apps/sdlog/sdlog.c
diff options
context:
space:
mode:
authorSimon Wilks <sjwilks@gmail.com>2013-04-19 18:28:06 +0200
committerSimon Wilks <sjwilks@gmail.com>2013-04-19 18:28:06 +0200
commit696e48fbf38de9d0ac12494cb2749ba3b04f852f (patch)
tree1ba465b2c55dd7bcd2f22172addd42cef734f94d /apps/sdlog/sdlog.c
parentdf6976c8d640b395220d46f5b1fd7ecfc8ae3e04 (diff)
downloadpx4-firmware-696e48fbf38de9d0ac12494cb2749ba3b04f852f.tar.gz
px4-firmware-696e48fbf38de9d0ac12494cb2749ba3b04f852f.tar.bz2
px4-firmware-696e48fbf38de9d0ac12494cb2749ba3b04f852f.zip
Cleanup variable names and such
Diffstat (limited to 'apps/sdlog/sdlog.c')
-rw-r--r--apps/sdlog/sdlog.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/apps/sdlog/sdlog.c b/apps/sdlog/sdlog.c
index 46b232c34..84a9eb6ac 100644
--- a/apps/sdlog/sdlog.c
+++ b/apps/sdlog/sdlog.c
@@ -444,7 +444,7 @@ int sdlog_thread_main(int argc, char *argv[])
struct vehicle_vicon_position_s vicon_pos;
struct optical_flow_s flow;
struct battery_status_s batt;
- struct differential_pressure_s diff_pressure;
+ struct differential_pressure_s diff_pres;
struct airspeed_s airspeed;
} buf;
memset(&buf, 0, sizeof(buf));
@@ -463,7 +463,7 @@ int sdlog_thread_main(int argc, char *argv[])
int vicon_pos_sub;
int flow_sub;
int batt_sub;
- int diff_pressure_sub;
+ int diff_pres_sub;
int airspeed_sub;
} subs;
@@ -561,8 +561,8 @@ int sdlog_thread_main(int argc, char *argv[])
/* --- DIFFERENTIAL PRESSURE --- */
/* subscribe to ORB for flow measurements */
- subs.diff_pressure_sub = orb_subscribe(ORB_ID(differential_pressure));
- fds[fdsc_count].fd = subs.diff_pressure_sub;
+ subs.diff_pres_sub = orb_subscribe(ORB_ID(differential_pressure));
+ fds[fdsc_count].fd = subs.diff_pres_sub;
fds[fdsc_count].events = POLLIN;
fdsc_count++;
@@ -664,7 +664,7 @@ int sdlog_thread_main(int argc, char *argv[])
orb_copy(ORB_ID(vehicle_attitude), subs.att_sub, &buf.att);
orb_copy(ORB_ID(vehicle_vicon_position), subs.vicon_pos_sub, &buf.vicon_pos);
orb_copy(ORB_ID(optical_flow), subs.flow_sub, &buf.flow);
- orb_copy(ORB_ID(differential_pressure), subs.diff_pressure_sub, &buf.diff_pressure);
+ orb_copy(ORB_ID(differential_pressure), subs.diff_pres_sub, &buf.diff_pres);
orb_copy(ORB_ID(airspeed), subs.airspeed_sub, &buf.airspeed);
orb_copy(ORB_ID(battery_status), subs.batt_sub, &buf.batt);
@@ -702,7 +702,7 @@ int sdlog_thread_main(int argc, char *argv[])
.vicon = {buf.vicon_pos.x, buf.vicon_pos.y, buf.vicon_pos.z, buf.vicon_pos.roll, buf.vicon_pos.pitch, buf.vicon_pos.yaw},
.control_effective = {buf.act_controls_effective.control_effective[0], buf.act_controls_effective.control_effective[1], buf.act_controls_effective.control_effective[2], buf.act_controls_effective.control_effective[3]},
.flow = {buf.flow.flow_raw_x, buf.flow.flow_raw_y, buf.flow.flow_comp_x_m, buf.flow.flow_comp_y_m, buf.flow.ground_distance_m, buf.flow.quality},
- .diff_pressure = buf.diff_pressure.differential_pressure_pa,
+ .diff_pressure = buf.diff_pres.differential_pressure_pa,
.ind_airspeed = buf.airspeed.indicated_airspeed_m_s,
.true_airspeed = buf.airspeed.true_airspeed_m_s
};