From c44e9f18476be59432a6218693aecb1dfccf5355 Mon Sep 17 00:00:00 2001 From: Roman Dvorak Date: Tue, 31 Mar 2020 03:01:58 +0200 Subject: [PATCH 01/16] Prepare simple RPM simulator --- boards/px4/sitl/default.cmake | 1 + src/drivers/rpm/rpm_simulator/CMakeLists.txt | 39 ++++++++++ src/drivers/rpm/rpm_simulator/rpm_simulator.c | 75 +++++++++++++++++++ 3 files changed, 115 insertions(+) create mode 100644 src/drivers/rpm/rpm_simulator/CMakeLists.txt create mode 100644 src/drivers/rpm/rpm_simulator/rpm_simulator.c diff --git a/boards/px4/sitl/default.cmake b/boards/px4/sitl/default.cmake index d93074c592e1..43ea33888c15 100644 --- a/boards/px4/sitl/default.cmake +++ b/boards/px4/sitl/default.cmake @@ -16,6 +16,7 @@ px4_add_board( #imu # all available imu drivers #magnetometer # all available magnetometer drivers pwm_out_sim + rpm/rpm_simulator #telemetry # all available telemetry drivers tone_alarm #uavcan diff --git a/src/drivers/rpm/rpm_simulator/CMakeLists.txt b/src/drivers/rpm/rpm_simulator/CMakeLists.txt new file mode 100644 index 000000000000..88a321203aa3 --- /dev/null +++ b/src/drivers/rpm/rpm_simulator/CMakeLists.txt @@ -0,0 +1,39 @@ +############################################################################ +# +# Copyright (c) 2015 PX4 Development Team. All rights reserved. +# +# Redistribution and use in source and binary forms, with or without +# modification, are permitted provided that the following conditions +# are met: +# +# 1. Redistributions of source code must retain the above copyright +# notice, this list of conditions and the following disclaimer. +# 2. Redistributions in binary form must reproduce the above copyright +# notice, this list of conditions and the following disclaimer in +# the documentation and/or other materials provided with the +# distribution. +# 3. Neither the name PX4 nor the names of its contributors may be +# used to endorse or promote products derived from this software +# without specific prior written permission. +# +# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS +# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT +# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS +# FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE +# COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, +# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, +# BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS +# OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED +# AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT +# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN +# ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE +# POSSIBILITY OF SUCH DAMAGE. +# +############################################################################ +px4_add_module( + MODULE examples__rpm_simulator + MAIN rpm_simulator + SRCS + rpm_simulator.c + DEPENDS + ) diff --git a/src/drivers/rpm/rpm_simulator/rpm_simulator.c b/src/drivers/rpm/rpm_simulator/rpm_simulator.c new file mode 100644 index 000000000000..1298dee2b5cf --- /dev/null +++ b/src/drivers/rpm/rpm_simulator/rpm_simulator.c @@ -0,0 +1,75 @@ +/**************************************************************************** + * + * Copyright (c) 2012-2020 PX4 Development Team. All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in + * the documentation and/or other materials provided with the + * distribution. + * 3. Neither the name PX4 nor the names of its contributors may be + * used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + * "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + * LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS + * FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE + * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, + * INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, + * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS + * OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED + * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN + * ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE + * POSSIBILITY OF SUCH DAMAGE. + * + ****************************************************************************/ + +/** + * @file rpm_simulator.c + * This simple app produces RPM message. + * Usage: rpm_simulator 10 + * + * @author Roman Dvorak + */ + +#include +#include +#include +#include +#include +#include +#include +#include + +#include +#include +#include + +__EXPORT int rpm_simulator_main(int argc, char *argv[]); + +int rpm_simulator_main(int argc, char *argv[]) +{ + struct rpm_s rpm; + memset(&rpm, 0, sizeof(rpm)); + orb_advert_t rpm_pub = orb_advertise(ORB_ID(rpm), &rpm); + + uint64_t timestamp_us = hrt_absolute_time(); + float frequency = atof(argv[1]); + + rpm.timestamp = timestamp_us; + rpm.indicated_frequency_rpm = frequency; + rpm.estimated_accurancy_rpm = frequency/100.0f; + + orb_publish(ORB_ID(rpm), rpm_pub, &rpm); + + PX4_INFO("RPM message with %f RPM was published", (double)frequency); + + return 0; +} From e20c6a27caabbc886e185e95583087779c280666 Mon Sep 17 00:00:00 2001 From: Roman Dvorak Date: Tue, 31 Mar 2020 12:32:30 +0200 Subject: [PATCH 02/16] Input check --- src/drivers/rpm/rpm_simulator/rpm_simulator.c | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/drivers/rpm/rpm_simulator/rpm_simulator.c b/src/drivers/rpm/rpm_simulator/rpm_simulator.c index 1298dee2b5cf..eda036aa1464 100644 --- a/src/drivers/rpm/rpm_simulator/rpm_simulator.c +++ b/src/drivers/rpm/rpm_simulator/rpm_simulator.c @@ -56,6 +56,13 @@ __EXPORT int rpm_simulator_main(int argc, char *argv[]); int rpm_simulator_main(int argc, char *argv[]) { + + if(argc != 2){ + PX4_INFO("Usage: rpm_simulator "); + PX4_INFO("Exit. Without publishing any message."); + return 0; + } + struct rpm_s rpm; memset(&rpm, 0, sizeof(rpm)); orb_advert_t rpm_pub = orb_advertise(ORB_ID(rpm), &rpm); @@ -69,7 +76,7 @@ int rpm_simulator_main(int argc, char *argv[]) orb_publish(ORB_ID(rpm), rpm_pub, &rpm); - PX4_INFO("RPM message with %f RPM was published", (double)frequency); + PX4_INFO("RPM message with RPM=%.3f was published", (double)frequency); return 0; } From f1ace78a67a697079569d22e16ebcc4306732d66 Mon Sep 17 00:00:00 2001 From: Roman Dvorak Date: Tue, 31 Mar 2020 12:36:01 +0200 Subject: [PATCH 03/16] Update description --- src/drivers/rpm/rpm_simulator/rpm_simulator.c | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/src/drivers/rpm/rpm_simulator/rpm_simulator.c b/src/drivers/rpm/rpm_simulator/rpm_simulator.c index eda036aa1464..f184b6a05abb 100644 --- a/src/drivers/rpm/rpm_simulator/rpm_simulator.c +++ b/src/drivers/rpm/rpm_simulator/rpm_simulator.c @@ -33,10 +33,12 @@ /** * @file rpm_simulator.c - * This simple app produces RPM message. - * Usage: rpm_simulator 10 + * Simple app for publishing RPM messages with custom value. * - * @author Roman Dvorak + * Usage: rpm_simulator + * rpm_simulator 344.2 + * + * @author thunderFly s.r.o., Roman Dvorak */ #include @@ -57,6 +59,7 @@ __EXPORT int rpm_simulator_main(int argc, char *argv[]); int rpm_simulator_main(int argc, char *argv[]) { + // check input if(argc != 2){ PX4_INFO("Usage: rpm_simulator "); PX4_INFO("Exit. Without publishing any message."); @@ -70,12 +73,13 @@ int rpm_simulator_main(int argc, char *argv[]) uint64_t timestamp_us = hrt_absolute_time(); float frequency = atof(argv[1]); + // prpepare RPM data message rpm.timestamp = timestamp_us; rpm.indicated_frequency_rpm = frequency; rpm.estimated_accurancy_rpm = frequency/100.0f; + // publish data orb_publish(ORB_ID(rpm), rpm_pub, &rpm); - PX4_INFO("RPM message with RPM=%.3f was published", (double)frequency); return 0; From acf5a0cfeb0b604e8f6482ce0392a0e4c67368df Mon Sep 17 00:00:00 2001 From: Roman Dvorak Date: Tue, 31 Mar 2020 12:44:33 +0200 Subject: [PATCH 04/16] fix typo --- src/drivers/rpm/rpm_simulator/rpm_simulator.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/drivers/rpm/rpm_simulator/rpm_simulator.c b/src/drivers/rpm/rpm_simulator/rpm_simulator.c index f184b6a05abb..69d24c1383cc 100644 --- a/src/drivers/rpm/rpm_simulator/rpm_simulator.c +++ b/src/drivers/rpm/rpm_simulator/rpm_simulator.c @@ -36,7 +36,7 @@ * Simple app for publishing RPM messages with custom value. * * Usage: rpm_simulator - * rpm_simulator 344.2 + * rpm_simulator 344.2 * * @author thunderFly s.r.o., Roman Dvorak */ @@ -61,7 +61,7 @@ int rpm_simulator_main(int argc, char *argv[]) // check input if(argc != 2){ - PX4_INFO("Usage: rpm_simulator "); + PX4_INFO("Usage: rpm_simulator "); PX4_INFO("Exit. Without publishing any message."); return 0; } From cf8c42864bdab961d882d35772cd47c178539f4d Mon Sep 17 00:00:00 2001 From: Roman Dvorak Date: Tue, 31 Mar 2020 12:56:31 +0200 Subject: [PATCH 05/16] fix format --- src/drivers/rpm/rpm_simulator/rpm_simulator.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/src/drivers/rpm/rpm_simulator/rpm_simulator.c b/src/drivers/rpm/rpm_simulator/rpm_simulator.c index 69d24c1383cc..3d92a7e3be1e 100644 --- a/src/drivers/rpm/rpm_simulator/rpm_simulator.c +++ b/src/drivers/rpm/rpm_simulator/rpm_simulator.c @@ -60,26 +60,32 @@ int rpm_simulator_main(int argc, char *argv[]) { // check input - if(argc != 2){ + if (argc != 2) { PX4_INFO("Usage: rpm_simulator "); PX4_INFO("Exit. Without publishing any message."); return 0; } struct rpm_s rpm; + memset(&rpm, 0, sizeof(rpm)); + orb_advert_t rpm_pub = orb_advertise(ORB_ID(rpm), &rpm); uint64_t timestamp_us = hrt_absolute_time(); + float frequency = atof(argv[1]); // prpepare RPM data message rpm.timestamp = timestamp_us; + rpm.indicated_frequency_rpm = frequency; - rpm.estimated_accurancy_rpm = frequency/100.0f; + + rpm.estimated_accurancy_rpm = frequency / 100.0f; // publish data orb_publish(ORB_ID(rpm), rpm_pub, &rpm); + PX4_INFO("RPM message with RPM=%.3f was published", (double)frequency); return 0; From a59070488f69954659907ef2819a67bf4cf40c11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roman=20Dvo=C5=99=C3=A1k?= Date: Thu, 2 Apr 2020 03:01:05 +0200 Subject: [PATCH 06/16] Update src/drivers/rpm/rpm_simulator/rpm_simulator.c Co-Authored-By: Daniel Agar --- src/drivers/rpm/rpm_simulator/rpm_simulator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/drivers/rpm/rpm_simulator/rpm_simulator.c b/src/drivers/rpm/rpm_simulator/rpm_simulator.c index 3d92a7e3be1e..149f9656e80a 100644 --- a/src/drivers/rpm/rpm_simulator/rpm_simulator.c +++ b/src/drivers/rpm/rpm_simulator/rpm_simulator.c @@ -66,7 +66,7 @@ int rpm_simulator_main(int argc, char *argv[]) return 0; } - struct rpm_s rpm; + rpm_s rpm{}; memset(&rpm, 0, sizeof(rpm)); From 83061c0be246ed03e210d19da46405e5711fbbf6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roman=20Dvo=C5=99=C3=A1k?= Date: Thu, 2 Apr 2020 03:01:21 +0200 Subject: [PATCH 07/16] Update src/drivers/rpm/rpm_simulator/rpm_simulator.c Co-Authored-By: Daniel Agar --- src/drivers/rpm/rpm_simulator/rpm_simulator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/drivers/rpm/rpm_simulator/rpm_simulator.c b/src/drivers/rpm/rpm_simulator/rpm_simulator.c index 149f9656e80a..f219ba590cf5 100644 --- a/src/drivers/rpm/rpm_simulator/rpm_simulator.c +++ b/src/drivers/rpm/rpm_simulator/rpm_simulator.c @@ -70,7 +70,7 @@ int rpm_simulator_main(int argc, char *argv[]) memset(&rpm, 0, sizeof(rpm)); - orb_advert_t rpm_pub = orb_advertise(ORB_ID(rpm), &rpm); + uORB::Publication rpm_pub{ORB_ID(rpm)}; uint64_t timestamp_us = hrt_absolute_time(); From 32ecf365ae0cb55a8b9af8038acd3f6ff6013ec8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roman=20Dvo=C5=99=C3=A1k?= Date: Thu, 2 Apr 2020 03:01:28 +0200 Subject: [PATCH 08/16] Update src/drivers/rpm/rpm_simulator/rpm_simulator.c Co-Authored-By: Daniel Agar --- src/drivers/rpm/rpm_simulator/rpm_simulator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/drivers/rpm/rpm_simulator/rpm_simulator.c b/src/drivers/rpm/rpm_simulator/rpm_simulator.c index f219ba590cf5..7b3bc7aa3e18 100644 --- a/src/drivers/rpm/rpm_simulator/rpm_simulator.c +++ b/src/drivers/rpm/rpm_simulator/rpm_simulator.c @@ -84,7 +84,7 @@ int rpm_simulator_main(int argc, char *argv[]) rpm.estimated_accurancy_rpm = frequency / 100.0f; // publish data - orb_publish(ORB_ID(rpm), rpm_pub, &rpm); + rpm_pub.publish(rpm); PX4_INFO("RPM message with RPM=%.3f was published", (double)frequency); From bd40243f49652b1a62880c913736456804ae7cf8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roman=20Dvo=C5=99=C3=A1k?= Date: Thu, 2 Apr 2020 03:01:35 +0200 Subject: [PATCH 09/16] Update src/drivers/rpm/rpm_simulator/rpm_simulator.c Co-Authored-By: Daniel Agar --- src/drivers/rpm/rpm_simulator/rpm_simulator.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/drivers/rpm/rpm_simulator/rpm_simulator.c b/src/drivers/rpm/rpm_simulator/rpm_simulator.c index 7b3bc7aa3e18..863ec54aaa25 100644 --- a/src/drivers/rpm/rpm_simulator/rpm_simulator.c +++ b/src/drivers/rpm/rpm_simulator/rpm_simulator.c @@ -1,6 +1,6 @@ /**************************************************************************** * - * Copyright (c) 2012-2020 PX4 Development Team. All rights reserved. + * Copyright (c) 2020 PX4 Development Team. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions From 0f3b4fd87288d6c8617dfb2a169a4d34ab0d86d6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roman=20Dvo=C5=99=C3=A1k?= Date: Thu, 2 Apr 2020 03:01:42 +0200 Subject: [PATCH 10/16] Update src/drivers/rpm/rpm_simulator/CMakeLists.txt Co-Authored-By: Daniel Agar --- src/drivers/rpm/rpm_simulator/CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/drivers/rpm/rpm_simulator/CMakeLists.txt b/src/drivers/rpm/rpm_simulator/CMakeLists.txt index 88a321203aa3..c14523f01f3c 100644 --- a/src/drivers/rpm/rpm_simulator/CMakeLists.txt +++ b/src/drivers/rpm/rpm_simulator/CMakeLists.txt @@ -1,6 +1,6 @@ ############################################################################ # -# Copyright (c) 2015 PX4 Development Team. All rights reserved. +# Copyright (c) 2020 PX4 Development Team. All rights reserved. # # Redistribution and use in source and binary forms, with or without # modification, are permitted provided that the following conditions From 8674ad9a972e57219c2bc4f5550aa6ad3b2186ce Mon Sep 17 00:00:00 2001 From: Roman Dvorak Date: Thu, 2 Apr 2020 03:45:21 +0200 Subject: [PATCH 11/16] fix PR issues --- src/drivers/rpm/rpm_simulator/CMakeLists.txt | 2 +- .../{rpm_simulator.c => rpm_simulator.cpp} | 29 +++++-------------- 2 files changed, 9 insertions(+), 22 deletions(-) rename src/drivers/rpm/rpm_simulator/{rpm_simulator.c => rpm_simulator.cpp} (85%) diff --git a/src/drivers/rpm/rpm_simulator/CMakeLists.txt b/src/drivers/rpm/rpm_simulator/CMakeLists.txt index c14523f01f3c..0cf7ad37dbd4 100644 --- a/src/drivers/rpm/rpm_simulator/CMakeLists.txt +++ b/src/drivers/rpm/rpm_simulator/CMakeLists.txt @@ -34,6 +34,6 @@ px4_add_module( MODULE examples__rpm_simulator MAIN rpm_simulator SRCS - rpm_simulator.c + rpm_simulator.cpp DEPENDS ) diff --git a/src/drivers/rpm/rpm_simulator/rpm_simulator.c b/src/drivers/rpm/rpm_simulator/rpm_simulator.cpp similarity index 85% rename from src/drivers/rpm/rpm_simulator/rpm_simulator.c rename to src/drivers/rpm/rpm_simulator/rpm_simulator.cpp index 863ec54aaa25..e5f51f26028c 100644 --- a/src/drivers/rpm/rpm_simulator/rpm_simulator.c +++ b/src/drivers/rpm/rpm_simulator/rpm_simulator.cpp @@ -1,6 +1,7 @@ /**************************************************************************** * * Copyright (c) 2020 PX4 Development Team. All rights reserved. + * Copyright (c) 2020 ThunderFly s.r.o. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions @@ -36,26 +37,18 @@ * Simple app for publishing RPM messages with custom value. * * Usage: rpm_simulator - * rpm_simulator 344.2 + * rpm_simulator 344.2 * - * @author thunderFly s.r.o., Roman Dvorak + * @author ThunderFly s.r.o., Roman Dvorak */ #include -#include -#include -#include -#include -#include -#include -#include - #include -#include -#include -__EXPORT int rpm_simulator_main(int argc, char *argv[]); +#include +#include +extern "C" __EXPORT int rpm_simulator_main(int argc, char *argv[]); int rpm_simulator_main(int argc, char *argv[]) { @@ -67,26 +60,20 @@ int rpm_simulator_main(int argc, char *argv[]) } rpm_s rpm{}; - memset(&rpm, 0, sizeof(rpm)); uORB::Publication rpm_pub{ORB_ID(rpm)}; - uint64_t timestamp_us = hrt_absolute_time(); - float frequency = atof(argv[1]); // prpepare RPM data message rpm.timestamp = timestamp_us; - rpm.indicated_frequency_rpm = frequency; - rpm.estimated_accurancy_rpm = frequency / 100.0f; - // publish data + // Publish data and let the user know what was published rpm_pub.publish(rpm); - - PX4_INFO("RPM message with RPM=%.3f was published", (double)frequency); + print_message(rpm); return 0; } From c9c76090b1c62215b31c7445bbe08fd68e64bf29 Mon Sep 17 00:00:00 2001 From: Roman Dvorak Date: Fri, 3 Apr 2020 10:23:23 +0200 Subject: [PATCH 12/16] Updated mavlink --- src/modules/mavlink/mavlink_messages.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/modules/mavlink/mavlink_messages.cpp b/src/modules/mavlink/mavlink_messages.cpp index 711332f4f32b..d9d18de40533 100644 --- a/src/modules/mavlink/mavlink_messages.cpp +++ b/src/modules/mavlink/mavlink_messages.cpp @@ -90,6 +90,7 @@ #include #include #include +#include #include #include #include From 80416d49b2422defb0c9c4e146847836fbdb9b0c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roman=20Dvo=C5=99=C3=A1k?= Date: Wed, 8 Apr 2020 13:30:03 +0200 Subject: [PATCH 13/16] Update src/drivers/rpm/rpm_simulator/rpm_simulator.cpp Co-Authored-By: Daniel Agar --- src/drivers/rpm/rpm_simulator/rpm_simulator.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/drivers/rpm/rpm_simulator/rpm_simulator.cpp b/src/drivers/rpm/rpm_simulator/rpm_simulator.cpp index e5f51f26028c..6253f6e4d354 100644 --- a/src/drivers/rpm/rpm_simulator/rpm_simulator.cpp +++ b/src/drivers/rpm/rpm_simulator/rpm_simulator.cpp @@ -60,7 +60,6 @@ int rpm_simulator_main(int argc, char *argv[]) } rpm_s rpm{}; - memset(&rpm, 0, sizeof(rpm)); uORB::Publication rpm_pub{ORB_ID(rpm)}; uint64_t timestamp_us = hrt_absolute_time(); From d8598b52f7a2f14e5e7ff577fe380829caac73ef Mon Sep 17 00:00:00 2001 From: Roman Dvorak Date: Wed, 8 Apr 2020 23:01:51 +0200 Subject: [PATCH 14/16] sync submodules --- Tools/sitl_gazebo | 2 +- platforms/nuttx/NuttX/nuttx | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Tools/sitl_gazebo b/Tools/sitl_gazebo index 69ee1f76bc80..e4f6bff20692 160000 --- a/Tools/sitl_gazebo +++ b/Tools/sitl_gazebo @@ -1 +1 @@ -Subproject commit 69ee1f76bc80e73b39cef78f23b5a562455612bc +Subproject commit e4f6bff206922d8ab85c68ece20c223812979560 diff --git a/platforms/nuttx/NuttX/nuttx b/platforms/nuttx/NuttX/nuttx index b902d4ca3d79..ec417d746666 160000 --- a/platforms/nuttx/NuttX/nuttx +++ b/platforms/nuttx/NuttX/nuttx @@ -1 +1 @@ -Subproject commit b902d4ca3d79ffbd5148670cb13bfeef7d917555 +Subproject commit ec417d7466666801e911e50d72766225ca7790a1 From 021d468a0005c8031bcdfbf74b3ecbc2e2ddc066 Mon Sep 17 00:00:00 2001 From: Roman Dvorak Date: Fri, 10 Apr 2020 16:10:42 +0200 Subject: [PATCH 15/16] sync submodule --- platforms/nuttx/NuttX/apps | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/platforms/nuttx/NuttX/apps b/platforms/nuttx/NuttX/apps index 91b6ad6a0d00..95e105548a20 160000 --- a/platforms/nuttx/NuttX/apps +++ b/platforms/nuttx/NuttX/apps @@ -1 +1 @@ -Subproject commit 91b6ad6a0d00ac107088b18588cd54d40e3cb796 +Subproject commit 95e105548a2037f42bf2f13b214ae083b921ff03 From f1bb6228b6079b8a8526e311c69fa1c224b490aa Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Roman=20Dvo=C5=99=C3=A1k?= Date: Sat, 25 Apr 2020 12:39:23 +0200 Subject: [PATCH 16/16] Update src/modules/mavlink/mavlink_messages.cpp Co-Authored-By: Daniel Agar --- src/modules/mavlink/mavlink_messages.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/src/modules/mavlink/mavlink_messages.cpp b/src/modules/mavlink/mavlink_messages.cpp index d9d18de40533..711332f4f32b 100644 --- a/src/modules/mavlink/mavlink_messages.cpp +++ b/src/modules/mavlink/mavlink_messages.cpp @@ -90,7 +90,6 @@ #include #include #include -#include #include #include #include