Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-31 02:16:53 +08:00
Code Issues Actions 3 Packages Projects Releases Wiki Activity

Changing Names

Browse Source
This commit is contained in:
NRottmann
2017-09-04 13:03:57 +02:00
committed by Lorenz Meier
parent e1eceda5f2
commit 5352cffe3f
5 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files
cmake/configs/posix_sitl_default.cmake
+2 -1
View File
@@ -151,7 +151,8 @@ set(config_module_list
# #
# HippoCampus example (AUV from TUHH) # HippoCampus example (AUV from TUHH)
examples/auv_hippocampus_example_app #
examples/uuv_example_app
# #
# Segway # Segway
posix-configs/SITL/init/ekf2/hippocampus
-1
View File
@@ -30,7 +30,6 @@ ekf2 start
mavlink start -u 14556 -r 4000000 mavlink start -u 14556 -r 4000000
mavlink start -u 14557 -r 4000000 -m onboard -o 14540 mavlink start -u 14557 -r 4000000 -m onboard -o 14540
mavlink stream -r 50 -s SERVO_OUTPUT_RAW_0 -u 14556 mavlink stream -r 50 -s SERVO_OUTPUT_RAW_0 -u 14556
mavlink stream -r 50 -s ATT_POS_MOCAP -u 14556
mavlink stream -r 50 -s LOCAL_POSITION_NED -u 14556 mavlink stream -r 50 -s LOCAL_POSITION_NED -u 14556
logger start -r 100 -e logger start -r 100 -e
posix-configs/SITL/init/lpe/hippocampus
+1 -1
View File
@@ -30,7 +30,7 @@ attitude_estimator_q start
mavlink start -u 14556 -r 4000000 mavlink start -u 14556 -r 4000000
mavlink start -u 14557 -r 4000000 -m onboard -o 14540 mavlink start -u 14557 -r 4000000 -m onboard -o 14540
mavlink stream -r 50 -s SERVO_OUTPUT_RAW_0 -u 14556 mavlink stream -r 50 -s SERVO_OUTPUT_RAW_0 -u 14556
mavlink stream -r 50 -s ATT_POS_MOCAP -u 14556
mavlink stream -r 50 -s LOCAL_POSITION_NED -u 14556 mavlink stream -r 50 -s LOCAL_POSITION_NED -u 14556
logger start -r 100 -e logger start -r 100 -e
mavlink boot_complete mavlink boot_complete
src/examples/auv_hippocampus_example_app/CMakeLists.txt → src/examples/uuv_example_app/CMakeLists.txt
+3 -3
View File
@@ -31,11 +31,11 @@
# #
############################################################################ ############################################################################
px4_add_module( px4_add_module(
MODULE examples__auv_hippocampus_example_app MODULE examples__uuv_example_app
MAIN auv_hippocampus_example_app MAIN uuv_example_app
STACK_MAIN 2000 STACK_MAIN 2000
SRCS SRCS
auv_hippocampus_example_app.cpp uuv_example_app.cpp
DEPENDS DEPENDS
platforms__common platforms__common
) )
src/examples/auv_hippocampus_example_app/auv_hippocampus_example_app.cpp → src/examples/uuv_example_app/uuv_example_app.cpp
+5 -6
View File
@@ -32,7 +32,7 @@
****************************************************************************/ ****************************************************************************/
/** /**
* @file hippocampus_example_app.cpp * @file uuv_example_app.cpp
* *
* This file let the hippocampus drive in a circle and prints the orientation as well as the acceleration data. * This file let the hippocampus drive in a circle and prints the orientation as well as the acceleration data.
* The HippoCampus is an autonomous underwater vehicle (AUV) designed by the Technical University Hamburg-Harburg (TUHH). * The HippoCampus is an autonomous underwater vehicle (AUV) designed by the Technical University Hamburg-Harburg (TUHH).
@@ -59,7 +59,6 @@
// internal libraries // internal libraries
#include <lib/mathlib/mathlib.h> #include <lib/mathlib/mathlib.h>
#include <lib/geo/geo.h> #include <lib/geo/geo.h>
#include <lib/tailsitter_recovery/tailsitter_recovery.h>
// Include uORB and the required topics for this app // Include uORB and the required topics for this app
#include <uORB/uORB.h> #include <uORB/uORB.h>
@@ -67,9 +66,9 @@
#include <uORB/topics/actuator_controls.h> // this topic gives the actuators control input #include <uORB/topics/actuator_controls.h> // this topic gives the actuators control input
#include <uORB/topics/control_state.h> // this topic holds the orientation of the hippocampus #include <uORB/topics/control_state.h> // this topic holds the orientation of the hippocampus
extern "C" __EXPORT int auv_hippocampus_example_app_main(int argc, char *argv[]); extern "C" __EXPORT int uuv_example_app_main(int argc, char *argv[]);
int auv_hippocampus_example_app_main(int argc, char *argv[]) int uuv_example_app_main(int argc, char *argv[])
{ {
PX4_INFO("auv_hippocampus_example_app has been started!"); PX4_INFO("auv_hippocampus_example_app has been started!");
@@ -122,7 +121,7 @@ int auv_hippocampus_example_app_main(int argc, char *argv[])
/* copy sensors raw data into local buffer */ /* copy sensors raw data into local buffer */
orb_copy(ORB_ID(sensor_combined), sensor_sub_fd, &raw_sensor); orb_copy(ORB_ID(sensor_combined), sensor_sub_fd, &raw_sensor);
// printing the sensor data into the terminal // printing the sensor data into the terminal
PX4_INFO("Accelerometer:\t%8.4f\t%8.4f\t%8.4f", PX4_INFO("Acc:\t%8.4f\t%8.4f\t%8.4f",
(double)raw_sensor.accelerometer_m_s2[0], (double)raw_sensor.accelerometer_m_s2[0],
(double)raw_sensor.accelerometer_m_s2[1], (double)raw_sensor.accelerometer_m_s2[1],
(double)raw_sensor.accelerometer_m_s2[2]); (double)raw_sensor.accelerometer_m_s2[2]);
@@ -171,7 +170,7 @@ int auv_hippocampus_example_app_main(int argc, char *argv[])
} }
PX4_INFO("exiting auv_hippocampus_example_app!"); PX4_INFO("Exiting uuv_example_app!");
return 0; return 0;