Commit Graph

140 Commits

Author SHA1 Message Date
Lorenz Meier fdf1c712b1 Fixed code style for conversions 2013-01-11 07:47:22 +01:00
Lorenz Meier 1d4feb6905 Merged sdlog_buffering branch 2013-01-10 14:43:59 +01:00
Lorenz Meier 16e49c447d Added support for battery voltage and differential pressure to logging and plot script 2013-01-09 16:37:45 +01:00
Lorenz Meier 8cc9fb9e2c Merge branch 'master' of github.com:PX4/Firmware into fixedwing 2013-01-08 17:40:44 +01:00
Lorenz Meier 2169e1f808 Merge branch 'master' of github.com:PX4/Firmware into mathlib 2013-01-08 00:02:57 +01:00
Lorenz Meier fe5f9d46d5 Merge branch 'master' into fixedwing 2013-01-07 22:23:41 +01:00
Lorenz Meier e24dd0f684 Fixed minor compile error 2013-01-07 22:23:24 +01:00
Lorenz Meier 41f657e3e5 Merged with master 2013-01-07 17:50:49 +01:00
px4dev faced6bfe3 Merge James's controllib bits into a separate library module.
Add a top-level mathlib header to avoid having to dig around for specific headers.
2013-01-06 15:04:30 -08:00
px4dev 950d104c8d Merge commit '8888b73e160520e5b15e168998013f4a5f6e64c0' into local/mathlib 2013-01-06 13:58:52 -08:00
px4dev 43ccb257a8 Move the math library pieces out of systemlib into mathlib 2013-01-06 13:56:49 -08:00
jgoppert 8888b73e16 Added control library. 2013-01-06 15:41:23 -05:00
jgoppert d9491b20cc Reformat of math library with astyle. 2013-01-06 15:33:55 -05:00
jgoppert 4f3b17f53b Added math library to build. 2013-01-06 14:20:24 -05:00
jgoppert db3fabc3ba Added math library. 2013-01-06 14:08:50 -05: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
Lorenz Meier 1b82dbb58d Merge branch '#111-px4io-integrated-mixing' of github.com:PX4/Firmware into fixedwing_io_mixing 2012-12-31 00:34:12 +01:00
px4dev dbb841b0dc Rework the way we scan text for scaler definitions; something weird was going on with sscanf's handling of %n that wasn't obvious. This seems to work around the issue. 2012-12-30 15:09:21 -08:00
Lorenz Meier abe1b9759a Merged IO mixing branch 2012-12-30 10:49:27 +01:00
px4dev b14abad3a0 Fix logic for handling partial buffers. 2012-12-30 01:16:28 -08:00
Lorenz Meier 142556b442 merged 2012-12-30 10:03:05 +01:00
px4dev b8250de1e6 Assorted compile fixes. 2012-12-29 16:22:30 -08:00
px4dev d81edb09cf whitespace/formatting 2012-12-29 16:01:24 -08:00
px4dev f9520ee39d Factory method for a simple mixer that converts PWM/PPM values to the standard internal format. 2012-12-29 16:00:50 -08:00
Lorenz Meier 0298714db5 Merge branch 'fixedwing_outdoor' of github.com:PX4/Firmware into fixedwing_outdoor 2012-12-30 00:04:54 +01:00
px4dev 6ede0e2f18 Add the ability to reset a mixer group. Report the remaining buffer size from load_from_buf. 2012-12-29 12:58:10 -08:00
Lorenz Meier 4976a3a47d Added accel magnitude check, added conversion functions for various standard cases 2012-12-29 16:21:59 +01:00
px4dev 35c82ff2fc Make mixer ioctls load from a memory buffer rather than a file. This is prep for uploading the memory buffer to IO to be processed there. 2012-12-29 00:01:04 -08:00
Lorenz Meier 7526dd46a2 Added header for common priority bands 2012-12-27 19:01:00 +01:00
Julian Oes 06407b166f My PID integral part fixes 2012-12-19 17:54:18 -08:00
Lorenz Meier 6ff4520904 Cleaned up PI wrapping code, still subject to testing 2012-11-20 15:19:51 +01: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
Lorenz Meier 7f916779df Minor cleanup of param load / store 2012-11-15 17:19:52 +01: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
Lorenz Meier a6294be6f0 Merge branch 'fw_control' of https://github.com/thomasgubler/Firmware 2012-11-13 18:57:35 +01:00
px4dev dca3bce1ca Add a new performance counter for measuring periodic/interval events. 2012-11-12 01:35:51 -08:00
Julian Oes a8dfcaace2 Several fixes, hex flies, failsafe not really tested yet 2012-11-11 11:55:27 -08:00
Thomas Gubler 60198e3a2d small code cleanup 2012-11-11 17:35:55 +01:00
Lorenz Meier ee5abb0745 Fixed the number of control inputs for simple mixer. Contributed by Thomas Gubler 2012-11-10 17:21:13 +01:00
Julian Oes 9f45770dc2 Merge branch 'master' of https://github.com/PX4/Firmware 2012-11-08 09:26:53 -08:00
Lorenz Meier 0245d7be86 Removed outdated docs 2012-11-08 18:11:53 +01:00
Julian Oes 0b5da8b599 Got rid of the control limitation at high throttle 2012-11-07 16:24:12 -08:00
Julian Oes 7da799d154 Scale control signals with thrust for low thrust 2012-11-06 19:02:01 -08:00
Lorenz Meier 7d76a8a57b Merge pull request #45 from thomasgubler/master_origin
re-adding pid limitation & mavlink waypoint handling fix
2012-11-05 13:15:35 -08:00
Thomas Gubler be9b58e1b9 re-adding pid limitation 2012-11-05 20:22:00 +01:00
Lorenz Meier 706a7e4dd5 Merge branch 'master' of github.com:pixhawk/Firmware 2012-11-05 17:47:11 +01:00
daregger 801cf3af3e add tangent plane mapping to geo.c 2012-11-05 17:17:28 +01:00
px4dev 37682f852f Clean up perf counters attached to an HX protocol stream. 2012-11-03 01:14:25 -07:00