fly316/PX4-Autopilot
7
0
Fork 0
mirror of https://gitee.com/mirrors_PX4/PX4-Autopilot.git synced 2026-10-03 15:28:53 +08:00
Code Issues Packages Projects Releases Wiki Activity
49,287 Commits 852 Branches 161 Tags
d5d2ce26d7bdabc494fa08d626431f817d52cb91
Commit Graph
100 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Julian Oes c189ac1c85 Added possibility to log pid control values 
Conflicts:
	apps/multirotor_pos_control/multirotor_pos_control.c
	src/drivers/ardrone_interface/ardrone_interface.c
 2013-06-16 15:22:20 +02:00
Julian Oes 1ea9ff3640 Added possibility to log pid control values 
Conflicts:
	apps/multirotor_pos_control/multirotor_pos_control.c
	src/drivers/ardrone_interface/ardrone_interface.c
 2013-06-16 09:57:32 +02:00
Julian Oes 8559315f4f Added a filter parameter to the pid function 
Conflicts:
	apps/multirotor_pos_control/multirotor_pos_control.c
 2013-06-15 20:06:13 +02:00
Julian Oes 2b9fa731ef Use the pid library in the rate controller and change de implementation of the D part 
Conflicts:
	src/modules/multirotor_att_control/multirotor_rate_control.c
	src/modules/systemlib/pid/pid.c
	src/modules/systemlib/pid/pid.h
 2013-06-15 20:05:03 +02:00
Julian Oes 65d36c44af Prevent flips at high throttle 
Conflicts:
	src/drivers/ardrone_interface/ardrone_motor_control.c
 2013-06-15 19:53:25 +02:00
Julian Oes b7e947cb3d Anti-Aliasing frequency of the LSM303D can now be read too, not just written 2013-04-17 12:41:56 -07:00
Julian Oes 76497502cb Moved the L3GD20 driver to the new driver, working on FMU v1 and v2 2013-04-17 12:41:56 -07:00
Julian Oes 0eddcb3357 Tried to collect some changes that I needed to build for FMUv2 into a commit 2013-04-17 12:41:56 -07:00
Julian Oes d7178fb833 Play SOS if the SD card can't be mounted 2013-04-17 10:10:08 -07:00
Julian Oes 1a8cca92e9 Fixed axis in L3GD20 driver 2013-04-09 23:34:35 +02:00
Julian Oes 3469fefe11 Checked axes of LSM303D 2013-04-09 23:34:27 +02:00
Julian Oes 1d327c42a6 Mag sample rate was not actually changed by an ioctl 2013-04-09 23:34:19 +02:00
Julian Oes eb3d6f228c Added some functions for changing rates etc (WIP) 2013-04-09 23:34:08 +02:00
Julian Oes 8c70f4412d Fixed axis in L3GD20 driver 2013-04-08 23:29:24 -07:00
Julian Oes d1d4d1d1e2 Some defines and comments (still WIP) 2013-04-06 11:36:53 +02:00
Julian Oes f288c65baa LSM303D accel and mag working (still WIP) 2013-04-06 11:36:45 +02:00
Julian Oes 2187dc8e9a LSM303D accel raw values look ok (work in progress) 2013-04-06 11:36:38 +02:00
Julian Oes 4ccf252b76 Changed I2C bus for blinkm, tested on fmuv2 2013-04-06 11:36:04 +02:00
Julian Oes 3cb3fa224b Small fixes again 2013-03-26 15:37:13 -07:00
Julian Oes f8e5b0cb0e Small fixes and comments 2013-03-26 10:44:49 -07:00
Julian Oes 06a94cacd5 Merge remote-tracking branch 'upstream/master' into new_state_machine 
Conflicts:
	apps/controllib/fixedwing.cpp
 2013-03-25 17:29:34 -07:00
Julian Oes 3665d7b86f Improved command handling, added a low priority task and various fixes 2013-03-25 14:53:54 -07:00
Julian Oes b1e2011fcc Added feedback before rebooting 2013-03-22 10:36:23 -07:00
Julian Oes 6039582928 Compile error after merge fixed 2013-03-22 09:04:08 -07:00
Julian Oes 7f32c01a1d Merge branch 'master' into new_state_machine 
Conflicts:
	apps/controllib/fixedwing.cpp
 2013-03-22 08:57:26 -07:00
Julian Oes b5b460e7ca IO board now disarms when FMU reboots when manual override is not an option 2013-03-15 15:24:52 -07:00
Julian Oes 513e1c7398 Added missing prototype 2013-03-11 11:42:23 -07:00
Julian Oes 8e837dd164 Updated the state machine documentation 2013-03-11 11:09:49 -07:00
Julian Oes 591cc0ac4d Merge remote-tracking branch 'upstream/master' into new_state_machine 
Conflicts:
	apps/commander/commander.c
	apps/uORB/topics/vehicle_status.h
 2013-03-11 11:01:49 -07:00
Julian Oes 0fe5aeb02c Checkpoint: More state machine fixes, commited to wrong branch and now copied over 2013-03-11 10:39:57 -07:00
Julian Oes f0d8ce009e Merge remote-tracking branch 'upstream/master' into new_state_machine 2013-02-25 09:26:16 -08:00
Julian Oes 34c84752d1 Checkpoint: Added control flags 2013-02-25 09:24:30 -08:00
Julian Oes 0eca49a4f6 Checkpoint: Separated all bools in vehicle status into conditions and flags, they should be protected 2013-02-22 19:46:47 -08:00
Julian Oes f731b6f4e5 Merge remote-tracking branch 'upstream/px4io-i2c' into new_state_machine 2013-02-22 15:53:07 -08:00
Julian Oes 793b482e00 Checkpoint: Navigation states and arming seem to work 2013-02-22 15:52:13 -08:00
Julian Oes cbfa64b59e Checkpoint: Added switch handling 2013-02-22 11:54:41 -08:00
Julian Oes 36f9f8082e Checkpoint: Added flag checks inside navigation state update 2013-02-22 09:32:49 -08:00
Julian Oes be7aeb754b Checkpoint: Added flag checks inside arming state update 2013-02-21 20:01:54 -08:00
Julian Oes c056410f84 Checkpoint: Added arming check function 2013-02-21 18:10:34 -08:00
Julian Oes ebe0285ce7 Checkpoint: navigation state machine as discussed with Lorenz 2013-02-21 13:06:56 -08:00
Julian Oes 0e29f2505a Checkpoint: New hierarchical states 2013-02-20 10:38:06 -08:00
Julian Oes aab6214cdc Checkpoint: Added HIL state, arming/disarming works now, also from GQC 2013-02-19 12:32:47 -08:00
Julian Oes b7faaca435 Checkpoint: Arming/Disarming works 2013-02-18 16:35:34 -08:00
Julian Oes f8326300e8 Merge branch 'px4io-i2c' into new_state_machine 
Conflicts:
	apps/uORB/topics/vehicle_status.h
 2013-02-18 14:06:09 -08:00
Julian Oes 5e7a38d946 Merge remote-tracking branch 'upstream/master' into new_state_machine 2013-02-18 13:55:43 -08:00
Julian Oes 5eac78d764 Checkpoint: Added DESCENT state 2013-02-18 13:52:18 -08:00
Julian Oes 47b05eeb87 Checkpoint, arming/disarming still has a bug 2013-02-17 23:07:07 -08:00
Julian Oes 3bc385c789 Checkpoint: Added arming state check 2013-02-17 15:04:01 -08:00
Julian Oes 0e2db0beb9 Checkpoint: implement new state machine, compiling, WIP 2013-02-16 13:40:09 -08:00
Julian Oes ae51810a81 Changed names and default values of attitude estimator parameters 2013-02-14 20:17:18 -08:00
Julian Oes 6fe5291147 Merge remote-tracking branch 'upstream/master' into attitude_filter_improvement 2013-02-11 16:54:36 -08:00
Julian Oes df6cf142e7 Another rewrite: most of the polling, reading and writing is now inside the GPS classes 2013-02-08 11:05:57 -08:00
Julian Oes a88b9f4eef Restructered the parsing/configuring, MTK working 2013-02-07 14:48:00 -08:00
Julian Oes d36eb8a3fc Sped up MTK configuration but the detection time can still be improved: timeouts/usleeps 2013-02-06 23:25:09 -08:00
Julian Oes b620136af4 Added support for MTK revision 19, working condition but configuration of MTK is very slow and needs improvement 2013-02-06 22:58:52 -08:00
Julian Oes 0d54661ce9 Added MTK 1.6, works after some seconds, work in progress 2013-02-06 20:04:49 -08:00
Julian Oes 6ed5d97aea Merged mtk16 and mtk19 helper classes, configure() now writes directly instead of buffering 2013-02-06 18:47:32 -08:00
Julian Oes d962e6c403 Removed some unnecessairy flags, home position back working 2013-02-06 13:50:32 -08:00
Julian Oes fc4be3e728 Changed gps position topic mostly to SI units and float, removed counters and added specifig timestamps 2013-02-06 12:41:05 -08:00
Julian Oes a79ad17f09 Changed parse interface, differentiation between config needed and position updated, working but might be solved more elegant 2013-02-05 23:16:32 -08:00
Julian Oes 53c11f87cb Small corrections 2013-02-04 17:57:30 -08:00
Julian Oes 039d394c20 Merged with newer, cleaned up code, fixed the checksum error 2013-02-04 16:27:01 -08:00
Julian Oes c19870d565 Merge remote-tracking branch 'upstream/master' into attitude_filter_improvement 2013-01-30 10:36:05 -08:00
Julian Oes 7459169230 RC mode switching idea using 1 3pos and 2 2pos switches 2013-01-22 13:11:19 -08:00
Julian Oes f14c90c222 Some timeout needed to be raised for now to make ubx with baudrate 9600 working 2013-01-21 17:42:08 -08:00
Julian Oes 9ca472bbc7 Ubx configuration working again, gps app is still complicated and big but should be wrking better now 2013-01-17 16:54:32 -08:00
Julian Oes ebaa38ad1b ubx with 38400 working, all messages seem to arrive, configuration procedure is still funny (work in progress) 2013-01-17 16:54:32 -08:00
Julian Oes dce9b2d045 The CFG-NAV5 dynamic model is now checked as well 2013-01-17 16:54:32 -08:00
Julian Oes 80eb66c7a3 The config message was wrong, corrected (not tested) 2013-01-17 16:54:32 -08:00
Julian Oes c5ecf88bfb Added ubx configuration CFG-NAV5 to airborne with less than 2g acceleration (compiling, not tested) 2013-01-17 16:54:32 -08:00
Julian Oes b5eccef69e Started with px4io stop implementation 2013-01-10 15:49:53 -08:00
Julian Oes 5e20dd1736 Added support for IO bootloader revision 3 on FMU 2013-01-10 15:35:47 -08:00
Julian Oes e4bfd78847 Attention: flipped the yaw direction of multirotors in order to be compatible to APM 2013-01-02 13:29:33 -08:00
Julian Oes 805c08815e The multirotor mixer return 0 instead of the number of channels, my Hex is flying now (not reliably now, random flips 2012-12-31 16:12:55 -08:00
Julian Oes 8d1b1354e1 A wrong parameter name in commander was responsible for manual override always ok 2012-12-31 12:31:31 -08:00
Julian Oes d4edf2e85c Override is now really disabled for multirotors, also I don't think the parameter got ever read by the commander but I might be wrong 2012-12-23 17:20:53 -08:00
Julian Oes 8053b4b9f7 Revert "I don't want a switch for failsafe for the copter" 
This reverts commit 28b3ecd9c6.
 2012-12-20 08:55:54 -08:00
Julian Oes 06407b166f My PID integral part fixes 2012-12-19 17:54:18 -08:00
Julian Oes 28b3ecd9c6 I don't want a switch for failsafe for the copter 2012-12-19 17:06:01 -08:00
Julian Oes 4bc3f80043 Greatly sped up Matlab import script, a 17min flight now takes 2secs to import instead of more than the actual flight time 2012-12-15 00:01:59 -08:00
Julian Oes 6f572637de Fixed missing heading for mtkcustom and nmea 2012-11-30 14:26:03 -08:00
Julian Oes c2a2eb1a1a Raised COM port number for windows from 18 to 32 2012-11-27 10:45:11 -08:00
Julian Oes 129e6d73de Changed yaw position control to yaw speed control for multirotors, tested with ardrone 2012-11-19 16:17:52 -08:00
Julian Oes 2652b16d37 Distinction between yaw position and yaw speed control, just messsed around in the code, untested 2012-11-19 09:26:38 -08:00
Julian Oes e9acc18df4 Lowered arm button prelling 2012-11-15 11:57:55 -08:00
Julian Oes 33e750602a Merge remote-tracking branch 'upstream/master' into io 
Fixed Conflicts:
	apps/multirotor_att_control/multirotor_att_control_main.c

rc loss failsafe throttle tested
 2012-11-15 11:55:55 -08:00
Julian Oes b7c6a11e67 Merge remote-tracking branch 'upstream/master' into io 2012-11-13 14:20:31 -08:00
Julian Oes 359cc4bb86 Merge remote-tracking branch 'upstream/master' into io 2012-11-13 14:18:59 -08:00
Julian Oes a8dfcaace2 Several fixes, hex flies, failsafe not really tested yet 2012-11-11 11:55:27 -08:00
Julian Oes 9f45770dc2 Merge branch 'master' of https://github.com/PX4/Firmware 2012-11-08 09:26:53 -08:00
Julian Oes 52143d6a68 Reverting commenting, that happened by accident 2012-11-08 09:26:37 -08:00
Julian Oes 6c3a340d6e Made param name shorter, don't know if it was needed 2012-11-08 09:25:42 -08:00
Julian Oes 0b5da8b599 Got rid of the control limitation at high throttle 2012-11-07 16:24:12 -08:00
Julian Oes 2b5f551838 Revert "Revert "Another take on Spektrum/DSM frame decoding, based on more careful examination of the relevant docs."" 
This reverts commit 38b20f2a1a.
 2012-11-07 14:56:03 -08:00
Julian Oes 38b20f2a1a Revert "Another take on Spektrum/DSM frame decoding, based on more careful examination of the relevant docs." 
This reverts commit ff3a014971.
 2012-11-07 14:46:28 -08:00
Julian Oes 25ed791b70 Forgot to comment 2012-11-07 10:56:25 -08:00
Julian Oes 5995240a07 Failsafe throttle when RC is lost is now a parameter 2012-11-07 10:50:52 -08:00
Julian Oes 9f92c6df67 Merge branch 'master' of https://github.com/PX4/Firmware 2012-11-07 10:24:49 -08:00
Julian Oes 74f7600602 Again some hacking to make arming/disarming work for now 2012-11-06 19:03:08 -08:00
Julian Oes 7da799d154 Scale control signals with thrust for low thrust 2012-11-06 19:02:01 -08:00