11200 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Werner Backes	80b6757ea6	Don't use I-term in the VtolPathFollower's position control loop for now. ... See OP-1483 for why it's considered not to work as expected.	2014-09-14 15:39:13 +02:00
Fredrik Larsson	25c718aaa8	Add Jim's amazing nav flight	2014-09-14 23:02:56 +10:00
Fredrik Larsson	aebf41aad7	Merge remote-tracking branch 'origin/parched/OP-1478_fix_win_qtc_variables' into next	2014-09-14 22:50:43 +10:00
James Duley	5cc91467ef	OP-1478 fix_win_qtc_variables: added MESAWIN_DIR variable	2014-09-14 12:50:30 +12:00
James Duley	18ad22a177	OP-1478: allow alternate SDL_DIR or OPENSSL_DIR	2014-09-14 12:01:14 +12:00
James Duley	5d55766573	OP-1478 fix_win_qtc_variables: reworded comments	2014-09-14 11:55:32 +12:00
Alessio Morale	03dc92124c	Merge remote-tracking branch 'origin/amorale/OP-1465_update_stm32flash' into next	2014-09-13 19:03:15 +02:00
James Duley	684180ef87	OP-1478: added a qmake variable OPENSSL_DIR	2014-09-13 17:48:30 +12:00
James Duley	17bb1d2fc0	OP-1478 fix win qtc vairables: fixed TOOLS_DIR check	2014-09-13 16:37:30 +12:00
James Duley	ea64284d7d	OP-1478: added a qmake variable SDL_DIR	2014-09-13 15:24:52 +12:00
Fredrik Larsson	34c3706ded	Use Rod's real name	2014-09-11 17:23:20 +10:00
Werner Backes	907b4668aa	Merge remote-tracking branch 'origin/next' into D-Lite/OP-1462-NewEKFdefaults	2014-09-10 12:51:20 +02:00
Fredrik Larsson	f6b097ee77	Add missing 20km flight	2014-09-10 04:24:06 +10:00
Fredrik Larsson	10703aaf46	Update Miletones	2014-09-10 04:16:40 +10:00
Alessio Morale	2907af618f	OP-1465 - fixes for some review suggestions	2014-09-08 14:39:41 +02:00
James Duley	67e7801949	OP-1478: move TOOLS_DIR out of linux scope	2014-09-08 21:29:44 +12:00
Fredrik Larsson	d04b8fecfb	Update gitignore to make sure we keep that pro.user out of git	2014-09-08 18:23:03 +10:00
Fredrik Larsson	65e0124a74	Remove QtCreator user file from git	2014-09-08 18:19:03 +10:00
Fredrik Larrson	353e3ec0a8	Merge remote-tracking branch 'origin/parched/OP-1463_allow_for_alternative_OPENPILOT_TOOLS_DIR' into next	2014-09-08 15:53:03 +10:00
Fredrik Larrson	849bbfd481	Merge remote-tracking branch 'origin/skarlsso/OP-1455_no_output_from_test_outputs' into next	2014-09-08 04:25:02 +10:00
Fredrik Larrson	b9a2cac03f	Merge remote-tracking branch 'origin/skarlsso/OP-1077_gcs_corrupts_flight_log_files' into next	2014-09-08 04:24:07 +10:00
Fredrik Larrson	11a4a249b8	Merge remote-tracking branch 'origin/skarlsso/OP-1459_workaround_white-box_issue' into next	2014-09-08 02:33:39 +10:00
Fredrik Larrson	d91db0af6f	Revert "Merge remote-tracking branch 'origin/proff/OP-1373_DSMFixes' into next" ... This reverts commit a39e393274, reversing changes made to ebfdaf28b5.	2014-09-08 02:31:02 +10:00
Fredrik Larrson	a39e393274	Merge remote-tracking branch 'origin/proff/OP-1373_DSMFixes' into next ... Conflicts: shared/uavobjectdefinition/hwsettings.xml	2014-09-08 01:54:59 +10:00
Fredrik Larrson	ebfdaf28b5	Merge remote-tracking branch 'origin/havyan/OP-1473_sbus_eof' into next	2014-09-08 01:35:39 +10:00
Fredrik Larrson	32773c0245	Merge remote-tracking branch 'origin/laurent/OP-1349_GCS_Neutral_Spinboxes_in_Input_and_Output' into next	2014-09-08 01:27:23 +10:00
Fredrik Larson	7a98dc7227	More rate work	2014-09-07 16:49:08 +10:00
Fredrik Larson	9e13c9c8da	Atom tinkering, prepare for new config system	2014-09-07 15:52:22 +10:00
Corvus Corax	4a19f98c95	OP-1156 hotfix in pathfollower code - use correct VerticalPosPI.Ki and ILimit + uavobject typo	2014-09-06 13:51:30 +02:00
Karl Knutsson	ec0d44e1b0	OP-1473 Fix EOF handling for R7008SB	2014-09-04 18:15:36 +02:00
Stefan Karlsson	9bfd648879	OP-1077 Prevent GCS flight log corruption when no flight log is chosen	2014-09-03 21:19:15 +02:00
Fredrik Larson	650cbd3b52	Uncrustify	2014-09-03 02:46:26 +10:00
Fredrik Larson	6243cad768	Change mouse pointr type to show this is a link	2014-09-02 23:18:45 +10:00
Alessio Morale	ec07016aee	OP-1465 - Fix build on windows, force the removal on cleanup	2014-09-01 14:51:43 +02:00
Fredrik Larson	af6ee00fe1	Merge branch 'hayvosh/OP-1468-Atom_PIDs' into next	2014-09-01 22:41:08 +10:00
Corvus Corax	91ccee4964	Merge branch 'corvuscorax/OP-1456_struct_to_array_improvement' into next	2014-08-31 18:54:39 +02:00
Corvus Corax	b64326208e	Merge branch 'next' into corvuscorax/OP-1456_struct_to_array_improvement	2014-08-31 18:43:48 +02:00
Philippe Renon	8019cad104	Merge branch 'filnet/OP-1319_minor_spelling_issue_in_fw_code' into next	2014-08-31 13:18:36 +02:00
Philippe Renon	575e89f1a1	OP-1319 fixed minor spelling mistake in firmware code	2014-08-30 18:09:23 +02:00
Fredrik Larson	93792510bc	Pid testing	2014-08-31 00:32:00 +10:00
Alessio Morale	c5d57a763e	OP-1465 - Update stm32flash repository to https://code.google.com/p/stm32flash/ and fetch a newer version (a358bd1f025d)	2014-08-29 21:13:13 +02:00
Alessio Morale	3a2c402c1f	Delete wrong font.	2014-08-29 20:39:15 +02:00
Alessio Morale	f69e476ed3	Merge branch 'amorale/OP-1452_comusbbridge_improvements' into next	2014-08-29 20:25:29 +02:00
Laurent Lalanne	5f346d81e9	OP-1349_GCS Neutral_Spinboxes_in_Input_and_Output Disable keyboard tracking on inputform spinboxes (min, max, neutral).	2014-08-29 19:45:29 +02:00
Fredrik Larson	d4d1c9c482	Merge remote-tracking branch 'origin/dwillis/OP-1453_VersionCheck' into next	2014-08-29 09:51:18 +10:00
Fredrik Larson	99c59f9c3a	Add missing font	2014-08-29 09:31:53 +10:00
James Duley	e5d1676d44	OP-1463 allow for alternative_OPENPILOT_TOOLS_DIR:added check to see if it is set and use it if possible	2014-08-29 09:01:30 +12:00
Fredrik Larson	41ecbc3eba	Merge remote-tracking branch 'origin/laurent/OP-1438_VSI_Arc_PFD+Status' into next	2014-08-29 07:00:58 +10:00
Fredrik Larson	8d691f0f48	Merge remote-tracking branch 'origin/laurent/OP-1422_Tricopter_mixers_settings' into next	2014-08-29 06:54:22 +10:00
Fredrik Larson	ed85e026b1	Merge remote-tracking branch 'origin/laurent/OP-1362_make_ts_errors' into next	2014-08-29 06:53:43 +10:00