6184 Commits

Author	SHA1	Message	Date
abeck70	143f09d216	Merge remote-tracking branch 'origin/rel-15.02.02' into next ... Conflicts: flight/modules/Actuator/actuator.c	2015-05-06 08:35:21 +10:00
RS2K	77eacb2294	OP-1835 - Motor Constraints 15.02.02 100% throttle curves default	2015-05-02 17:41:47 -05:00
Laurent Lalanne	93ff480b7a	15.02.02 hotfix for tricopter servo on wizard	2015-05-02 21:02:14 +02:00
Philippe Renon	9a312ef115	uncrustified	2015-05-02 16:46:35 +02:00
Philippe Renon	b4b93bee93	Merge remote-tracking branch 'origin/rvonlehe/OP-1740_UAV0_GetSetFunctionsTakeEnum' into next	2015-05-02 16:34:15 +02:00
m_thread	b8653d44da	Merge branch 'thread/OP-1837_SRXL_Cleanup' into next	2015-05-01 09:46:32 +02:00
Alessio Morale	a76c41a1ef	Merge remote-tracking branch 'origin/dwillis/OP-1832' into next	2015-04-29 19:36:17 +02:00
Alessio Morale	3be43d9c9e	Merge remote-tracking branch 'origin/samguns/OP-1821_Tricopter_wrong_servo_speed' into rel-15.02.02	2015-04-28 23:47:12 +02:00
samguns	c71d51b093	OP-1751 Modify some improper CN translations	2015-04-27 13:16:17 +08:00
samguns	09a00f8990	Merge branch 'rel-15.02.02' into samguns/zh_CN_GCS	2015-04-27 11:56:25 +08:00
samguns	69b404daa1	OP-1821 Commit bug fix	2015-04-27 08:45:35 +08:00
Richard von Lehe	f3611591e0	Merge branch 'next' into rvonlehe/OP-1740_UAV0_GetSetFunctionsTakeEnum ... Conflicts: flight/modules/PathFollower/inc/vtollandcontroller.h flight/modules/PathFollower/vtollandcontroller.cpp flight/modules/PathFollower/vtollandfsm.cpp	2015-04-26 17:45:36 -05:00
Laurent Lalanne	6e6e2b1b9b	OP-1337 Translations : input wizard update	2015-04-26 18:25:56 +02:00
m_thread	b0b1a42aec	OP-1837 This change adds support for the Multiplex SRXL v1 and v2 protocols. ... Protocol version is autodetected and 12 or 16 channels are supported. SRXL is available on Flexiport of Revolution board.	2015-04-26 15:04:52 +02:00
Philippe Renon	5b660a1fe0	Merge remote-tracking branch 'origin/filnet/OP-1796_upgrade_gcs_to_qt_5_4_1' into next ... Conflicts: make/tools.mk	2015-04-25 17:21:33 +02:00
Richard von Lehe	604585f74e	OP-1740: GetSet use enums. Need to pack the enums to retain byte compatibility.	2015-04-20 08:31:26 -05:00
Alessio Morale	ab36dcbdee	Merge remote-tracking branch 'origin/rel-15.02.02' into next	2015-04-20 14:54:07 +02:00
Alessio Morale	2571db4d96	Merge remote-tracking branch 'origin/laurent/OP-1814_Battery_reset_mAh' into next	2015-04-20 14:29:16 +02:00
abeck70	1e9bd43871	Merge branch 'next' into abeck/OP-1760-autotakeoff-squashed	2015-04-19 17:52:35 +10:00
Philippe Renon	77dfff1dac	Merge remote-tracking branch 'origin/samguns/OP-1808_make_flight_mode_optional' into next	2015-04-18 20:13:09 +02:00
Laurent Lalanne	fe04a9b63c	OP-1337 French translation update : Usage feedback	2015-04-18 13:55:50 +02:00
Laurent Lalanne	00ac0048ee	Merge remote-tracking branch 'origin/laurent/OP-1822_Heli_tab_refresh' into next	2015-04-18 11:33:42 +02:00
abeck70	8490cd2e73	OP-1760 autotakeoff fix pathdesired mode display in pfd	2015-04-18 16:17:46 +10:00
abeck70	71d1757bb0	OP-1760 autotakeoff ... Fix the gcs defines for the pathaction modes.	2015-04-17 21:01:38 +10:00
m_thread	ddb2025108	Merge branch 'thread/OP-1777_Usage_statistics' into next	2015-04-17 08:26:02 +02:00
Richard von Lehe	0a7bd475f2	Merge branch 'next' into rvonlehe/OP-1740_UAV0_GetSetFunctionsTakeEnum	2015-04-15 21:59:38 -05:00
Richard von Lehe	ef6cf262d5	OP-1740: GetSet use enums: tidy	2015-04-15 21:57:38 -05:00
James Duley	80f5a83b39	Merge branch 'parched/OP-1792_makefile_tidy' into next	2015-04-16 09:35:04 +12:00
David Ankers	5af7cea3f6	New versions of HK RTF models for cloudconfig	2015-04-13 20:08:23 +10:00
David Ankers	968e4557e1	Upgrade HK CCs	2015-04-13 20:07:27 +10:00
abeck70	a52969a76b	OP-1760 Autotakeoff ... Squashed commit as code reviews impossible otherwise due to dependencing on OP-1696	2015-04-12 21:39:31 +10:00
James Duley	24defde93b	OP-1792 Makefile tidy: fix addCopyDirTarget on windows because directory timestamps are not updated when a file is modified	2015-04-11 23:20:30 +12:00
dwillis	2a08d6aa12	OP-1832 Add getDefaultInstance method to Java UAVObject template	2015-04-11 00:36:26 +01:00
James Duley	5ea8a990df	OP-1792 Makefile tidy: removed repeated Qt5OpenGL.dll	2015-04-09 13:01:23 +12:00
James Duley	af06960482	OP-1792 Makefile tidy: set dependencies for copydata by using new ... functions addCopyFileTarget and addCopyDirTarget	2015-04-09 13:01:22 +12:00
Richard von Lehe	242d810c37	Merge branch 'next' into rvonlehe/OP-1740_UAV0_GetSetFunctionsTakeEnum	2015-04-08 18:39:56 -05:00
Richard von Lehe	04497a5b77	enums sorted out in code and template, need to merge in latest	2015-04-08 18:38:49 -05:00
samguns	aaf635068d	OP-1808 Code change according to review results	2015-04-06 13:10:04 +08:00
Laurent Lalanne	9140ac5be2	OP-1337 French translation : First update for 15.05	2015-04-05 20:42:32 +02:00
Philippe Renon	d9708e79d6	OP-1796 updated PYTHON_DIR to qt-5.4.1	2015-04-05 11:47:59 +02:00
Laurent Lalanne	0b38791b3f	OP-1814 Add another reset button on battery panel using "time left" area	2015-04-05 00:54:21 +02:00
Laurent Lalanne	da4dc0e935	OP-1814 Reset consumed energy from PFD	2015-04-05 00:37:20 +02:00
Laurent Lalanne	805ee4e9b5	OP-1822 Check visibility and avoid false error that skip Mixer table to populate	2015-04-04 17:21:38 +02:00
samguns	5b76f4f96b	OP-1808 1.Make flight mode stick identification to be optional. 2. Refine some code.	2015-03-31 22:54:25 +08:00
James Duley	3a08642b40	OP-1792 Makefile tidy: Fix up the 'copydata.pro's to depend on FORCE, not be FORCE, and be aux template, not subdirs template.	2015-03-31 14:57:43 +13:00
James Duley	c245d18683	Merge remote-tracking branch 'dev/parched/OP-1700_copydata_doubles_if_called_twice' into next	2015-03-30 11:40:22 +13:00
m_thread	81050f557c	Uncrustify	2015-03-29 10:51:03 +02:00
Richard von Lehe	69fae1b977	Fix misspelling in function name	2015-03-28 23:27:07 -05:00
m_thread	62bd0115fe	OP-1809 Changed Min/Max limits	2015-03-28 15:31:05 +01:00
m_thread	4bd2e889ce	Merge remote-tracking branch 'origin/samguns/OP-1781_ground_input_channel_conf' into next	2015-03-28 12:33:24 +01:00