Thomas Gubler
ad499a5944
Merge remote-tracking branch 'upstream/ROS_shared_lib_base_class' into dev_ros_rossharedlib
...
Conflicts:
src/modules/uORB/topics/vehicle_attitude.h
src/platforms/px4_defines.h
2014-12-02 16:52:38 +01:00
Roman Bapst
efe0938e99
removed comment
2014-11-13 13:48:40 +01:00
Roman Bapst
d931465382
added ifdef guard
2014-11-13 13:48:18 +01:00
Roman Bapst
003b326c77
applied fix_code_style.sh
2014-11-13 11:16:22 +01:00
Roman Bapst
794a89e711
added more digits to pi/2
2014-11-13 10:51:54 +01:00
Roman Bapst
076c1e6238
removed unused include
2014-11-11 15:43:47 +01:00
Roman Bapst
284787e02c
removed platform specific included, they are not needed
2014-11-11 15:41:07 +01:00
Roman Bapst
19bc137cf3
removed unnecessary diff content
2014-11-11 15:34:31 +01:00
Roman Bapst
02175f4a67
removed unnecessary diff content
2014-11-11 15:32:20 +01:00
Roman Bapst
ed409fd537
use px4_defines header to distinguish platform
2014-11-11 14:55:33 +01:00
Roman Bapst
3bfc4a5a52
removed platform specific includes
2014-11-11 13:10:36 +01:00
Lorenz Meier
122de6c762
Merge pull request #1414 from philipoe/PR2
...
TECS: Cleared up integrator-design on throttle, corrected rate-limiting (WIP)
2014-11-11 10:35:48 +01:00
Roman Bapst
31238516b5
pulled from PX4 master
2014-11-10 17:16:30 +01:00
Roman Bapst
c9a7850b93
do not include eigen lib from local source
2014-11-10 16:10:01 +01:00
philipoe
f414eef042
TECS: Modify absolute-value limiting of throttle demand
2014-11-06 11:00:14 +01:00
Thomas Gubler
25df841118
Merge pull request #1429 from tumbili/board_rot
...
new_sensor_rotation_option
2014-11-04 22:50:33 +01:00
tumbili
cbd20f48d6
fixed style
2014-11-04 20:57:09 +01:00
tumbili
f5dbfe63b3
added new sensor board rotation option (roll 270, yaw 270)
2014-11-04 20:52:29 +01:00
philipoe
02e35991d5
TECS: Also deleted the _throttle_dem_unc variable from TECS.h
2014-10-30 09:54:27 +01:00
philipoe
47367aeed5
TECS: Fix bug (underspeed-condition did not have any effect on throttle)
2014-10-29 23:13:51 +01:00
Roman Bapst
4fdf8e1ff2
updated from remote
2014-10-23 16:59:21 +02:00
Lorenz Meier
b7b4804791
GEO: fix compile warnings
2014-10-11 00:28:48 +02:00
Lorenz Meier
4a8d20e2e5
Merged master into st24
2014-10-07 22:49:27 +02:00
Lorenz Meier
8c6c08dcb5
Limit channel count effectively
2014-10-07 22:46:07 +02:00
Lorenz Meier
726b10651a
ST24: Fix parser return values, update docs
2014-10-07 22:25:03 +02:00
Lorenz Meier
3fc064882f
ST24 lib: formatting
2014-10-07 09:28:14 +02:00
Lorenz Meier
cb0cbe479a
Finalizing ST24 lib
2014-10-07 08:05:32 +02:00
Lorenz Meier
9c89499696
Fix up ST24 lib
2014-10-07 07:14:28 +02:00
Lorenz Meier
debff9e179
Updates to ST24 decoding library
2014-10-06 19:20:39 +02:00
Lorenz Meier
7b0ac1db85
Fix compile error in parser
2014-10-06 07:53:32 +02:00
Lorenz Meier
a0c9c88443
Merge branch 'master' of github.com:PX4/Firmware into st24
2014-10-04 15:35:59 +02:00
Thomas Gubler
e7313683cd
Merge remote-tracking branch 'upstream/master' into swissfang
2014-09-30 15:40:11 +02:00
Thomas Gubler
cc05f0f185
Merge remote-tracking branch 'upstream/obcfailsafe' into swissfang
...
Conflicts:
src/lib/external_lgpl/tecs/tecs.cpp
src/modules/commander/commander_params.c
src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
src/modules/navigator/navigator_main.cpp
2014-09-30 15:38:27 +02:00
Lorenz Meier
47dcf88271
Flash optimization
2014-09-30 15:18:30 +02:00
Lorenz Meier
10da4aab4e
Merge branch 'master' of github.com:PX4/Firmware into st24
2014-09-27 23:48:32 +02:00
Roman Bapst
c8b1c5b119
Adapted for shared library use with ROS
2014-09-27 12:01:11 +02:00
Roman Bapst
020a829215
Adapted for shared library use with ROS
2014-09-27 12:00:15 +02:00
Roman Bapst
af290826d9
Fixed so that when working with ROS the same err.h is included
2014-09-25 10:24:04 +02:00
Roman Bapst
81a5aeb6f5
Restored to original PX4 version since the hrt_time functions are now also implemented in ROS
2014-09-25 09:11:54 +02:00
Roman Bapst
d7cf6c4319
Use namespace std so that we can use the isfinite function, which should be available from math.h but the compiler gives an error that the function is undeclared
2014-09-24 13:45:38 +02:00
Roman Bapst
2b8a9b6325
Restored performance counter functionality, ROS package used own source file for function definitions but per_counter.h stays the same
2014-09-24 10:29:28 +02:00
Roman Bapst
77c823d3cd
Adapted for sharded library use with ROS. Problems to solve: error library from PX4 does not work yet. math functions such as isfinite need to be shared as well. performance library needs to be shared as well (commented for now)
2014-09-24 09:11:44 +02:00
Roman Bapst
5aefe11975
Had to add definition of PI is used with ROS because cannot share math library yet-needs to be solved
2014-09-24 09:01:30 +02:00
Roman Bapst
9f9fab400e
Adapted for shared library use with ROS
2014-09-24 08:57:20 +02:00
Roman Bapst
cfe14d78c5
Adapted for sharded library use with ROS. Problems to solve: error library from PX4 does not work yet. math functions such as isfinite need to be shared as well. performance library needs to be shared as well (commented for now)
2014-09-24 08:53:23 +02:00
Roman Bapst
0553771f4f
Adapted for sharded library use with ROS. Problems to solve: error library from PX4 does not work yet. math functions such as isfinite need to be shared as well. performance library needs to be shared as well (commented for now)
2014-09-24 08:52:28 +02:00
Roman Bapst
475f9a594b
Adapted math library for use of PX4 and ROS as shared library. First version, it works but some things might still be ugly
2014-09-23 16:55:19 +02:00
sjwilks
852b36661d
Merge pull request #1356 from PX4/launchpitchlimit_master
...
FW: additional upper pitch limit during launch
2014-09-11 09:49:14 +02:00
Thomas Gubler
33c0cd2e56
Merge remote-tracking branch 'private_swissfang/master' into launchpitchlimit_swissfang
2014-09-08 12:45:09 +02:00
Thomas Gubler
daf1618420
additional upper pitch limit during launch
...
The pitch limit can be used by the laucnhdetector to limit pitch during
critical phases of a launch. For example this can be used to limit pitch
while attached to a bungee differently from the standard pitch limit.
2014-09-08 12:42:42 +02:00
