From 2d2feccceed7c04c62b72fd423f706fc07d60ab8 Mon Sep 17 00:00:00 2001 From: jgoppert Date: Sat, 7 Nov 2015 11:33:15 -0500 Subject: [PATCH 1/3] Matrix update. --- src/lib/matrix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/lib/matrix b/src/lib/matrix index 222e42f934..ace2751715 160000 --- a/src/lib/matrix +++ b/src/lib/matrix @@ -1 +1 @@ -Subproject commit 222e42f9342e4ab50ea6a14fccc5051b45acd6d6 +Subproject commit ace275171533f527abebcedbfd5dfb8bc0f880a5 From ca5a2d1fcabd841c77b7b678c55be8dbab401fca Mon Sep 17 00:00:00 2001 From: jgoppert Date: Fri, 6 Nov 2015 21:11:27 -0500 Subject: [PATCH 2/3] Fixed some sitl init bugs. --- src/modules/sensors/sensors.cpp | 2 +- src/modules/simulator/simulator_mavlink.cpp | 2 ++ src/platforms/posix/drivers/adcsim/adcsim.cpp | 1 + src/platforms/posix/px4_layer/px4_posix_tasks.cpp | 4 +--- 4 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/modules/sensors/sensors.cpp b/src/modules/sensors/sensors.cpp index cccf9f6b3a..003a45137c 100644 --- a/src/modules/sensors/sensors.cpp +++ b/src/modules/sensors/sensors.cpp @@ -1250,7 +1250,7 @@ Sensors::vehicle_control_mode_poll() void Sensors::parameter_update_poll(bool forced) { - bool param_updated; + bool param_updated=false; /* Check if any parameter has changed */ orb_check(_params_sub, ¶m_updated); diff --git a/src/modules/simulator/simulator_mavlink.cpp b/src/modules/simulator/simulator_mavlink.cpp index f99dd20450..ca45cdf2b8 100644 --- a/src/modules/simulator/simulator_mavlink.cpp +++ b/src/modules/simulator/simulator_mavlink.cpp @@ -463,10 +463,12 @@ void Simulator::pollForMAVLinkMessages(bool publish) char serial_buf[1024]; struct pollfd fds[2]; + memset(fds, 0, sizeof(fds)); unsigned fd_count = 1; fds[0].fd = _fd; fds[0].events = POLLIN; + if (serial_fd >= 0) { fds[1].fd = serial_fd; fds[1].events = POLLIN; diff --git a/src/platforms/posix/drivers/adcsim/adcsim.cpp b/src/platforms/posix/drivers/adcsim/adcsim.cpp index d9f0dd4f15..c72cc1a494 100644 --- a/src/platforms/posix/drivers/adcsim/adcsim.cpp +++ b/src/platforms/posix/drivers/adcsim/adcsim.cpp @@ -111,6 +111,7 @@ private: ADCSIM::ADCSIM(uint32_t channels) : VDev("adcsim", ADCSIM0_DEVICE_PATH), + _call(), _sample_perf(perf_alloc(PC_ELAPSED, "adc_samples")), _channel_count(0), _samples(nullptr) diff --git a/src/platforms/posix/px4_layer/px4_posix_tasks.cpp b/src/platforms/posix/px4_layer/px4_posix_tasks.cpp index ba476b5070..41cade1d5d 100644 --- a/src/platforms/posix/px4_layer/px4_posix_tasks.cpp +++ b/src/platforms/posix/px4_layer/px4_posix_tasks.cpp @@ -81,9 +81,7 @@ typedef struct { static void *entry_adapter(void *ptr) { - pthdata_t *data; - data = (pthdata_t *) ptr; - + pthdata_t *data = (pthdata_t *) ptr; data->entry(data->argc, data->argv); free(ptr); PX4_DEBUG("Before px4_task_exit"); From 68e4b33167f7bf6406ff68e7c6091e4834f337fe Mon Sep 17 00:00:00 2001 From: jgoppert Date: Fri, 6 Nov 2015 21:11:54 -0500 Subject: [PATCH 3/3] Added valgrind to sitl. --- Tools/sitl_run.sh | 6 ++++++ src/firmware/posix/CMakeLists.txt | 2 +- src/modules/sensors/sensors.cpp | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/Tools/sitl_run.sh b/Tools/sitl_run.sh index 521ebeef21..b4617e40cf 100755 --- a/Tools/sitl_run.sh +++ b/Tools/sitl_run.sh @@ -83,6 +83,12 @@ then elif [ "$debugger" == "gdb" ] then gdb --args mainapp ../../../../${rc_script}_${program} +elif [ "$debugger" == "ddd" ] +then + ddd --debugger gdb --args mainapp ../../../../${rc_script}_${program} +elif [ "$debugger" == "valgrind" ] +then + valgrind ./mainapp ../../../../${rc_script}_${program} else ./mainapp ../../../../${rc_script}_${program} fi diff --git a/src/firmware/posix/CMakeLists.txt b/src/firmware/posix/CMakeLists.txt index 64f4775c33..fb7490ffe2 100644 --- a/src/firmware/posix/CMakeLists.txt +++ b/src/firmware/posix/CMakeLists.txt @@ -33,7 +33,7 @@ add_custom_target(run_config add_dependencies(run_config mainapp) foreach(viewer none jmavsim gazebo) - foreach(debugger none gdb lldb) + foreach(debugger none gdb lldb ddd valgrind) foreach(model none iris vtol) if (debugger STREQUAL "none") if (model STREQUAL "none") diff --git a/src/modules/sensors/sensors.cpp b/src/modules/sensors/sensors.cpp index 003a45137c..a349a78ea0 100644 --- a/src/modules/sensors/sensors.cpp +++ b/src/modules/sensors/sensors.cpp @@ -1250,7 +1250,7 @@ Sensors::vehicle_control_mode_poll() void Sensors::parameter_update_poll(bool forced) { - bool param_updated=false; + bool param_updated = false; /* Check if any parameter has changed */ orb_check(_params_sub, ¶m_updated);