Commit Graph

797 Commits

Author SHA1 Message Date
Lorenz Meier d906fb8f31 Merged master into linux 2015-05-19 21:00:02 +02:00
Roman Bapst 12c6dc8ad8 added routine for autopilot level calibration 2015-05-19 14:20:00 +02:00
Lorenz Meier 2625d3e973 Merge pull request #2175 from Zefz/preflight_gps_check
Preflight: GPS check
2015-05-19 10:10:46 +02:00
Lorenz Meier e5fad077df Merge master into linux 2015-05-18 23:28:57 +02:00
Mark Charlebois dcb55ff38d Changed isfinite to PX4_ISFINITE
There are cross platform issues with the isfinite call that are handled
by PX4_ISFINITE

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-05-18 09:58:49 -07:00
Johan Jansen cd67609da5 PreflightCheck: Reduce GPS timeout to 2 sec 2015-05-18 12:49:53 +02:00
Johan Jansen 38004cdd95 PreflightCheck: Increase GPS timeout to 4 sec 2015-05-18 12:31:16 +02:00
Lorenz Meier 83fdb9931a commander / mavlink: Add battery status to output BATTERY_STATUS MAVLink message 2015-05-17 17:44:51 +02:00
Mark Charlebois 36f5d47ed9 Merge remote-tracking branch 'upstream/master' into linux
Signed-off-by: Mark Charlebois <charlebm@gmail.com>

Conflicts:
	src/modules/commander/gyro_calibration.cpp
	src/modules/mavlink/mavlink_ftp.cpp
2015-05-16 15:04:38 -07:00
Mark Charlebois 9f391b1867 NuttX: fixes for NuttX build
In the upstream tree ringbuffer.h includes the method implementations
in the header file which causes multiple definitions in the link for
other targets. Changed so ringbuffer.cpp is build separately for other
platforms and is included by ringbuffer.h on NuttX.

uORB changes do not link without uORBTest_UnitTest.cpp enabled for
the NuttX build.

px4_getopt was not exported and wasn't visible in NuttX build.

The makefiles were restored to be as close as possible to upstream
so the NuttX build builtin's work again. The code will have to be
refactored after the merge.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-05-15 12:56:18 -07:00
Johan Jansen 510b6124ec Commander: Fix inverted circuit breaker logic 2015-05-14 21:20:05 +02:00
Johan Jansen 52222de021 Commander: Wait up to 1 second to allow GPS module to be detected 2015-05-14 20:59:23 +02:00
Johan Jansen fee02c6943 Commander: Fix parameter bug in preflight check function 2015-05-14 20:30:10 +02:00
Johan Jansen f020ad4ba3 Commander: Check if GPS receiver is suffering from jamming noise 2015-05-14 19:29:35 +02:00
Johan Jansen 45f1fd6634 Commander: Add preflight check for missing GPS module 2015-05-14 19:19:30 +02:00
Lorenz Meier 8a73f91ad6 Commander: Be less verbose about param saves to focus the user attention to relevant output 2015-05-14 17:33:07 +02:00
Lorenz Meier e7c3032218 Mag calibration: Accept less rotation to start the UI, ensure calibration abort does indeed abort. 2015-05-14 17:31:05 +02:00
Roman Bapst 90c3aec1fd make main LED show low and critical battery status 2015-05-13 16:24:44 +02:00
Lorenz Meier 29eeb724a1 commander: Enforce rotation during mag calibration step 2015-05-08 11:23:19 +02:00
Lorenz Meier 3be1fc7d42 commander gyro calibration: Do not require a specific position, automatically start a retry after motion on the first try 2015-05-08 11:01:19 +02:00
Mark Charlebois 3a65187303 Fixed bad merge
Forgot to remove old file line when merging the changes from master.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-05-06 16:00:00 -07:00
Mark Charlebois db52227409 Merge remote-tracking branch 'upstream/master' into linux
Signed-off-by: Mark Charlebois <charlebm@gmail.com>

Conflicts:
	src/modules/commander/accelerometer_calibration.cpp
2015-05-06 15:51:39 -07:00
Mark Charlebois c5237f7f6f Removed extra abstracton layer in systemlib
The calls to task_spawn_cmd, kill_all, and systemreset  were wrappers
around the px4_{task_spawn_cmd|kill_all|systemreset} implementations.

Removed the wrappers and changed all calls to the px4_ equivalents.

NuttX specific code was moved into px4_tasks.h

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-05-06 14:43:11 -07:00
Lorenz Meier 150c5d2d8c Commander: parameter style change 2015-05-06 19:38:53 +02:00
Mark Charlebois 0cea93a55c POSIX and QuRT: fixed calls needing px4_ prefix
There were some missed calls to open and ioctl that need to be
px4_open and px4_ioctl.

QuRT also does not provide usleep() so px4_time.h has to be included
in files calling usleep.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-05-05 12:13:39 -07:00
Roman Bapst 0217e2ed56 fix accel calibration: rotate sensor values into board frame 2015-05-05 18:41:50 +02:00
Mark Charlebois 12a25e4b63 Merge remote-tracking branch 'upstream/master' into linux
Signed-off-by: Mark Charlebois <charlebm@gmail.com>

Conflicts:
	makefiles/firmware.mk
	src/modules/commander/module.mk
	src/modules/mavlink/mavlink_ftp.h
	src/modules/mavlink/mavlink_tests/module.mk
2015-05-04 16:36:59 -07:00
Lorenz Meier 0e78e38cda commander: Use pre-rotated topic in board frame 2015-05-04 14:06:19 +02: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
Roman Bapst be03f98d64 added esc calibration routines 2015-04-28 15:15:46 +02:00
Roman Bapst bd1c3363df added new vtol mav types 2015-04-27 22:22:52 +02:00
Simon Wilks ef63babb71 Make sure circuit breakers are ready before the first preflight check call. 2015-04-27 13:30:37 +02:00
Simon Wilks 868b9b33ed Make sure we log the airspeed check to the console as well. 2015-04-27 13:30:37 +02:00
Lorenz Meier 3f8c81433e commander: Provide more useful mission feedback 2015-04-27 09:07:53 +02:00
Lorenz Meier a57030c836 commander: Do not lock down the system once HIL has kickeed in 2015-04-26 18:27:48 +02:00
Lorenz Meier b07964660e commander: prune old code, do not run preflight checks when nothing relevant in the system is changing. 2015-04-26 17:39:00 +02:00
Lorenz Meier 362672ece8 commander: Fix calibration feedback so that QGC picks up all error conditions 2015-04-26 17:33:45 +02:00
Don Gagne a7f88d97b8 Sensor cal rework
- cancel support
- versioned cal messages
- better still detection
- better messaging
2015-04-26 14:34:19 +02:00
Lorenz Meier 6c9e5d1ecf commander: Only subscribe to existing telemetry status publications 2015-04-26 14:33:56 +02:00
Lorenz Meier bbb27b8635 commander: Reduce excessive stack size 2015-04-26 14:33:56 +02:00
Lorenz Meier 1b6742cebe commander: Better user feedback after resolving preflight check warnings 2015-04-26 12:04:16 +02:00
Lorenz Meier c7ecafe99b commander: Critical fix for arm state machine. Only auto-save if not stored already 2015-04-25 12:53:58 +02:00
Lorenz Meier 7e81778908 commander: Fix data link lost / regained logic 2015-04-25 10:15:15 +02:00
Lorenz Meier 75df06bc76 commander: Better text feedback in preflight-check 2015-04-25 09:43:54 +02:00
Mark Charlebois d913ec8dc9 Changed device::px4_device_handle_t to device::file_t
This change allowed the _posix.cpp file changes to be merged
back into the original files.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-04-24 17:49:35 -07:00
Lorenz Meier 5c4494b1c9 commander: Fixing HIL operation with failing preflight checks 2015-04-24 21:06:45 +02:00
Mark Charlebois 20d35e33da Platform header file cleanup and consolidation
Removed obsolete porting cruft from px4_XXX.h files and merged the
POSIX changes in PreflightCheck_posix.cpp back to PreflightCheck.cpp

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-04-24 11:45:14 -07:00
Mark Charlebois a1332e699c QuRT and POSIX changes - part 5
Last part of the main QuRT related changes

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
2015-04-24 01:39:25 -07:00