dark0707
/
px4-firmware
forked from Archive/PX4-Autopilot
1
0
Fork 0
Code Pull Requests Activity
12,279 Commits 514 Branches 136 Tags 234 MiB
Commit Graph

12279 Commits

Author SHA1 Message Date
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
Lorenz Meier 26954ece2c Merge pull request #2187 from PX4/fixconstrainairspeed 
make constrain airspeed actually constrain the airspeed
 2015-05-16 23:20:06 +02:00
Thomas Gubler 8a891591a8 make constrain airspeed actually constrain the airspeed 2015-05-16 19:05:31 +02:00
Lorenz Meier 03ef6a30ec Speed up param transmit now that we are faster on USB 2015-05-16 11:43:45 +02:00
Lorenz Meier 2432418751 FTP: Better error reporting, ignore hidden directories 2015-05-16 11:37:41 +02:00
Mark Charlebois 6a1c28fbc1 Merge branch 'linux' of http://github.com/mcharleb/Firmware into linux 2015-05-15 13:00:59 -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
Lorenz Meier 97b8e7a20e mavlink FTP: Speed up transfers by longer bursts 2015-05-15 21:14:40 +02:00
mcharleb 868177f3ba Merge pull request #12 from tumbili/simulator_fixes 
fix mavlink message sending, make thread priority default
 2015-05-15 08:59:14 -07:00
Roman Bapst 4a84215a8f fix mavlink message sending, make thread priority default 2015-05-15 17:49:20 +02:00
Lorenz Meier 5c53d38652 FMUv2 config: Increase USB TX buf size further to speed up MAVLink FTP transfers 2015-05-15 11:38:06 +02:00
Lorenz Meier 8f8184560b sdlog2: Log at 100 Hz as default 2015-05-15 11:17:08 +02:00
Lorenz Meier dabcf63c50 mavlink FTP: Drop rate to realistic value 2015-05-15 11:16:48 +02:00
Lorenz Meier 9bd2e376f6 NuttX for FMUv2: Larger USB buffer 2015-05-15 11:16:34 +02:00
Lorenz Meier f154f6e5e7 MAVLink transmission: Allow faster overall transmissions. 2015-05-15 11:16:11 +02:00
Lorenz Meier 4fb91f47cd Fix mavlink FTP list stack overflow. Fixes #2180, not flight-critical 2015-05-15 11:15:04 +02:00
Lorenz Meier fe4d2ddc40 Merge pull request #2177 from UAVenture/mp_param_update_launch 
Fix parameters in SITL launch files
 2015-05-15 09:36:23 +02:00
Andreas Antener 2bcfd4f6f7 rename parameters in launch file to match new MP parameters 2015-05-15 09:26:07 +02:00
Lorenz Meier fa8dc57236 mavlink app: Only send params if the system has booted. 2015-05-15 08:31:45 +02:00
Mark Charlebois a3a0d0612c QuRT: enabled more modules 
rgbled is now enabled.

Saving parameters causes a crash so those commands are not enabled.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2015-05-14 09:45:03 -07:00
Lorenz Meier 6b285a73bb Merge pull request #2174 from nopeppermint/addusart6_discovery 
Add usart 6 to px4-stm32f4discovery board
 2015-05-14 18:30:14 +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
Mark Charlebois abe61a3d7e Added missing return on error 
When mc_pos_control_main.cpp was ported to posix one error condition
retuned 0 instead of 1.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2015-05-14 08:32:51 -07: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
Lorenz Meier 33338ee2d0 Q attitude estimator: Comment undocumented params 2015-05-14 17:12:31 +02:00
Lorenz Meier 8ac81515ce EKF estimator: Remove unused params 2015-05-14 17:12:31 +02:00
mcharleb 2bdfd8ca1b Merge pull request #11 from tumbili/mc_pos_control 
Multicopter position controller port
 2015-05-14 06:58:21 -07:00
tumbili cfa0073c35 build mc_pos_control 2015-05-14 14:58:46 +02:00
tumbili f6bf6c89ff ported mc_pos_controller 2015-05-14 14:58:23 +02:00
Mark Charlebois b2c12ff522 QuRT: added stub for inclusion of libdspal.a 
libdspal.a is still incomplete and so is not yet used

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2015-05-13 18:49:00 -07:00
Mark Charlebois 8e346a06fb QuRT: enable uORB, and simulator 
uORB, the simulator and simulated devices now run

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2015-05-13 18:03:08 -07:00
Mark Charlebois 884f62878d QuRT: pthread API now working 
The use of std::map and static initialization was an issue.

The code was refactored to not use static initialization.

Signed-off-by: Mark Charlebois <charlebm@gmail.com>
 2015-05-13 16:21:52 -07:00
Lorenz Meier a5e69359fc Merge pull request #2167 from PX4/default_I_gains 
set default, weak rate I gains for multirotors
 2015-05-14 00:40:46 +02:00
Lorenz Meier ea278ea926 Merge pull request #2169 from PX4/fix_LED 
make main LED show low and critical battery status
 2015-05-14 00:39:56 +02:00
Lorenz Meier 7d775eb112 Merge pull request #2170 from andrea-nisti/master 
mpc parameter INAV_W_Z_VIS_P increased
 2015-05-14 00:39:22 +02:00
nopeppermint 169f112f0d change name in board.h 2015-05-13 22:59:30 +02:00
nopeppermint 52fca5b7a1 correct comments 2015-05-13 22:24:32 +02:00
nopeppermint b0efb24468 add USART6 on PC6(TX) and PC7(RX) to discovery 2015-05-13 22:21:59 +02:00
Lorenz Meier 14b09d6367 Merge pull request #2171 from NaterGator/master 
Fix potential null pointer deref in Mavlink dtor if task_main returns error
 2015-05-13 19:17:15 +02:00
mcharleb 7115ec3ab6 Merge pull request #10 from tumbili/hil_message 
read hil sensor message instead of highres imu message
 2015-05-13 09:19:41 -07:00
Nate Weibley b4e7b041ca Fix potential null pointer deref if Mavlink start fails before task_main loop 
LL_APPEND is called just before the loop spins up but various error conditions can cause the task to exit before then.
When that happens Mavlink::start_helper calls delete on the instance which tries to prune it from the global list.
If this is the first Mavlink instance to attempt starting the list head is null and we hardfault in the Mavlink dtor.

Only call LL_DELETE after checking the list head for a null pointer.
 2015-05-13 11:33:11 -04:00
Andrea Nistico 16aa03e30a mpc parameter INAV_W_Z_VIS_P increased 2015-05-13 17:22:10 +02:00
Roman Bapst 90c3aec1fd make main LED show low and critical battery status 2015-05-13 16:24:44 +02:00
Lorenz Meier 66b87ac761 Fix state-level HIL. Reported by @s3erjaeh 2015-05-13 16:04:33 +02:00
Lorenz Meier 6f94951050 Fix sdlog2 stopping on param write. Found by Severin Leuenberger 2015-05-13 15:46:35 +02:00
Lorenz Meier 890c3af13c multiplatform: Update yaw P param name 2015-05-13 15:34:07 +02:00
Roman Bapst 542dc9f65d added default rate I gain for multicopters. added default gains for FireFly6 in mc mode (from Simon Wilks) 2015-05-13 15:28:02 +02:00
Lorenz Meier efb60ab779 multiplatform pos controller: Rename params to prevent mixup with MPC params 2015-05-13 15:19:16 +02:00
Lorenz Meier e400ec586d multiplatform att controller: Rename params to prevent mixup with MC params 2015-05-13 15:18:50 +02:00
Lorenz Meier 164a254214 Merge pull request #2143 from PX4/mc_pos_D_reset 
mc_pos_control: always update previous velocity
 2015-05-13 13:58:15 +02:00