Commit Graph

15166 Commits

Author SHA1 Message Date
Mark Charlebois 7ac9fc38e4 Commented out 1st definition of MAVLINK_SRC
The variable MAVLINK_SRC was defined and then redefined.
Commented out the first definition and moved beside that overriding
definition for visibility.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-05-04 15:48:06 -07:00
Mark Charlebois cfd96a8ab4 POSIX: Added missing include path and -Wno-packed flag
The changes to the simulator added an include of

mavlink/include/v1.0/... to simulator.h which was not in the included paths.

The included header file also causes clang to issue a -Wpacked warning that
had to be silenced.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-05-04 15:33:08 -07:00
mcharleb 21a5dfc828 Merge pull request #5 from tumbili/JMAVsim_interface
JMAVSim interface
2015-05-04 14:15:29 -07:00
tumbili 4b34d0c297 improved topic listener 2015-05-04 23:10:23 +02:00
tumbili 17267a7f66 enable receiving mavlink highres imu message (via udp) from external simulator 2015-05-04 23:10:23 +02:00
Lorenz Meier 577bdf3a0d Merge pull request #2120 from DonLakeFlyer/BurstDownload
New burst mode ftp file download
2015-05-04 17:24:01 +02:00
Lorenz Meier e09f5d2871 IO driver: Ensure comms protocol cannot get into integer overflow on bad control outputs. Fixes #2119. 2015-05-04 14:59:07 +02:00
Lorenz Meier 980d9bcf3e IO driver: Code style 2015-05-04 14:55:19 +02:00
Lorenz Meier 0e78e38cda commander: Use pre-rotated topic in board frame 2015-05-04 14:06:19 +02:00
Thomas Gubler 07f6165290 make parameter parser work with python3 2015-05-04 14:04:09 +02:00
Andreas Antener 86cd484b82 convert -PI to PI attitude range to -1 to 1 for gimbal output 2015-05-04 13:10:58 +02:00
Lorenz Meier b9dc03da92 Merge branch 'master' into beta 2015-05-04 13:04:29 +02:00
Lorenz Meier f76d693592 TBS Disco config: Enable manual pass-through 2015-05-04 13:02:29 +02:00
Lorenz Meier da7754e9c7 Merge pull request #2101 from PX4/ESC_calibration
Esc calibration
2015-05-04 13:00:40 +02:00
Don Gagne 46da294ffb New bust mode ftp file download 2015-05-03 19:26:54 -07:00
Mark Charlebois 1a8bd15d98 Minor cleanup of mixer changes
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-05-03 11:20:07 -07:00
mcharleb 1b985ab9fb Merge pull request #3 from tumbili/mixer
ported mixer app
2015-05-03 11:06:17 -07:00
tumbili 8a873df9d0 ported mixer app 2015-05-03 17:30:31 +02:00
Thomas Gubler 0b5e6bdf97 Merge pull request #2117 from PX4/fwattincludes
fix ecl roll yaw controller includes
2015-05-03 10:13:38 +02:00
Thomas Gubler 731bd97f39 Merge pull request #2116 from PX4/ros_perf_counter_return
ros perf counter dummy: fix warning about missing return
2015-05-03 10:12:57 +02:00
Thomas Gubler d837bf4a0a fix ecl roll yaw controller includes 2015-05-03 08:54:08 +02:00
Thomas Gubler 44153eeaa1 ros perf counter dummy: fix warning about missing return 2015-05-02 21:46:37 +02:00
Mark Charlebois ebdf178ba3 Removed annoying "I2C SIM transfer_4" message
The debug message made it difficult to use the shell for the
posix build. Commented out the debug line.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-04-30 16:24:43 -07:00
Mark Charlebois 6acdc2ae3f POSIX: workaround for poll notification
Sensor combined topic notification wasnot working because
the calls to hrt_called() and hrt_call_after() in
ORBDevNode::appears_updated() are not working correctly.

This commit ifdefs out those calls, and the poling seems
to work correctly. This is a workaround until the issue is
resolved.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-04-30 13:17:16 -07:00
Mark Charlebois 5557ecf3d7 POSIX: Added airspeed simulator
This seems to be a dependency for the system to start up.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-04-30 13:16:03 -07:00
Mark Charlebois 2f8cad6c00 Fixed bad update of poll to px4_poll change
I updated poll to px4_poll but forgot to change
struct pollfd to px4_pollfd_struct_t.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-04-30 09:12:39 -07:00
Mark Charlebois b7120f1b9f Fixed call to poll to be px4_poll
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-04-30 09:02:04 -07:00
Mark Charlebois 93a3eeb569 Simulator: Added Roman's sensors combined topic
Simulator can work as before with -s flag or with Roman's additions to
publish the sensors combined topic using -p flag.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-04-29 23:45:54 -07:00
Mark Charlebois a209fdc8ef Added missing lock() unlock() to MuORB
The commented out lock and unlock were determined to be needed and added back.

The unit test for VDev was updated. It showed the race between the poll and a
write that only does a poll_notify().

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-04-29 17:04:30 -07:00
Mark Charlebois b408983d4c mavlink: added back MODULE_COMMAND
The MODULE_COMMAND was inadvertently removed during merge of master

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-04-28 17:27:14 -07:00
Mark Charlebois c622636601 Nuttx: fixed include of systemlib/err.h
The new px4_debug.h included "err.h" instead of
"systemlib/err.h" for NuttX.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-04-28 12:49:04 -07:00
Mark Charlebois 523a4aa785 Clang warning fix
Clang build fails due to -Werr and warning on use of
if (!condition != other_condition && some_condition)

Clang wants to be clear that the initial '!' wasn't
intended for the whole expression.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-04-28 12:29:50 -07:00
Mark Charlebois 2446dfec16 Fixups after merge from master
MuORB was missing the orb_exists() function added to uORB.cpp

gyro_calibration.cpp still had some merge conflicts that had not been resolved.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-04-28 12:28:10 -07:00
Mark Charlebois 190814bc97 Merge remote-tracking branch 'upstream/master' into linux
Signed-off-by: Mark Charlebois <charlebm@gmail.com>

Conflicts:
	src/drivers/rgbled/rgbled.cpp
	src/modules/commander/PreflightCheck.cpp
	src/modules/commander/airspeed_calibration.cpp
	src/modules/commander/calibration_routines.cpp
	src/modules/commander/gyro_calibration.cpp
	src/modules/commander/mag_calibration.cpp
	src/modules/mc_att_control/mc_att_control_main.cpp
2015-04-28 11:48:26 -07:00
Lorenz Meier 2a46e0f0b6 Merge pull request #2100 from PX4/fix_log_message_ID
fixed message ID
2015-04-28 16:38:20 +02:00
Roman Bapst c3111ecadf added option for esc calibration 2015-04-28 15:15:46 +02:00
Roman Bapst dd0ed9b446 added esc calibration option 2015-04-28 15:15:46 +02:00
Roman Bapst be03f98d64 added esc calibration routines 2015-04-28 15:15:46 +02:00
Roman Bapst 9eac4b995f fixed message ID 2015-04-28 12:15:42 +02:00
Mark Charlebois c832f4c55c Small fixes for debug macros
Fixed print format for __LINE__ to %d

Fixed if/else that breaks with the debug macro expansion. The if/else
needs to use braces to allow macro expansion.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-04-27 22:28:39 -07:00
Mark Charlebois 0bf690d36a Used new debug macros for sim.cpp
sim.cpp was causing the posix shell to have continuous debug output.

Used debug macros to suppress output

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-04-27 22:15:18 -07:00
Mark Charlebois 09718fa324 Revamped debug macros
Created px4_debug,h to define:

PX4_DBG
PX4_INFO
PX4_WARN
PX4_ERR

These enable OS specific mappings to be made, filtering, etc.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-04-27 21:58:54 -07:00
Mark Charlebois 6ab25ae890 QuRT: workaround for __sync_bool_compare_and_swap
The Hexagon compiler version does not support __sync_bool_compare_and_swap.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-04-27 16:51:33 -07:00
Mark Charlebois 58595e2e78 QuRT: fixed hard coded path in toolchain_hexagon.mk
Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-04-27 16:21:30 -07:00
Mark Charlebois a284a7b6d9 POSIX: added separators between commands run from shell
Output a separator and the command called to make the ouput easier
to read.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-04-27 14:03:23 -07:00
Mark Charlebois 58a33dd26a Added simulated tone_alarm and enabled led for POSIX
Added simulated tone_alarm class and enabled led class for posix build.

The simulator implements the led_init, led_on, led_off, led_toggle calls.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-04-27 14:00:06 -07:00
Mark Charlebois 7fa33d0d2b posix: workqueue uses TICK scaling from px4_defines.h
px4_defines.h defines USEC2TICK(x) and TICKS_PER_USEC.

These are now used and allow tick scaling.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-04-27 13:48:54 -07:00
Lorenz Meier 3dd45b9d34 Merge branch 'master' into beta 2015-04-27 22:34:08 +02:00
Roman Bapst bd1c3363df added new vtol mav types 2015-04-27 22:22:52 +02:00
Roman Bapst 06352bee62 set mav type for firefly6 2015-04-27 22:22:52 +02:00