fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-18 04:03:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

fixed rebasing issues

Browse Source
This commit is contained in:
Roman
2016-03-13 17:47:56 +01:00
committed by Lorenz Meier
parent 01ee608117
commit 5abd11c6b9
2 changed files with 0 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/sdlog2/sdlog2.c
-1
View File
@@ -1859,7 +1859,6 @@ int sdlog2_thread_main(int argc, char *argv[])
log_msg.body.log_AIRS.air_temperature_celsius = buf.airspeed.air_temperature_celsius;
LOGBUFFER_WRITE_AND_COUNT(AIRS);
}
<<<<<<< HEAD
/* --- ESCs --- */
if (copy_if_updated(ORB_ID(esc_status), &subs.esc_sub, &buf.esc)) {