Commit Graph

70 Commits

Author SHA1 Message Date
Anton Babushkin 63b7159cda Merge branch 'navigator_new' into navigator_new_vector 2014-01-17 14:37:48 +01:00
Thomas Gubler 73546b6645 Merge remote-tracking branch 'upstream/master' into navigator_new
Conflicts:
	makefiles/config_px4fmu-v1_backside.mk
	src/modules/commander/commander.cpp
	src/modules/sdlog2/sdlog2.c
2014-01-17 09:50:22 +01:00
Lorenz Meier 1e0f292566 Disabling EEPROM and old RAMTRON driver 2014-01-14 08:57:32 +01:00
Thomas Gubler f224374ed3 Merge remote-tracking branch 'upstream/master' into navigator_new 2014-01-11 00:49:30 +01:00
Anton Babushkin 8d7620c3cb Merge branch 'master' into navigator_new_vector 2014-01-08 15:44:24 +01:00
Anton Babushkin 300d891d76 Merge branch 'navigator_new' into navigator_new_vector 2014-01-06 08:08:35 +01:00
Lorenz Meier 7b2f0d758c Merge pull request #578 from kroimon/frsky_telemetry
Add FrSky telemetry support
2014-01-05 09:05:14 -08:00
Lorenz Meier 018e42733a Merge branch 'master' of github.com:PX4/Firmware into navigator_new 2014-01-05 15:19:39 +01:00
Lorenz Meier 93a0c2de56 Trimming down number of apps to save flash space 2014-01-04 13:51:20 +01:00
Thomas Gubler cf33f2a627 Merge branch 'launchdetection' into navigator_new_fw
Conflicts:
	src/modules/fw_pos_control_l1/fw_pos_control_l1_main.cpp
2013-12-29 19:50:30 +01:00
Stefan Rado 810f33c3f3 Merge branch 'master' into frsky_telemetry 2013-12-28 21:25:45 +01:00
Anton Babushkin 7b7539fbbd Merge branch 'navigator_new' into navigator_new_vector, WIP 2013-12-28 10:04:13 +04:00
Anton Babushkin e1f949163b makefiles and rc scripts fixed to use new attitude and position controllers 2013-12-26 23:06:36 +04:00
Thomas Gubler c3cbaf5deb Merge remote-tracking branch 'upstream/master' into fw_autoland_att_tecs_navigator_termination_controlgroups
Conflicts:
	src/drivers/px4io/px4io.cpp
2013-12-13 21:07:27 +01:00
Anton Babushkin deac4eefc6 Merge branch 'master' into vector_control2 2013-12-13 21:15:21 +04:00
Hyon Lim b3f1adc54b SO3 estimator code has been cleaned 2013-11-29 02:35:49 +09:00
Hyon Lim bcd745fb0d SO(3) estimator and quaternion receive by mavlink implemented 2013-11-29 02:05:15 +09:00
Stefan Rado 5f18ce506d Add FrSky telemetry application.
This daemon emulates an FrSky sensor hub by periodically sending data packets to an attached FrSky receiver.
2013-11-24 13:39:02 +01:00
Julian Oes bc583838b7 Navigator: only whitespace fixes 2013-11-18 15:59:14 +01:00
Thomas Gubler ebbe4d2235 initial wip version of launchdetector 2013-11-15 22:43:07 +01:00
Anton Babushkin 550c611a6e Add mc_att_control_vector to apps list 2013-11-08 23:01:13 +04:00
Jean Cyr 1cf9f72f62 Add data manager module and fence support to navigator
- Add function to geo.c to determine if global position is inside fence
- Add navigator support/commands for maintaining fence coords.
- Add data manager module to support persistence fence storage. Can
store other data, but only used for fence at this time.
- Add unit tests for data manager
2013-11-03 12:40:13 -05:00
Lorenz Meier 2fd1aed6be Disable the segway app, as its GCC 4.7 incompatible and not generally used 2013-11-01 12:02:45 +01:00
Lorenz Meier 17ddc7f471 Merge pull request #483 from PX4/calib_rotation
Calibration of rotated board
2013-10-23 03:32:20 -07:00
James Goppert d143e827dc Updated segway controller for new state machine. 2013-10-22 05:43:10 -04:00
James Goppert 7f0ced968e Working on roboclaw driver. 2013-10-21 21:28:26 -04:00
Anton Babushkin ef6f1f6f80 get_rot_matrix() moved to separate library, accel calibration of rotated board fixed 2013-10-20 19:36:42 +02:00
Lorenz Meier 42c412f6dd Makefile cleanup 2013-10-10 21:15:44 +02:00
Lorenz Meier 65bea797b4 Enabling navigator, does not do anything useful yet 2013-09-23 22:46:50 +02:00
Lorenz Meier 34a8c2de9c Added position controller to default set 2013-09-10 14:08:35 +02:00
Lorenz Meier d74bea57ac Merge branch 'master' of github.com:PX4/Firmware into fixedwing_l1 2013-09-05 22:18:00 +02:00
Simon Wilks fddaa49ed8 Make sure the unit tests aren't included as part of the standard firmware 2013-09-01 22:44:58 +02:00
Lorenz Meier 0104f070c6 Merge branch 'multirotor' into fixedwing_l1 2013-08-27 16:11:41 +02:00
Lorenz Meier 2537977101 Merge pull request #15 from sjwilks/multirotor_unittests
Add a simple unit testing framework and tests for the commander state machine.
2013-08-25 14:27:38 -07:00
Simon Wilks e25f2ff44f Whitespace and formatting cleanup. 2013-08-25 22:54:31 +02:00
Simon Wilks 548f322493 Added a simple unit test framework and initial testing some of the commander state machines. 2013-08-25 22:43:01 +02:00
Lorenz Meier a897b3d88e Added complete attitude control framework 2013-08-23 16:28:53 +02:00
Lorenz Meier 686d150800 Merge branch 'fmuv2_bringup' of github.com:cvg/Firmware_Private into multirotor
ge aborts
2013-08-23 09:28:43 +02:00
px4dev f70a4b3b70 Add support for adding extra files to the ROMFS from the config.
If there is an IO firmware image already built when we build the corresponding FMU ROMFS, copy it into the ROMFS. Note - due to there being no fixed build ordering, to be certain that you have the most current IO firmware, you must build the IO firmware explicitly first.
2013-08-22 23:47:55 -07:00
Lorenz Meier 3005c8aae0 Added missing config files, compiling 2013-08-21 18:37:22 +02:00
Lorenz Meier c57b345e70 merged 2013-08-19 09:44:42 +02:00
Lorenz Meier 3465ee7f90 Merge branch 'fmuv2_bringup' of github.com:cvg/Firmware_Private into fmuv2_bringup_new_state_machine_drton 2013-08-19 09:42:22 +02:00
Lorenz Meier 80f38e3dea Put console and syslog on UART8, added support to nshterm for proper serial port config 2013-08-18 21:00:47 +02:00
Lorenz Meier b71c0c1f49 Added support for FMUv1 for RGB led and dim led support 2013-08-17 15:46:13 +02:00
Anton Babushkin f78666e0c8 Merge branch 'seatbelt_multirotor' into seatbelt_multirotor_new
WIP, TODO fixedwing
2013-08-16 13:23:33 +02:00
Julian Oes 56575eb068 Merge remote-tracking branch 'px4/new_state_machine_drton' into fmuv2_bringup_new_state_machine_drton
Conflicts:
	src/drivers/blinkm/blinkm.cpp
	src/drivers/px4io/px4io.cpp
	src/modules/commander/state_machine_helper.c
	src/modules/px4iofirmware/protocol.h
	src/modules/px4iofirmware/registers.c
	src/modules/systemlib/systemlib.h
	src/systemcmds/reboot/reboot.c
2013-08-15 14:04:46 +02:00
Lorenz Meier 0bbc4b7012 Build fixes 2013-08-15 08:42:08 +02:00
Lorenz Meier aebdd6e059 Merged master 2013-08-14 22:53:42 +02:00
Lorenz Meier e14d034528 Merge branch 'master' of github.com:PX4/Firmware into fmuv2_bringup 2013-08-14 14:58:02 +02:00
Lorenz Meier 828626ee01 Merge pull request #347 from jgoppert/md25_dev
Segway Controller
2013-08-11 14:23:25 -07:00