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

324 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 352dea6754 Remove outdated configs, clean up pwm limit compilation 2014-01-15 20:04:11 +01:00
Anton Babushkin 7b60761bf5 Merge branch 'master' into autostart_cleanup 2014-01-14 15:52:46 +01:00
Anton Babushkin 97e4522c76 Merge branch 'master' into navigator_new_vector 2014-01-14 15:45:49 +01:00
Lorenz Meier 58d78e57b7 Build the sensors as part of the test binary 2014-01-14 15:41:12 +01:00
Lorenz Meier 1e0f292566 Disabling EEPROM and old RAMTRON driver 2014-01-14 08:57:32 +01:00
Anton Babushkin 7bcddd192f Merge branch 'navigator_new' into navigator_new_vector 2014-01-13 13:07:25 +01:00
Lorenz Meier 0d3a743f75 Merge branch 'master' into paul_estimator 
ssage aborts
 2014-01-12 12:27:17 +01:00
Lorenz Meier 0bcdfa18c7 Merge branch 'master' of github.com:PX4/Firmware into paul_estimator 2014-01-12 12:27:12 +01:00
Lorenz Meier 5a0c635369 Added mtd tool 2014-01-11 21:01:07 +01:00
Thomas Gubler f224374ed3 Merge remote-tracking branch 'upstream/master' into navigator_new 2014-01-11 00:49:30 +01:00
Anton Babushkin f5501a0508 Merge branch 'master' into autostart_cleanup 2014-01-10 16:23:51 +01:00
Anton Babushkin 8d7620c3cb Merge branch 'master' into navigator_new_vector 2014-01-08 15:44:24 +01:00
Lorenz Meier ab407a82ba Merge branch 'master' into mount_tests 2014-01-07 22:42:09 +01:00
Anton Babushkin 255d91d8d4 hw_ver app added for hardware version checking 2014-01-07 21:56:35 +01:00
Lorenz Meier 4f95ce3dc2 Merge branch 'mount_tests' of github.com:PX4/Firmware into mount_tests 2014-01-07 07:57:58 +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 ba4f881f80 Do not require suffixed constants 2014-01-05 01:49:54 +01:00
Lorenz Meier 64a22fc011 Merge branch 'mount_tests' of github.com:PX4/Firmware into mount_tests 2014-01-05 01:49:35 +01:00
Lorenz Meier 366af8da80 Do not require suffixed constants 2014-01-05 01:49:21 +01:00
Lorenz Meier c8801ae3b7 Merged master 2014-01-05 01:48:07 +01:00
Lorenz Meier 7590d91cf2 Improved mount test 2014-01-04 17:05:52 +01:00
Lorenz Meier 05649eb09c Create test config for FMUv1 2014-01-04 17:05:19 +01:00
Lorenz Meier 7fa36a22d7 Fixed tests config 2014-01-04 14:05:23 +01:00
Lorenz Meier 93a0c2de56 Trimming down number of apps to save flash space 2014-01-04 13:51:20 +01:00
Stefan Rado 0ce7886249 Merge branch 'master' into frsky_telemetry 2014-01-02 01:37:09 +01:00
Anton Babushkin 5dda4dc993 Merge branch 'master' into navigator_new_vector fix 2014-01-01 18:19:02 +04:00
Lorenz Meier ffe5c88d98 Added new estimator framework, actual estimation code not yet present 2014-01-01 13:18:21 +01:00
Lorenz Meier 26d26a9b37 Removed fp suffix warning 2014-01-01 13:17:47 +01:00
Lorenz Meier 09b0de21f3 Deleted backside config to cut down build times 2014-01-01 13:17:24 +01:00
Thomas Gubler 3000d08b05 Merge remote-tracking branch 'upstream/master' into navigator_new_fw 
Conflicts:
	makefiles/config_px4fmu-v2_logging.mk
 2014-01-01 12:36:42 +01:00
Anton Babushkin 35e62a13f8 Use new controllers in logging build 2013-12-30 14:05:38 +04:00
Lorenz Meier 9a54c7c64d Removed special logging config to cut down build times 2013-12-30 00:53:12 +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
Anton Babushkin 26daae0b0a Merge branch 'mathlib_new' into vector_control2 2013-12-25 18:41:23 +04:00
Anton Babushkin 1e4bb764a6 Merge branch 'mathlib_new' into vector_control2 2013-12-25 18:31:12 +04:00
Anton Babushkin 5a2da77758 Merge branch 'master' into mathlib_new 2013-12-23 18:16:28 +04:00
Thomas Gubler 24e2676131 add dataman to config_px4fmu-v2_logging.mk 2013-12-23 12:13:25 +01:00
Thomas Gubler 68d8230e78 Merge remote-tracking branch 'upstream/control_groups' into fw_autoland_att_tecs_navigator_termination_controlgroups 
Conflicts:
	src/systemcmds/tests/module.mk
	src/systemcmds/tests/tests.h
 2013-12-23 11:13:42 +01:00
Lorenz Meier 8c518aa237 Useful bits for high-rate logging 2013-12-20 14:25:35 +01:00
Anton Babushkin a83e3cd222 New mathlib, WIP 2013-12-18 19:33:47 +04:00
Anton Babushkin 7cbb4cfdb8 Merge branch 'master' into vector_control2 2013-12-16 12:47:40 +04:00
Lorenz Meier b63d4809de Enabled MPU6K and updated startup script to start all sensors 2013-12-15 19:35:23 +01: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
Julian Oes c8942d0b34 Makefiles: fix compilation for backside 2013-11-18 15:58:45 +01:00
Julian Oes 29578a5604 Merge remote-tracking branch 'jean-m-cyr/master' into navigator_wip 2013-11-18 13:00:09 +01:00
Anton Babushkin d736ed181f Merge branch 'master' into vector_control 2013-11-16 16:10:57 +04:00
Thomas Gubler ebbe4d2235 initial wip version of launchdetector 2013-11-15 22:43:07 +01:00
James Goppert ba3681d3a0 Updated backside controller/ added backside config. 2013-11-14 12:34:51 -05: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 13b07efc49 added hw test, added better io debugging 2013-10-10 00:12:39 +02:00
Lorenz Meier 65bea797b4 Enabling navigator, does not do anything useful yet 2013-09-23 22:46:50 +02:00
Julian Oes af118a3568 Add esc_calib systemcmd to FMUv2 2013-09-22 15:01:39 +02:00
Lorenz Meier df763ff7e2 Merged master 2013-09-12 13:54:59 +02:00
Andrew Tridgell 1f19a27e3c make upload on Linux much more reliable 
Upload on Linux now only tries usb-3D_Robotics boards. This should
also make it handle more ports on MacOS
 2013-09-12 00:47:08 +02:00
Lorenz Meier 34a8c2de9c Added position controller to default set 2013-09-10 14:08:35 +02:00
Lorenz Meier 5111249eb8 Merge branch 'master' of github.com:PX4/Firmware into fixedwing_l1 2013-09-07 11:12:56 +02:00
tstellanova 23a355644b grab the git hash and inject it into every log file header 2013-09-06 10:18:08 -07: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 fab110d21f Moved math library to library dir, improved sensor-level HIL, cleaned up geo / conversion libs 2013-08-21 18:13:01 +02:00
Lorenz Meier 309ea81460 Merged fmuv2_bringup 2013-08-21 15:19:19 +02:00
Andrew Tridgell 2bcf4385f6 build: use unqualified com port names on windows 
the qualified names were not working with current versions of python
 2013-08-21 15:00:19 +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
px4dev 33863165b2 Merge commit 'de749a3602423f5ee6ca56f3cf2dfff04e31ec6d' (kconfig-cleanup) into fmuv2_bringup 2013-08-14 21:23:00 -07: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
px4dev 56d355414c Fix handling of board config files. Treat CONFIG_BOARD like CONFIG_ARCH in the toolchain configuration. 2013-08-13 00:34:11 -07:00