rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-13 20:48:42 +01:00
Code Issues Releases Activity
10,055 Commits 5 Branches 8 Tags 266 MiB
bb16da86ff
Commit Graph

2738 Commits

Author SHA1 Message Date
Richard Flay (Hyper)
242d371167 Merge branch 'next' into glenneaux/OP-965_GCSSwashConfig_Channel_Assignment 2013-06-07 19:13:28 +09:30
Richard Flay (Hyper)
e5fe56a425 OP-965: More tweaks to the heli config swashplate levelling routine in GCS as the results of review comments. 
+review OPReview-496
 2013-06-07 19:08:28 +09:30
Alessio Morale
7e50c00885 OP-990 uncrustification 2013-06-07 10:13:14 +02:00
Fredrik Arvidsson
7f0a72d2f8 OP-991 'Removed Erase All Settings' menu item in Tool menu plus code behind. 2013-06-06 22:20:00 +02:00
Corvus Corax
6fdf554d4a Merge branch 'next' into corvuscorax/OP-947_stateestimator-module 
Conflicts:
	flight/modules/Attitude/revolution/attitude.c
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
	shared/uavobjectdefinition/attitudesettings.xml
 2013-06-06 19:25:54 +02:00
Fredrik Arvidsson
d4a519aef1 Merge remote-tracking branch 'origin/next' into thread/OP-989_Revo_AccelTau 2013-06-06 12:33:19 +02:00
Fredrik Arvidsson
03a92c913f OP-989 Changed layout for CC/CC3D Attitude configuration page. Renamed AccelTau to Accelerometer filtering. Updated tool tips for both CC/CC3D and Revolution pages. 2013-06-06 11:21:30 +02:00
Oleg Semyonov
68e18dcb38 OP-910: fix line endings in QML template 2013-06-06 11:16:47 +03:00
Oleg Semyonov
a834226968 OP-910: fix mixed line endings in generated QML 2013-06-06 02:20:32 +03:00
Oleg Semyonov
d54e507ffb OP-910: don't use python 2.7+ features (make it compatible with 2.6) 2013-06-06 00:46:59 +03:00
Oleg Semyonov
13e7f51174 OP-910: fix circular dependencies 2013-06-05 23:25:50 +03:00
Alessio Morale
be999329b9 OP-990 Some fixes to calibration in wizard 
1) zeroes any existing bias prior to calibration.
2) Quick and dirty fix to missing UAVO updates during calibration setup
3) missing resetting of BiasCorrectGyro to true on Revolution after save.
 2013-06-05 22:24:12 +02:00
Oleg Semyonov
a7d1e2b298 OP-910: fix line endings and whitespaces (didn't work on Linux) 2013-06-05 23:21:54 +03:00
Fredrik Arvidsson
26585e5ad0 OP-989 Converting tool tip text to rich text to get word wrapping to work. 2013-06-05 18:07:17 +02:00
Fredrik Arvidsson
32fdcdc28a OP-989 Changing tool tip text. 2013-06-05 17:41:21 +02:00
Oleg Semyonov
6756f52044 OP-910: remove unused redundant CREDITS files 2013-06-05 17:09:10 +03:00
Oleg Semyonov
921803769e OP-910: reformat core.qrc to use 4 space idents instead of tabs 2013-06-05 17:09:09 +03:00
Oleg Semyonov
e4fb269524 OP-910: update core.qrc to use autogenerated AuthorsModel.qml 2013-06-05 17:09:08 +03:00
Oleg Semyonov
0018a3c04a OP-910: generate synthetic AuthorsModel.qml using CREDITS.txt 2013-06-05 17:09:08 +03:00
Fredrik Arvidsson
3bc944dc95 OP-989 Added tool tip for Accelerometer filtering settings and label. 2013-06-05 15:44:26 +02:00
Fredrik Arvidsson
77618deb62 OP-989 Changed label text from AccelTau to Accelerometers. 2013-06-05 13:42:47 +02:00
Fredrik Arvidsson
4ffab32cba OP-989 Adds AccelTau to Revolution Attitude configuration panel. 2013-06-04 19:36:33 +02:00
Glenn Campigli
940f768af0 +review OPReview-496 
Performed uncrustify
Corrected statement order
 2013-06-04 20:11:23 +10:00
Oleg Semyonov
1cfc7f1586 Uncrustify 2013-06-03 19:13:11 +02:00
Mathieu Rondonneau
b5b48d3bf0 Merge branch 'next' into Mathieu/OP-958_HID_plugin_basic_cleanup 2013-06-03 07:52:53 -07:00
Mathieu Rondonneau
43f6b18895 OP-958 and OP-977: remove doxygen keyword "note" when empty. 2013-06-03 07:49:14 -07:00
Oleg Semyonov
25dc8d8c02 Merge remote-tracking branch 'origin/kevinv033/OP-910' into next 2013-06-03 15:41:04 +02:00
Mathieu
4cba7fa7c1 OP-958: Fix windows issue related to unplug/plug (15s hang) 2013-06-02 20:49:05 -07:00
Kevin Vertucio
3b6fcefca6 removed bootstrap from utility 2013-06-02 08:18:40 -04:00
Kevin Vertucio
48945ffeb6 added authors to CREDITS. 2013-06-02 07:29:23 -04:00
Philippe Renon
218d197aa8 OP-983 fixed minor spelling issues in GCS 2013-06-02 12:42:15 +02:00
Mathieu Rondonneau
5732c2fd4c OP-958L: Some fixes for 15s hang and unplug/plug issue reported lately. 
This is not cleanedup but I want to get this in so other people can test.
 2013-06-01 22:13:04 -07:00
Kevin Vertucio
9683ddc37a Updated AuthorsModel. Added utility script for generating QML ListElements of authors. 2013-06-01 23:11:28 -04:00
Glenn Campigli
558a47dc7c Corrected channel index when calibrating swashplate 2013-05-31 16:23:42 +10:00
Mathieu Rondonneau
d0b0cb77d4 OP-958: only enumerate openpilot devices in udev. 
(not sure the reason of not doing that)
 2013-05-30 19:08:22 -07:00
Philippe Renon
e3fb75b356 OP-979 additional fixes in Settings dialog: 
- Make Environment/General node auto expandable (i.e. always expanded when
the dialog is opened)
- Reorganize persistent settings (move to own node in XML file + renaming)
- Simplify persistent splitter position handling (persist location instead
of 2 sizes)
 2013-05-29 23:10:58 +02:00
Mathieu Rondonneau
988baa2764 Merge branch 'next' into Mathieu/OP-958_HID_plugin_basic_cleanup 2013-05-29 06:02:19 -07:00
Mathieu Rondonneau
afeeed6f65 OP-958: WINDOWS HACK: do not filter out the bl. 2013-05-29 05:57:46 -07:00
Richard Flay (Hyper)
7f90692a24 Merge branch 'next' into filnet/OP-843_settings_dialog_show_language_selection_at_top 2013-05-29 18:28:17 +09:30
Mathieu Rondonneau
660a175a53 Merge branch 'next' into Mathieu/OP-958_HID_plugin_basic_cleanup 2013-05-28 21:39:49 -07:00
Mathieu Rondonneau
6a838417fb OP-958: WINDOWS HACK ONLY: This is to filter out gamepadcontroller HID device during reconnect. 
This is temporary until multiple HID are supported (if needed).
 2013-05-28 21:36:10 -07:00
Mathieu Rondonneau
74cc1315b4 OP-958: only report the number of device we actually open successfully. 
Limitation: only one (1) or zero (0) for now.
 2013-05-28 12:59:46 -07:00
Oleg Semyonov
0faa77b3fb Uncrustify sources 2013-05-28 16:57:03 +02:00
Philippe Renon
6b7080d958 OP-843 setting dialog reordering: plugin options pages (top part) are now sorted on their untranslated name 
this solve the issue of the order changing per language
The bottom part of the tree (gadget options pages) is still sorted by translated name as before.
Additional fixes:
- Moved GCS page to Environment node + renamed to Workspaces
- Renamed Notigy Plugin node to Notification
- Moved the two Telemetry nodes together
- Split plane size is now persistent (in addition to size and selected node)
 2013-05-28 15:32:27 +02:00
Oleg Semyonov
d8ec41fcaa Merge remote-tracking branch 'origin/thread/OP-906_Default_Wizard_Stab_Settings_And_Flight_Modes' into next 2013-05-28 15:22:50 +02:00
Oleg Semyonov
a61b2fb13e Merge remote-tracking branch 'origin/os/OP-770_version_info_stuff' into next 2013-05-28 14:55:29 +02:00
Alessio Morale
f16844537f Merge remote-tracking branch 'origin/amorale/OP-968_hitl_button_size' into next 2013-05-28 12:01:13 +02:00
Alessio Morale
e521bf03e9 Merge remote-tracking branch 'origin/amorale/OP-761_uav_position_for_cc' into next 2013-05-28 12:00:10 +02:00
Mathieu Rondonneau
854d976a7d OP-958: Go through the list of enumerated devices, and try to open the device until end of the list. 
Leave if we open one with success.
 2013-05-27 18:52:27 -07:00
Oleg Semyonov
0512ca79ef OP-770: export GCS branch dirty state and short UAVO hash 2013-05-28 04:14:54 +03:00
Oleg Semyonov
208278a7cb OP-770: use VersionInfo::uavoHash() instead of dynamic string 2013-05-28 02:42:24 +02:00
Fredrik Arvidsson
316afefff7 OP-906 Changed defaults for Stabilization settings and Flight modes. 2013-05-27 22:25:17 +02:00
Fredrik Arvidsson
cc14dac819 Merge remote-tracking branch 'origin/next' into thread/OP-770_UAV_Export_Version_Info_Fix 2013-05-27 21:11:30 +02:00
Fredrik Arvidsson
94d38a4b48 OP-770 Updates version info code used in AUV settings export file. 2013-05-27 20:42:56 +02:00
Alessio Morale
1e4262b309 OP-926 Fix huge tab height on kde due to wrong telemetrymonitorwidget size. 
Patch from Noxs, more details here: http://git.openpilot.org/cru/OPReview-486

+review OPReview-486
 2013-05-27 19:55:25 +02:00
Fredrik Arvidsson
d9d2b7d167 Merge remote-tracking branch 'origin/os/OP-770_version_info_stuff' into thread/OP-770_UAV_Export_Version_Info_Fix 2013-05-27 19:30:18 +02:00
Brian Webb
50162333d8 Merge remote-tracking branch 'origin/dankers/minor-modem-renames' into next 2013-05-27 09:44:17 -07:00
Alessio Morale
6df6ec20a4 OP-761 fix constants type+ 
+review OPReview-487
 2013-05-27 00:23:18 +02:00
Alessio Morale
6f32ff3f68 OP-968: HITL Simulation gadget has fixed size buttons and button text gets truncated in French translation 
+review OPReview
 2013-05-27 00:06:24 +02:00
Alessio Morale
6e277906e2 OP-761 Fix visualization of UAV GPS coordinates for CC/CC3D 
When positionActual is (0,0,0) uses GPS position as the UAV position

+review OPReview
 2013-05-26 19:43:28 +02:00
Brian Webb
e9f83bcc80 Fixes a bug in the rfm22b driver that was reading past the end of the bindings list when receiving a status message. Also adds some formatting changes that came about after doing a make uncrustify_all. 2013-05-26 08:36:38 -07:00
David Ankers
9f44e588f7 Rename USB Constants that map product to PID, changes PipX to OPLM 2013-05-26 16:37:33 +10:00
David Ankers
9cc314f7db Remove Rawhid folder, replaced by OPHid from Mathieu, Richard and Voha 2013-05-26 16:29:33 +10:00
Mathieu Rondonneau
f62391028a OP-958: Add function header doc and give credit to Richard (not mentionned in a previous commit). 
I gorgot to mention that the following commit was a patch from Richard.
Thanks to richard for suggesting this patch.

commit 45e18127a3
Author: Mathieu Rondonneau <Mathieu.Rondonneau@gmail.com>
Date:   Sat May 25 08:06:41 2013 -0700

    OP-958: adding patch for map to use proper lock mechanism.
 2013-05-25 19:08:53 -07:00
Oleg Semyonov
444431579e OP-770: add/rename some version-info.py template variables 2013-05-25 23:02:29 +02:00
Mathieu Rondonneau
4b46251ff1 Merge branch 'Mathieu/OP-958_HID_plugin_basic_cleanup' into next 2013-05-25 13:42:15 -07:00
Mathieu Rondonneau
45e18127a3 OP-958: adding patch for map to use proper lock mechanism. 2013-05-25 08:06:41 -07:00
Fredrik Arvidsson
917d3ebbd8 Merge branch 'thread/OP-970_Revo_Radio_Warning' into next 2013-05-25 12:05:31 +02:00
Fredrik Arvidsson
d492d3e14e OP-970 Fixes a problem with the Radio/Modem warning dialog showing up on board connection. 2013-05-25 12:04:50 +02:00
Richard Flay (Hyper)
911352d8a7 Merge branch 'next' into amorale/OP-960_systemhealt_warning 2013-05-25 17:19:58 +09:30
Richard Flay (Hyper)
e8f14b3718 Merge branch 'next' into amorale/OP-960_systemhealt_warning 2013-05-25 17:14:04 +09:30
Fredrik Arvidsson
3c55485d88 OP-970 Removes a comma. 2013-05-25 09:43:59 +02:00
Fredrik Arvidsson
03a2e82ba3 OP-970 Adds antenna warning dialog when activating built in modem for Revolution. 2013-05-25 09:42:26 +02:00
Mathieu Rondonneau
13beee32af OP-958: Fixing issue due to renaming. 2013-05-24 19:22:19 -07:00
a*morale
667c717e68 OP-958 Fixed a connection problem due to missing qRegisterMetaType for USBPortInfo 2013-05-25 03:10:23 +02:00
Oleg Semyonov
b00e25c393 OP-958: fix opHID file name case for linux 2013-05-25 03:50:24 +03:00
Oleg Semyonov
3757c8e391 OP-958: uncrustify sources 2013-05-25 02:52:33 +03:00
Oleg Semyonov
0f33a16ed8 OP-958: rename opHID plugin directory to lower case (same as all other plugins) 2013-05-25 02:51:50 +03:00
Oleg Semyonov
5ee36070e3 OP-958: usbmon.h: remove superfluous #ifdef 2013-05-25 02:51:40 +03:00
Oleg Semyonov
9474550351 OP-958: usbmon_mac: remove unused code 2013-05-25 02:51:31 +03:00
Oleg Semyonov
d1dd944bc3 OP-958: uncrustify sources 2013-05-25 02:51:20 +03:00
Oleg Semyonov
f6d2f152b9 OP-958: windows/hid.c: fix file mode (was executable) 2013-05-25 02:51:05 +03:00
Oleg Semyonov
c10932b457 OP-958: move hidapi.h under library root to stop uncrustification 2013-05-25 02:50:52 +03:00
Oleg Semyonov
f61340f30a OP-958: do not uncrustify hidapi library (add .no-auto-format file) 2013-05-25 02:50:28 +03:00
Voha
3b7c6eaa5f *[mac only] definition usb devices made ​​in an additional thread 2013-05-24 21:53:35 +03:00
Corvus Corax
1353be6cb0 Merge branch 'next' into corvuscorax/OP-947_stateestimator-module 2013-05-24 19:33:27 +02:00
Mathieu Rondonneau
ccc7e4a0ab OP-958: fix cast. 
I am about to check-in something that I have not compiled :(
Will check build server to make sure it pass build and revert if needed.
 2013-05-23 19:33:54 -07:00
Alessio Morale
1d0c18ebcd Applied hidapi branch iokit_path from https://github.com/mrpippy/hidapi.git 2013-05-23 22:52:26 +02:00
Fredrik Arvidsson
cfaeead5b3 OP-935 Adds tool-tips for the majority of the settings in the Stabilization screen. 2013-05-23 21:26:43 +02:00
Corvus Corax
9b95af2006 refaktored GPS Sensor UAVObjects 2013-05-22 22:36:23 +02:00
Corvus Corax
b56de3b66b filterchain rework 2013-05-22 21:26:18 +02:00
Mathieu Rondonneau
bfcb608b82 OP-958: More cleanup and handle some corner cases: 
- retry discovery 5 times max before giving up.
   - open the last hid device in the list in case there are several hid device of the same vid.
   - remove structure and move handle to class.
 2013-05-21 21:04:44 -07:00
Mathieu Rondonneau
4b68c6da74 OP-958: adding clearer message regarding the requirement for libusb-1.0.0 dev package: 
- break the build nicely telling the user to install the dev library package.
 2013-05-21 20:10:37 -07:00
Mathieu Rondonneau
3ec742f540 Merge branch 'next' into Mathieu/OP-958_HID_plugin_basic_cleanup 2013-05-21 19:09:20 -07:00
Mathieu Rondonneau
133a801dc5 OP-958: fix compiler error (showing on bambo) 2013-05-21 19:06:48 -07:00
Mathieu Rondonneau
c3033ece11 OP-958: add usb.h include only for linux 2013-05-21 09:00:50 -07:00
Mathieu Rondonneau
ec42669787 Merge branch 'amorale/OP-958_HID_plugin_basic_cleanup' into Mathieu/OP-958_HID_plugin_basic_cleanup 2013-05-21 08:22:33 -07:00
Alessio Morale
3b6ce9dbc3 OP-958 Fix compilation issues on Windows platform 2013-05-21 15:16:56 +02:00
Alessio Morale
2e3e5be053 OP-960 Fixed spacing 
+review OPReview-481
 2013-05-21 08:29:35 +02:00
Alessio Morale
81e10c9d1b OP-960 Prevent a warning to appear each time an alarm not in svg is received 
+review OPReview
 2013-05-21 00:47:22 +02:00
Fredrik Arvidsson
3d04238a00 OP-957 Removed I-Term settings for Attitude mode on Basic stabilizations tab. 2013-05-20 22:54:42 +02:00
Corvus Corax
0183996702 added missing uavobject in GCS 2013-05-20 18:51:52 +02:00
Mathieu Rondonneau
6e909f0dcf OP-958: HID plugin basic cleanup: 
- minor forgotten cleanup.
 2013-05-20 02:46:45 -07:00
Corvus Corax
1236bf3ed9 renamed Magneto to Mag 2013-05-20 10:33:02 +02:00
Corvus Corax
49b8e0d699 Merge branch 'next' into corvuscorax/OP-946_refaktor_sensor_and_state 2013-05-20 10:07:55 +02:00
Mathieu Rondonneau
d2244d83d1 OP-958: GCS HID plugin basic cleanup: 
- new plugin (opHID) to deprecate old one (rawhid).
- remove pjrc HID api implementation.
- add hidapi library taken from https://github.com/signal11/hidapi.git (copied files, the lib is not compiled from its git repo).
- history of those files is broken (cp instead of git mv) but the history is all in rawhid plugin.
- mac and windows not tested yet.
 2013-05-19 21:49:53 -07:00
Oleg Semyonov
a408d9748c Uncrustification 2013-05-20 00:02:34 +03:00
Fredrik Arvidsson
864300d975 OP-893 Added Auto Update functionality to the firmware page. 2013-05-19 23:00:44 +02:00
Corvus Corax
d97934cf86 Merge branch 'next' into corvuscorax/OP-946_refaktor_sensor_and_state 2013-05-19 22:05:48 +02:00
Sexy Pony
900f643bbd Reformat source code with 'make uncrustify_all' run twice. NO CODE CHANGES 2013-05-19 17:37:30 +03:00
Oleg Semyonov
97b4433a36 Merge remote-tracking branch 'origin/thread/OP-955_Version_Info_Improvements' into next 2013-05-19 15:22:55 +02:00
Corvus Corax
f630351c75 Merge branch 'next' ... 2013-05-19 12:17:40 +02:00
Corvus Corax
daf329d8f5 uncrustification (again) 2013-05-19 11:38:18 +02:00
David Ankers
f6cedeaaf6 Add John Pike and Rick King to contributors, rename Authors Tab to Contributors, the GCS lists all people that have helped OP, not just GCS authors. 2013-05-19 15:31:59 +10:00
David Ankers
915b7857f6 Changed the word maiden to the word first, easier to read and makes more sense for people that use English as a second language 2013-05-19 14:58:57 +10:00
David Ankers
2abcef1071 Changed aircraft word to controller as per Pablo. 2013-05-19 14:57:40 +10:00
David Ankers
3d2f62f014 Removed the CopterControl wording from the bis calib screen om the wizard, this page will be used for the Revo also 2013-05-19 14:55:39 +10:00
Oleg Semyonov
5274a6c6fa OP-955: rename version_info related files an directories 2013-05-18 20:28:52 +02:00
Corvus Corax
5284195c29 Refaktored sensor and state UAVObjects consistently into XXYSensor and XXYState 2013-05-18 19:36:45 +02:00
Fredrik Arvidsson
62ee55fbb8 OP-955 Moved generated version info to its own lib. Updated code using version info in all referenced places. 2013-05-18 14:28:46 +02:00
Corvus Corax
80caceb984 make uncrustify_all;make uncrustify_all; 2013-05-18 14:17:26 +02:00
Fredrik Arvidsson
eedfb7081c Merge remote-tracking branch 'origin/next' into thread/OP-935_Changes_Basic_Stab 2013-05-14 20:54:44 +02:00
Fredrik Arvidsson
c4adede7ac OP-952 Adds settings per scope-plot if to draw the plot anti-aliased. Default setting is true. Adds a fix to not render the plots when they are not visible. Saves CPU. 2013-05-13 21:24:19 +02:00
Fredrik Arvidsson
0bc589956b OP-935 Removed a chewing gum that was stuck under the about dialog ;) 2013-05-12 16:00:02 +02:00
Fredrik Arvidsson
49af941813 OP-935 Sets the correct background color of some configuration pages. 2013-05-12 15:44:15 +02:00
Fredrik Arvidsson
fee4e1009b OP-935 Removes gui for unimplemented temperature compensation calibration. 2013-05-12 11:53:21 +02:00
Fredrik Arvidsson
ddf2ccf720 OP-935 Fixes some gui issues. 2013-05-12 11:28:09 +02:00
Fredrik Arvidsson
3b7c274c78 OP-935 Renames 'Camera stab' to 'Gimbal'. Adds functionality to store-clear and recall board rotation during calibration. 2013-05-12 11:27:12 +02:00
Fredrik Arvidsson
7a727f5496 OP-935 Changes order of setting groups on Advanced tab in Stabilization settings page. 2013-05-07 20:56:02 +02:00
Fredrik Arvidsson
914724d8c8 OP-935 Adds limits to Responsiveness settings. 2013-05-07 20:39:58 +02:00
Fredrik Arvidsson
23bc774a03 Merge remote-tracking branch 'origin/next' into thread/OP-935_Changes_Basic_Stab 2013-05-06 22:48:57 +02:00
Corvus Corax
39fe6beb4b Merge branch 'corvuscorax/Attitude-fixes' into next 
Conflicts:
	flight/libraries/insgps13state.c
	flight/modules/Attitude/revolution/attitude.c
 2013-05-05 23:09:07 +02:00
Fredrik Arvidsson
18798470f8 OP-935 Adds a 'Instant Update' check box on Advanced tab of Stabilization configuration. 2013-05-05 22:20:48 +02:00
Fredrik Arvidsson
daee2de918 OP-935 Fixes Default settings button for Responsiveness on Basic page. 2013-05-05 21:28:34 +02:00
Fredrik Arvidsson
25fa8746e4 Merge remote-tracking branch 'origin/OP-596_GCSController_output_fix' into next 2013-05-05 18:59:49 +02:00
Fredrik Arvidsson
a334c49151 OP-935 Fixes the Instant Update functionality on the Stabilization settings pages in the configuration plugin. 2013-05-05 18:48:48 +02:00
Corvus Corax
946105cbe3 Merge branch 'next' into corvuscorax/Attitude-fixes 2013-05-05 17:44:59 +02:00
Fredrik Arvidsson
176bd3c4f7 OP-935 Adds Responsiveness sliders to basic stabilization screen. 2013-05-05 12:45:35 +02:00
Fredrik Arvidsson
4c0e5a39ca OP-935 Disables controls when no board is connected. Re-Factored the MixerCurve widget. 2013-05-04 00:13:15 +02:00
Fredrik Arvidsson
5c906802f1 Merge remote-tracking branch 'origin/next' into thread/OP-935_Changes_Basic_Stab 2013-05-03 08:01:14 +02:00
Corvus Corax
25c58ff074 Put all EKF initialisation values in a separate UAVObject EKFConfiguration, 
adapted insgps13state.c/.h,
modules/Attitude/revolution,
configrevowidget.cpp,
accordingly.
 2013-05-03 02:17:44 +02:00
Fredrik Arvidsson
1b1ed784c4 Merge remote-tracking branch 'origin/next' into thread/OP-935_Changes_Basic_Stab 2013-05-02 18:38:12 +02:00
Sambas
f7b9223827 Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext 
Conflicts:
	flight/modules/System/systemmod.c
	shared/uavobjectdefinition/taskinfo.xml
 2013-05-02 09:00:12 +03:00
Nuno Guedes
764412fd13 A few safety parameters added 
- added a small safety margin to keep the motors from spinning at 0% throttle
- added protection against weird values and values outside the margins
- some code style fixes added
 2013-05-01 23:22:41 +01:00
Corvus Corax
e7dc665c14 Reworked Variance Objects, Setting for initial EKF variance 2013-05-01 19:16:29 +02:00
Oleg Semyonov
9305ced139 Make uncrustify happy and prevent flip-flops 2013-05-01 20:07:07 +03:00
Fredrik Arvidsson
6d3407e4e4 OP-935 Adds shadow to the image on Revolution hardware page. 2013-05-01 18:18:30 +02:00
Corvus Corax
d77c690fe3 Merge branch 'next' into corvuscorax/Attitude-fixes 
Conflicts:
	flight/modules/Attitude/revolution/attitude.c
 2013-05-01 17:51:05 +02:00
Fredrik Arvidsson
11cb89930a Merge remote-tracking branch 'origin/next' into thread/OP-935_Changes_Basic_Stab 2013-05-01 16:16:16 +02:00
Fredrik Arvidsson
5cbf615566 Merge remote-tracking branch 'origin/next' into thread/OP-935_Changes_Basic_Stab 2013-05-01 13:39:32 +02:00
Oleg Semyonov
7032d2a9d6 Merge remote-tracking branch 'origin/next' into os/uncrustify-config 2013-05-01 13:31:38 +02:00
Fredrik Arvidsson
4e823874fb Merge remote-tracking branch 'origin/filnet/OP-907_gcs_vehicle_config_overhaul' into next 2013-05-01 13:01:55 +02:00
Fredrik Arvidsson
2d409188f8 OP-935 Adds checkbox for 'real time updates' to basic screen. Disables controls when no board is connected. 2013-05-01 12:59:07 +02:00
Oleg Semyonov
0394a3511c Rename template files to *.template to screen from uncrustify processing 2013-04-30 16:54:27 +02:00
Fredrik Arvidsson
a5f87bea62 Merge branch 'thread/OP-933_Config_Plugin_Tab_Selection' into next 2013-04-30 07:10:21 +02:00
Fredrik Arvidsson
7fd3b83b1c OP-933 Makes tab selection in Configuration plugin sticky between board connect - disconnect - connect. 2013-04-29 18:44:54 +02:00
Fredrik Arvidsson
360dd75d55 OP-816 Added Accel and Gyro bias calibration support for Revolution board. 2013-04-29 15:11:24 +02:00
Corvus Corax
6e2c9b3c46 New EKFStateVariance UAVObject with EKF state variance information 2013-04-28 19:38:37 +02:00
Corvus Corax
24af6b0d80 Handle Gyro bias the same way as other biases during calibration 2013-04-28 12:06:24 +02:00
sambas
38d9d5dde3 Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext 
Conflicts:
	flight/modules/VtolPathFollower/vtolpathfollower.c
 2013-04-28 09:46:14 +03:00
David Ankers
9914ab869d Fix minor spelling error in Revo calib screen 2013-04-28 16:06:36 +10:00
sambas
9fec3f5567 Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext 2013-04-27 13:39:58 +03:00
Fredrik Arvidsson
e1e3183c6d OP-816 Adding Revolution illustration to the connection diagram. 2013-04-27 11:22:08 +02:00
Oleg Semyonov
e2fd821e97 Merge remote-tracking branch 'origin/next' into sambas/diffnext 
Conflicts:
	make/common-defs.mk
 2013-04-26 16:31:19 +03:00
Oleg Semyonov
4718e666ee Merge remote-tracking branch 'origin/thread/OP-816_Setup_Wizard_Revo_Support' into next 2013-04-26 15:18:01 +03:00
sambas
abe3742217 Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext 
Conflicts:
	flight/Libraries/CoordinateConversions.c
	flight/Libraries/paths.c
	flight/Modules/System/systemmod.c
	flight/PiOS/STM32F4xx/pios_sys.c
	flight/targets/boards/coptercontrol/pios_board.h
	flight/targets/boards/revolution/pios_board.h
	flight/targets/boards/revoproto/pios_board.h
 2013-04-25 17:26:49 +03:00
Philippe Renon
6ff2b1873d OP-907 fixed regression in vehicle config : "dirty" state management 
was broken (continued).
 2013-04-25 00:07:06 +02:00
Philippe Renon
99c052651c OP-907 fixed regression in vehicle config : "dirty" state management 
was broken.
+ added comments
 2013-04-24 23:24:23 +02:00
Philippe Renon
d7596a64ff OP-907 reverted airframe.ui border from 9 to 12 to make it more consistent 
with other config tabs
 2013-04-24 22:05:31 +02:00
Oleg Semyonov
f9f721a76a Reset executable bits from non-executable files (Windows legacy) 2013-04-24 01:18:46 +03:00
Oleg Semyonov
fb207bdaf7 OP-896: rename SensorTest to RevoProto 2013-04-24 00:57:33 +03:00
Oleg Semyonov
406339eb49 Merge branch 'amorale/next_precheck' into os/OP-899_board-config-rework-rebased-3 
Conflicts:
	flight/Libraries/inc/op_dfu.h
	flight/Libraries/op_dfu.c
	flight/targets/Bootloaders/CopterControl/inc/op_dfu.h
	flight/targets/Bootloaders/OSD/op_dfu.c
	flight/targets/boards/coptercontrol/bootloader/inc/op_dfu.h
	flight/targets/boards/coptercontrol/bootloader/op_dfu.c
	flight/targets/boards/oplinkmini/bootloader/inc/op_dfu.h
	flight/targets/boards/oplinkmini/bootloader/op_dfu.c
	flight/targets/boards/osd/bootloader/inc/op_dfu.h
	flight/targets/boards/osd/bootloader/op_dfu.c
	flight/targets/boards/revolution/bootloader/inc/op_dfu.h
	flight/targets/boards/revolution/bootloader/op_dfu.c
	flight/targets/boards/sensortest/bootloader/inc/op_dfu.h
	flight/targets/boards/sensortest/bootloader/op_dfu.c
	make/boot-defs.mk
 2013-04-24 00:37:39 +03:00
Alessio Morale
57ca1639cc Merge branch 'amorale/amorale/OP-874_gcs_rescue_erase_settings_merged' into next 
Conflicts:
	flight/Libraries/op_dfu.c
	flight/PiOS/STM32F10x/pios_iap.c
	flight/PiOS/inc/pios_iap.h
	flight/targets/BootloaderUpdater/main.c
	flight/targets/Bootloaders/CopterControl/inc/op_dfu.h
	flight/targets/Bootloaders/CopterControl/op_dfu.c
	flight/targets/Bootloaders/OSD/inc/op_dfu.h
	flight/targets/Bootloaders/PipXtreme/op_dfu.c
	flight/targets/Bootloaders/RevoMini/inc/op_dfu.h
	flight/targets/Bootloaders/RevoMini/op_dfu.c
	flight/targets/Bootloaders/Revolution/inc/op_dfu.h
	flight/targets/Bootloaders/Revolution/op_dfu.c
	ground/openpilotgcs/src/plugins/uploader/uploader.ui
	make/apps-defs.mk
	make/boot-defs.mk
 2013-04-23 23:14:11 +02:00
Oleg Semyonov
399cafe7d7 OP-896: rename RevoMini to Revolution 2013-04-24 00:07:05 +03:00
Oleg Semyonov
6afbef01eb OP-896: rename Revo to SensorTest 2013-04-24 00:07:04 +03:00
Oleg Semyonov
1ded536056 OP-896: rename OPLink to OPLinkMini 2013-04-24 00:07:04 +03:00
Philippe Renon
4690949575 Merge remote-tracking branch 'origin/next' into filnet/OP-907_gcs_vehicle_config_overhaul 
Conflicts:
	ground/openpilotgcs/src/plugins/coreplugin/qml/AboutDialog.qml
 2013-04-22 22:56:06 +02:00
Philippe Renon
5f39206ebd OP-907 vehicle config - removed uncessary setupUI calls. 
+ fixed regression in multirotor config widget : svg display was not updated when switching frame type
+ formatting
 2013-04-22 21:23:47 +02:00
sambas
731ee3e19d Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext 
Conflicts:
	shared/uavobjectdefinition/manualcontrolsettings.xml
 2013-04-22 21:29:04 +03:00
Fredrik Arvidsson
538bedeb93 Merge remote-tracking branch 'origin/kevinv033/OP-791' into next 
Conflicts:
	ground/openpilotgcs/src/plugins/coreplugin/qml/AboutDialog.qml
 2013-04-22 20:14:05 +02:00
Fredrik Arvidsson
78d47e4185 Merge remote-tracking branch 'origin/filnet/OP-769_remove_hardcoded_en_locale' into next 2013-04-22 19:27:18 +02:00
Oleg Semyonov
927e952a9d Merge remote-tracking branch 'origin/os/OP-897_hide-unsupported-modes' into next 2013-04-20 21:23:00 +02:00
Nuno Guedes
7bfc0f7962 Code style fixes 
Had forgotten about the code style standards.
I hope it's more correct now.
 2013-04-20 18:31:35 +01:00
Nuno Guedes
8fef89d55c OP-596 - GCSController output Fix 
The GCSController widget now outputs the correct throttle range (0..1) on the ManualControlCommand.Throttle.

(Also, some empty lines cleaning.)
 2013-04-20 16:48:23 +01:00
Philippe Renon
b03ebbaf3a OP-907 step 4: added lazy creation of vehicle config widget 2013-04-18 03:51:47 +02:00
Philippe Renon
6fa3d88c23 Merge remote-tracking branch 'origin/next' into filnet/OP-907_gcs_vehicle_config_overhaul 2013-04-16 22:22:32 +02:00
Fredrik Arvidsson
9a9578a2a3 OP-816 Added page for Revolution calibration referring to the configuration plug-in until we get 'our ducks in a row' regarding the Revolution calibration procedure. 2013-04-16 20:40:25 +02:00
Fredrik Arvidsson
66b66ee8f4 OP-816 Re-factoring and removal of warnings. 2013-04-16 19:41:13 +02:00
Philippe Renon
0deb4d4a8f OP-907 vehicle config widgets now have consistent labels for mixer sliders 2013-04-16 00:13:08 +02:00
Philippe Renon
3bb80977d5 OP-907 changed vehicle config widget margin 2013-04-15 21:59:11 +02:00
Philippe Renon
dc060de5da OP-907 fixed minor spacing issue with multirotor mixer status line 2013-04-15 21:58:01 +02:00
Philippe Renon
70177a82d7 OP-907 changed grid lines of curve-bg.svg from dashed to solid to fix 
rendering artefacts cause by dashed lines
 2013-04-15 21:47:28 +02:00
Philippe Renon
c331a143ae OP-907 moved mixer curve background svg file (curve-bg.svg) to 
src/plugins/uavobjectwidgetutils as it is used from mixercurvewidget.cpp
located in that directory
 2013-04-15 21:43:04 +02:00
Fredrik Arvidsson
b237b85c42 Merge remote-tracking branch 'origin/next' into thread/OP-816_Setup_Wizard_Revo_Support 2013-04-15 20:20:00 +02:00
sambas
ab8ab4bcc6 Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext 2013-04-15 17:41:06 +03:00
Philippe Renon
81da5303f2 OP-907 step 3: more vehicle config code cleanups 2013-04-14 22:12:15 +02:00
Fredrik Arvidsson
361f8397c9 OP-885 Fixed some code formatting issues. 2013-04-14 13:24:07 +02:00
Fredrik Arvidsson
471afde5f8 Merge remote-tracking branch 'origin/next' into thread/OP-885_Update_Boards_Artwork 
Conflicts:
	ground/openpilotgcs/share/share.pro
 2013-04-14 11:30:40 +02:00
sambas
589290dbd7 POI orbit + some code run thru code formatter 2013-04-14 12:23:47 +03:00
sambas
6989468d17 Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext 
Conflicts:
	.gitignore
 2013-04-14 10:13:51 +03:00
Philippe Renon
782913590b OP-907 step 4: vehicle config UI cleanups 2013-04-13 17:58:12 +02:00
Philippe Renon
357f36a06d OP-907 step 4: vehicle config UI cleanups 2013-04-13 17:58:11 +02:00
Philippe Renon
80b658cebf OP-907 step 3: vehicle config code formatting cleanups 2013-04-13 17:58:11 +02:00
Philippe Renon
3520a7c055 OP-907 step 3: more vehicle config code cleanups 2013-04-13 17:58:10 +02:00
Philippe Renon
14a0da076d OP-907 step 3: cleaned up configvehicletypewidget.cpp + related cleanups 2013-04-13 17:58:09 +02:00
Philippe Renon
e141e75e9f OP-907 step 3: cleaned up configvehicletypewidget.cpp + related cleanups 2013-04-13 17:58:09 +02:00
Philippe Renon
2d1af680a0 OP-907 step 3: cleaned up configvehicletypewidget.cpp + related cleanups 2013-04-13 17:58:08 +02:00
Philippe Renon
90b0c5ca21 OP-907 step 3: cleaned up vehicleconfig.h + related cleanups 2013-04-13 17:58:07 +02:00
Philippe Renon
3ab96ed3cc OP-907 step 2: moved vehicle specific code to respective vehicle widget 2013-04-13 17:58:03 +02:00
Philippe Renon
b190b898f1 OP-907 step 1: merged ccpm.ui into airframe_ccpm.ui 2013-04-13 17:57:57 +02:00
Philippe Renon
ccb285dd38 OP-907 step 1: renamed MultirotorRevMixercheckBox to MultirotorRevMixerCheckBox 2013-04-13 17:57:48 +02:00
Philippe Renon
b27bc03ef5 OP-907 step 1: extract vehicle specific UIs from airframe.ui (merged next) 2013-04-13 17:42:13 +02:00
Philippe Renon
0d3e00134a OP-907 step 1: extract vehicle specific UIs from airframe.ui 2013-04-13 17:41:18 +02:00
Kevin Vertucio
1e2e93b8c0 OP-791 FIXED issue where Flickable web view would need to be dragged to scroll content 
Replaced Flickable component with ListView for the Authors list.

Signed-off-by: Kevin Vertucio <kevinv033@gmail.com>
 2013-04-13 16:35:22 +02:00
Fredrik Arvidsson
cc9c02ab4f Merge remote-tracking branch 'origin/next' into thread/OP-816_Setup_Wizard_Revo_Support 2013-04-12 11:23:42 +02:00
Fredrik Arvidsson
860077c428 OP-816 Added Revolution specific configuration code to Setup Wizard. 2013-04-11 21:25:38 +02:00
Brian Webb
28bfc2725c Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS 2013-04-11 14:42:49 +01:00
Brian Webb
8f51610776 Fixed some formatting issues. 2013-04-11 14:41:24 +01:00
Alessio Morale
3f88a64cf3 OP-874 UI does not relies on enabled state but set button state at widget initialization, fixes for styles 
+review OPReview-421
 2013-04-08 23:55:11 +02:00
Alessio Morale
cc446260a7 OP-874 Enable the Erase Setting button only with BL ver >=4. Describe this this on the tooltip. 
+review OPReview-421
 2013-04-08 01:31:29 +02:00
Alessio Morale
09d2ba1d25 OP-874 merge of amorale/OP-874_gcs_rescue_erase_settings in next. 
+review OPReview-421
 2013-04-08 01:10:37 +02:00
Oleg Semyonov
1b8c3ee7bb OP-897: fix spacing +review OPReview-438 2013-04-08 01:58:48 +03:00
Philippe Renon
50e66d6ee3 OP-769 initial cleanups related to language setting 2013-04-07 23:04:40 +02:00
Philippe Renon
f6c94687fc OP-879 removed now unused importsettings dialog 2013-04-07 22:28:13 +02:00
Philippe Renon
030cab376e OP-879 move loading of factory default settings earlier 
(i.e. before any access to settings).
In other words, factory default are now loaded from
main.cpp instead of from mainwindow.cpp
+ minor formatting cleanups
 2013-04-07 22:25:10 +02:00
sambas
24f1362cfe Merge remote-tracking branch 'origin/next' into sambas/diffnext 2013-04-07 18:21:59 +03:00
Fredrik Arvidsson
580b3f771e Merge remote-tracking branch 'origin/next' into thread/OP-816_Setup_Wizard_Revo_Support 2013-04-07 17:21:14 +02:00
Brian Webb
081c016dfa Added braces around if body. 2013-04-07 16:04:24 +01:00
Oleg Semyonov
1eb6e3fd96 Merge remote-tracking branch 'origin/next-fixed-eol' into next 2013-04-07 15:41:26 +02:00
Fredrik Arvidsson
ee130b6892 Merge branch 'next' into thread/OP-816_Setup_Wizard_Revo_Support 
Conflicts:
	ground/openpilotgcs/src/plugins/uploader/uploadergadgetwidget.cpp
 2013-04-07 12:02:35 +02:00
Fredrik Arvidsson
9d53b68ab8 OP-816 Added settings enums for GPS and Revolution Radio modem. 
Added basic hardware settings implementation for Revolution board.
 2013-04-07 11:52:33 +02:00
Fredrik Arvidsson
5dc467bda4 Fixed a copy&paste bug in configoutputwidget.cpp resulting in output rate for bank 5 & 6 not showing correctly in gui. 2013-04-07 11:15:24 +02:00
sambas
33bb918924 Merge remote-tracking branch 'origin/next' into sambas/diffnext 2013-04-07 09:51:18 +03:00
sambas
fb8273459f Normalize line endings 2013-04-07 09:49:13 +03:00
Brian Webb
2ade9abcff Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS 2013-04-07 03:29:39 +01:00
Alessio Morale
b5426aa761 Merge remote-tracking branch 'origin/amorale/OP-871_gcs_revo_reset_fix' into next 2013-04-06 19:59:03 +02:00
Oleg Semyonov
f260b2f568 OP-897: remove non-user-selectable modes from GCS dropdown lists 
Now all unsupported options are disabled. They will be reenabled when
ready for end users. Still developers can set them using UAVObjBrowser.

As a side effect, a bit changed UAVO XML definitions. The "limits"
option now uses comma to separate rules, semicolon to separate elements.
Was vice versa.

OP-897 #resolve #comment Pushed for review
+review OPReview
 2013-04-06 19:01:12 +03:00
Brian Webb
ee96890b96 Initialize the Radio configuration widgets in the Revo HW configuration page correctly. 2013-04-06 16:59:03 +01:00
Brian Webb
4564718708 Added setting of max RF power and initial frequency on Revo. 2013-04-06 04:28:25 +01:00
Brian Webb
948038f655 Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS 2013-04-06 01:32:36 +01:00
Brian Webb
c330db3a28 Added setting of min/max frequencies on OPLink coordinator. 2013-04-06 01:32:15 +01:00
Oleg Semyonov
5bb6b56b4a OP-772: Normalize line endings 2013-04-05 23:46:56 +03:00
Kevin Vertucio
9c00fdcd31 removed dependency for QtWebKit in AboutDialog.qml 2013-04-04 07:04:14 -04:00
Fredrik Arvidsson
a338257b2d OP-885 Added configuration for Zagi 3D model. Changed some rendering attributes and changed the name of Revomini to Revolution. 2013-04-03 19:56:41 +02:00
Fredrik Arvidsson
a697f293b6 OP-885 Added and replaced some artwork for Revolution board and other. 2013-04-02 19:43:19 +02:00
sambas
47a7659147 Merge remote-tracking branch 'remotes/origin/next' into sambas/diffnext 2013-04-02 20:40:41 +03:00
sambas
4240cc9670 Flight battery to AerosimRC, needs option flag, currently linked to baroaltitude option 2013-04-02 19:29:07 +03:00
Oleg Semyonov
3e815ca8d5 build: get rid of build/ground subdirectory, fix qt-creator builds 
This changeset:
- moves all ground targets one level up, under build directory. The
  build/ground was created as a workaround, now unnecessary;
- fixes QtCreator builds, they are separated from command line builds;
- moves GCS autogenerated files into openpilotgcs-synthetics directory.

The resulting build subdirectory now looks like:

    build
        openpilotgcs             <- Qt-Creator build directory
        openpilotgcs-synthetics  <- version-info and opfw_resource
        openpilotgcs_debug
        openpilotgcs_release     <- Makefile build directory
        uavobject-synthetics
        uavobjgenerator

NOTE: you should update the shadow build path in QtCreator to build,
      not build/ground as before.

+review OPReview
 2013-03-30 17:33:38 +02:00
Brian Webb
2568f41cf3 Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS 2013-03-30 01:18:37 +01:00
Brian Webb
1cac81b3e8 Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS 
Conflicts:
	flight/targets/PipXtreme/System/inc/pios_config.h
	flight/targets/RevoMini/System/inc/pios_config.h
 2013-03-29 17:17:55 -07:00
Oleg Semyonov
4be3cd4978 Merge remote-tracking branch 'origin/amedee/OP-882' into next 2013-03-29 10:44:47 +02:00
sambas
c60a750d96 AeroSimRC plugin fixes and updates 2013-03-28 18:30:14 +02:00
sambas
5ded8c6dfc VTOL path fixes 
Flight mode fixes
POI mode
AutoLand Tests
Simple stabilization Shortest way yaw fix
GCS map and pathplanner fixes
 2013-03-28 18:29:26 +02:00
Oleg Semyonov
beb13b32a9 OP-883: The 1st cleanup pass through PIOS and Makefiles system 2013-03-28 11:26:34 +02:00
Fredrik Arvidsson
c549218873 Fixed a bug related to the FusionAlgorithm selection in Revolution configuration. 2013-03-27 13:09:48 +01:00
Fredrik Arvidsson
0adb2b5b6f Merge remote-tracking branch 'origin/filnet/OP-853_fix_HITL_Options_page' into next 2013-03-27 11:09:52 +01:00
Fredrik Arvidsson
0d87f7509f Merge remote-tracking branch 'origin/filnet/OP-857_various_gcs_ui_polishing' into next 2013-03-27 11:08:52 +01:00
Fredrik Arvidsson
8423681d41 Merge remote-tracking branch 'origin/filnet/OP-833_gcs_options_dialog_ui_polishing' into next 2013-03-27 11:07:52 +01:00
Philippe Vanhaesendonck
8625eba054 Fix for OSX Lions compiler 
OSX 10.7 and above will need the -fpermissive flag to compile
 2013-03-26 22:57:08 +01:00
Philippe Renon
f00a972e0e OP-833 cleaned up individual gadget options pages: dial and linear dial 2013-03-24 17:09:59 +01:00
Philippe Renon
eef25f4e9d OP-857 OP-876 fixed regression introduced while fixing this issue 
(settings were not handled well anymore)
- added timing debug messages
- minor cleanups
 2013-03-24 16:50:17 +01:00
Oleg Semyonov
0957bbb498 Makefile: split GCS build directory into debug and release 
Now by default GCS is built for release.
AeroSimRC also is placed under misc (as it is installed on Windows).
 2013-03-24 13:06:13 +02:00
Oleg Semyonov
4082b1498a Makefile: move opfw_resource rules from packaging to top Makefile 
opfw_resource make target now depends on built firmware images. They are
referenced directly from Qt resource file generated. No extra copies
are now necessary.
 2013-03-24 13:06:11 +02:00
Brian Webb
2b6345850b Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS 2013-03-24 00:58:41 +01:00
Fredrik Arvidsson
510a7d70ad Merge remote-tracking branch 'origin/next' into thread/OP-816_Setup_Wizard_Revo_Support 2013-03-23 16:38:26 +01:00
Alessio Morale
9244b511ac Merge branch 'amorale/OP-872_OP-867_thread-Config_revo_support' into next 2013-03-23 13:12:43 +01:00
Alessio Morale
2f2499f8c4 OP-867 fixed intentation 2013-03-23 13:10:57 +01:00
Philippe Renon
8af1af6afa OP-833 cleaned up individual gadget options pages 2013-03-21 01:26:29 +01:00
Philippe Renon
5b648d1f33 OP-853 new HITL options page had last tab selected by default (now it is 
the first)
 2013-03-20 21:32:06 +01:00
Philippe Renon
8c499aad7a OP-853 fixed badly broken HITL Options page (not perfect but better than 
previous version)
 2013-03-19 22:23:20 +01:00
Philippe Renon
e39f70536b OP-857 OP-876 fixed issue that prevented default size of Options dialog 
to be taken into account on 1st launch of GCS (with no user settings)
 2013-03-19 22:10:47 +01:00
Philippe Renon
23077d3326 OP-857 OP-876 fixed issue that prevented default size of Options dialog to 
be taken into account on 1st launch of GCS (with no user settings)
 2013-03-19 22:08:40 +01:00
Kevin Vertucio
45a3bb975c OP-791 FIXED issue where Flickable web view would need to be dragged to scroll content 
Replaced Flickable component with ListView for the Authors list.

Signed-off-by: Kevin Vertucio <kevinv033@gmail.com>
 2013-03-19 10:14:50 -04:00
Philippe Renon
936f851166 Merge remote-tracking branch 'origin/thread/OP-864_Remove_Configuration_Prompt' into filnet/OP-857_various_gcs_ui_polishing 2013-03-19 04:34:32 +01:00
Philippe Renon
90fbf9bdab OP-833 removed unused ConfigGadgetConfiguration and 
ConfigGadgetOptionsPages classes
 2013-03-17 19:34:33 +01:00
Fredrik Arvidsson
73d61f810a Merge branch 'next' into thread/OP-816_Setup_Wizard_Revo_Support 2013-03-16 08:53:04 +01:00
Alessio Morale
5ca228ebce Merge branch 'amorale/OP-872_HandleAllOutputs' into thread/OP-867_Config_Revo_Support 
+review OPReview
 2013-03-14 23:34:48 +01:00
Alessio Morale
dfb69e1b17 Merge remote-tracking branch 'origin/kevinv033/OP-791' into next 2013-03-14 21:36:44 +01:00
Alessio Morale
be8e5d159b OP-872 handle all outputs for CC/CC3D and Revolution 2013-03-14 20:13:02 +01:00
Alessio Morale
3f98676a3b OP-871 Fix: it is not possible to halt a Revo board in firmware update page 
+review OPReview
 2013-03-13 03:24:25 +01:00
Brian Webb
10de32d6f6 Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS 2013-03-13 01:41:01 +01:00
Philippe Renon
ef72e13a18 OP-857 OP-860 minor improvments to the connection widget 
- made it wider so it can at least display the string "USB: CopterControl"
- added a tooltip to the connection combo box that will display the
  currently selected connection
  - other minor code cleanups
 2013-03-12 22:43:11 +01:00
Philippe Renon
9b495b4d5e OP-857 OP-869 fixed style sheet issues: 
- removed wide style sheets
- added style sheet common to all platforms
- fixed broken styles for QTabWidget and QGroupBox on Windows
- fixed broken style for QTabWidget on Linux
 2013-03-12 22:43:10 +01:00
Alessio Morale
86c525b2d3 Merge remote-tracking branch 'origin/thread/OP-856_Revolution_HW_Settings' into next 
Conflicts:
	ground/openpilotgcs/src/plugins/config/config.pro
 2013-03-12 19:59:07 +01:00
Fredrik Arvidsson
b21517cd87 OP-867 Code cleanup. Added missing combo boxes to 'dirty pool'. 2013-03-12 07:35:20 +01:00
Brian Webb
d5795b2118 Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS 2013-03-12 01:36:34 +01:00
Fredrik Arvidsson
f27a69802d OP-867 Added output rate settings for revolution. 2013-03-11 23:22:10 +01:00
Alessio Morale
6b6a3bcd9f Merge remote-tracking branch 'origin/thread/OP-864_Remove_Configuration_Prompt' into next 2013-03-11 21:15:30 +01:00
Kevin Vertucio
22c966711d added autogenerated version info file 
Signed-off-by: Kevin Vertucio <kevinv033@gmail.com>
 2013-03-11 15:35:08 -04:00
Philippe Renon
21c581bacd OP-833 minor options page cleanup: removed some uneeded separator lines 2013-03-10 21:02:00 +01:00
Fredrik Arvidsson
e0bd933baa OP-856 Changed USB GUI. Changed the rules for validation of configurations. 2013-03-10 18:51:15 +01:00
Brian Webb
6e7e2d39f3 Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS 2013-03-10 15:54:08 +01:00
Oleg Semyonov
f1214df633 OP-792: Remove unused yet GUI in addition to flight modes 
This reverts commit 0e9d7137ff.

Conflicts:
	ground/openpilotgcs/src/plugins/config/configgadgetwidget.h

OP-792 #comment Now this feature is removed from GUI too
 2013-03-10 00:57:41 +02:00
Philippe Renon
96a1e1d8c9 OP-857 OP-859 fixed various glitches in Commmunity panel: 
Show three lines of news instead of one;
Fixed improper eliding of news text;
Moved News scroll bar to the right so it won't overlap the news text;
Removed clipping in Sites panel that caused the Os to be clipped.
 2013-03-09 17:32:46 +01:00
Philippe Renon
31e3e73799 OP-857 OP-858 Added space between name and unit in Scope gadget legend 2013-03-09 17:32:45 +01:00
Philippe Renon
1859fd4ca5 OP-833 minor options page cleanup: removed some uneeded separator lines 2013-03-09 17:26:40 +01:00
Brian Webb
e70f0f2c21 Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS 2013-03-09 01:43:46 +00:00
Kevin Vertucio
98e12d192a removed extraneous commented code 
Signed-off-by: Kevin Vertucio <kevinv033@gmail.com>
 2013-03-08 11:25:57 -05:00
Alessio Morale
ffbb0a5a8e Merge remote-tracking branch 'origin/amorale/op-848_mpu6000_configurability' into next 2013-03-08 00:08:15 +01:00
Alessio Morale
c47ecd044e Merge branch 'filnet/OP-803_gadget_config_set_twice_on_restore' into next 2013-03-08 00:07:34 +01:00
Brian Webb
3a8c5494ca Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS 2013-03-07 13:57:51 +00:00
Alessio Morale
6a408e6a0a Merge branch 'filnet/OP-682_fix_for_crash_on_firmware_uploader_gadget' into next 2013-03-07 00:14:08 +01:00
Philippe Renon
1d9deae77d OP-682 fixed regression that prevented uploading of valid fw + renamed 
youdont check box to confirmCheckBox + minor cleanups
 2013-03-06 22:01:05 +01:00
Fredrik Arvidsson
b6746259c8 OP-864 Fixed some debug logging cosmetic problems. 2013-03-04 20:38:16 +01:00
Fredrik Arvidsson
82a89700e1 OP-864 Fixed sloppy errors (hopefully). 2013-03-04 18:36:23 +01:00
Fredrik Arvidsson
99ae18990e OP-856 Removed redundant code. Changed image of Revolution board to one with white PCB. 2013-03-04 08:04:55 +01:00
Fredrik Arvidsson
2cd3485cf6 OP-816 Fixed Revolution identification and Revolution + OPLink firmware auto-update functionality. 2013-03-03 19:33:24 +01:00
Fredrik Arvidsson
e2e3089cf5 OP-864 Made OpenPilotGCS.xml the default configuration on first start. If this file is missing for some reason the selection dialog will appear. The configuration can also be set as a command line option. 2013-03-03 16:56:52 +01:00
Fredrik Arvidsson
9e870e6ae3 OP-856 Added enabling/disabling of required modules depending on port configuration. Added rules for port configuration. 2013-03-03 14:17:37 +01:00
Kevin Vertucio
4c95e5c613 fixed indentation 
Signed-off-by: Kevin Vertucio <kevinv033@gmail.com>
 2013-03-01 09:13:32 -05:00
Kevin Vertucio
e4d516424e fixed indentation and clean up formatting 
Signed-off-by: Kevin Vertucio <kevinv033@gmail.com>
 2013-03-01 09:10:26 -05:00
Kevin Vertucio
c07142fa53 fixed some grammatical errors and formatting 
Signed-off-by: Kevin Vertucio <kevinv033@gmail.com>
 2013-03-01 08:59:02 -05:00
Kevin Vertucio
8a59b5c07a clean up formatting from review comments 
Signed-off-by: Kevin Vertucio <kevinv033@gmail.com>
 2013-03-01 08:53:04 -05:00
Fredrik Arvidsson
de026a13fc OP-856 Basic implementation of hardware settings page. 2013-02-28 08:13:21 +01:00
Fredrik Arvidsson
e710f3bb91 OP-856 Basic renaming from PRO to Revolution 2013-02-26 07:37:14 +01:00
Brian Webb
fff6e81e0b Merge remote-tracking branch 'origin/next' into brian/rfm22_FHSS 2013-02-24 23:11:39 +00:00
Brian Webb
d9baa372c7 Added frequency hopping to the RFM22B driver. Currently it defaults to 128 channels between 430 and 440 MHz. 2013-02-24 23:05:51 +00:00
Philippe Renon
ed83f282a5 OP-834 home location related error reporting improvments and comment 
cleanups
 2013-02-23 18:35:07 +01:00
Philippe Renon
8bd3c09860 OP-834 fixed bad Q_ASSERT around effective code 2013-02-23 18:35:07 +01:00
Philippe Renon
538723696a OP-834 restored "dead" code that was commented out by mistake 2013-02-23 18:35:07 +01:00
Philippe Renon
6d75dd0c6f OP-834 added FIXME comment for bad Q_ASSERT around effective code and 
commented out a bunch of dead code (that dead code includes the suspicious
Q_ASSERT uses)
 2013-02-23 18:35:07 +01:00
Philippe Renon
43786badfa OP-834 fixed bad Q_ASSERT around effective code 2013-02-23 18:35:07 +01:00
Philippe Renon
4350e48bfc OP-682 OP-850 fixed more uploader gadget crashes and button state issues 2013-02-21 01:34:17 +01:00
Philippe Renon
adc9c008c4 iOP-803 redid spurious commit in order to avoid undoing OP-805 (need to be 
more carefull or sleep more...)
 2013-02-18 22:28:09 +01:00
Brian Webb
cf7c929030 Added the ability to store bindings and configuration paramaters for multiple (up to 8) modems from an OPLink controller modem. 2013-02-18 01:49:13 +00:00
Brian Webb
46baec52ef Merge remote-tracking branch 'origin/next' into brian/rfm22_multibind 2013-02-17 01:21:12 +00:00
Alessio Morale
e27a07631e op-848 MPU6000 support user configurabe accel/gyro scales and filter bandwidth. 
board definitions can override any of this settings for special applications.
Also include cleanup from "magic numbers" and fix for inverted ranges
 2013-02-17 02:02:12 +01:00
Voha
6c24561ec4 * fix build error 2013-02-15 23:31:47 +01:00
Voha
8c5cded61a OP-845: *fix code style 2013-02-15 23:31:47 +01:00
Voha
e4f98b31c6 fix code style 2013-02-15 23:31:47 +01:00
Voha
427bbd0a80 fixed reading serial number from USB device on mac platform 2013-02-15 23:31:46 +01:00
Oleg Semyonov
790e771b54 Merge remote-tracking branch 'origin/laurent/translations' into next 2013-02-11 22:05:29 +02:00
Oleg Semyonov
c8ce31f7a9 Merge remote-tracking branch 'origin/next' into theothercliff/elevon_cam_stab 2013-02-11 01:03:33 +02:00
Brian Webb
57b4d8c720 RFM22: Added support for binding to multiple remove OPLinks. 2013-02-08 01:56:22 +00:00
Brian Webb
e50e645e7b Merge remote-tracking branch 'origin/next' into brian/oplink_ppm_out 2013-02-07 13:39:21 +00:00
Philippe Renon
69fb6f6de3 OP-833 gcs options dialog polishing: zeroed margin of top level widget 2013-02-06 23:27:05 +01:00
James Cotton
5e20705347 Windows copy data: Use the environmental $$(QTMINGW) variable to locate 
files to copy into the package.  This makes it more robust against various
relative locations of mingw and qt.

It may be necessary to move all SDL-related files (SDL.dll, static libraries
and include files) from, for instance, .\QtSDK\Desktop\Qt\4.8.1\mingw\bin
to .\QtSDK\mingw\bin to be found.

Conflicts:

	ground/gcs/copydata.pro
	ground/gcs/src/plugins/hitl/aerosimrc/src/plugin.pro
 2013-02-03 01:06:07 +02:00
Philippe Renon
3ab33cf163 OP-833 gcs options dialog polishing: 
- createOptionsPage() now returns NULL to avoid having empty page in
  Options dialog
- removed Gadget from gadget name
- added some TODOs for for further cleanups
 2013-02-02 16:09:53 +01:00
Philippe Renon
6b3e0c7ee3 OP-833 gcs options dialog polishing: zeroed margin of top level widget 2013-02-02 16:08:37 +01:00
Philippe Renon
03ca63978b OP-833 gcs options dialog polishing: 
- zeroed margin of top level widget
- chnaged size policy of scrollArea from Expanding to Minimum to get a
  tighter fit
 2013-02-02 16:06:13 +01:00
Philippe Renon
96651e302a OP-833 gcs options dialog polishing: zeroed margin of top level widget 2013-02-02 16:03:54 +01:00
Philippe Renon
d8ce755cfd OP-833 gcs options dialog polishing: 
- increased width of splitter handle from default (6) to 9
- removed bottom Line widget
 2013-02-02 15:58:47 +01:00
Brian Webb
a4faa22c4b Merge remote-tracking branch 'origin/brian/rfm22_autoconf' into next 
Conflicts:
	ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp
 2013-01-31 13:40:32 +00:00
Cliff Geerdes
6806e895cc First version. Passes simple tests. 2013-01-30 18:57:32 -05:00
filnet
d03db9c6d1 OP-803 remove spurious commit 2013-01-29 23:12:55 +01:00
filnet
3e9c819850 OP-803 more cleanups 2013-01-28 23:13:47 +01:00
filnet
e8659cf9d5 OP-682 added some comments 2013-01-26 15:10:30 +01:00
filnet
813aaf5d85 OP-682 fixed two crashes on firmware uploader gadget. 
crash 1 :  would happen when clicking Halt and then Boot as soon as the Boot button became enabled.
crash 2 : would happen when clicking Boot and then quickly pressing then Open button.
 2013-01-24 22:36:00 +01:00
Fredrik Arvidsson
3705a2d0a8 OP-786 Moved the actual file and the dependency to gcsversioninfo.pri to the /app sub project from the /plugins/coreplugin project. This was necessary since the new splash screen depends on defines in the generated gcsversioninfo.h header file. 
Changed position of the revision text to make it look nicer.
 2013-01-24 15:22:15 +01:00
Kevin Vertucio
bb999ae44f cleanup formatting 
Signed-off-by: Kevin Vertucio <kevinv033@gmail.com>
 2013-01-24 08:04:55 -05:00
Kevin Vertucio
0cfed60638 added OP Icon to About GCS Version tab 
Signed-off-by: Kevin Vertucio <kevinv033@gmail.com>
 2013-01-24 07:09:36 -05:00
Kevin Vertucio
63657c6586 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into kevinv033/OP-791 2013-01-23 22:09:40 -05:00
Alessio Morale
1a303aa85f Merge remote-tracking branch 'origin/next' into amorale/bigmerge 2013-01-23 19:47:32 +01:00
Kevin Vertucio
24068a6638 set dialog windowFlags for a frameless window. 
Signed-off-by: Kevin Vertucio <kevinv033@gmail.com>
 2013-01-22 14:05:02 -05:00
Kevin Vertucio
03ad1e55f5 converted "About Authors" and "About OpenPilot GCS" to QML 
added dependent QML files

Signed-off-by: Kevin Vertucio <kevinv033@gmail.com>
 2013-01-22 00:26:46 -05:00
filnet
a9d2679e39 OP-803 minor cleanups 2013-01-20 17:32:55 +01:00
Alessio Morale
f293298118 Merge remote-tracking branch 'origin/revo-fixes' into amorale/revo-merge 
Conflicts:
	flight/Modules/ManualControl/manualcontrol.c
	make/scripts/version-info.py
	package/Makefile.linux
 2013-01-19 20:23:48 +01:00
filnet
1e3aeaf988 OP-803 fix attempt 2013-01-16 23:43:22 +01:00
filnet
481005cc69 OP-803 transparent refactoring - moved specific save/restore code 
from SplitterOrView to UAVGadgetView and made some methods private
 2013-01-16 22:30:16 +01:00
Alessio Morale
de44495055 OP-796 defaults USE_PATHPLANNER to enabled 2013-01-14 01:28:33 +01:00
filnet
ae9def7f11 OP-805 - fixed GCS Options page crash by removing configurations for which 
an options page could not be created.
 2013-01-13 18:33:07 +01:00
Alessio Morale
635b1e98e4 OP-806 Fix mapwidget/uavitem.cpp to show CAS using AirspeedActual.CalibratedAirspeed 2013-01-12 16:57:28 +01:00
Alessio Morale
da76d775f9 OP-800 Remove WayointEditor as it was supeseed by PathActionEditor 2013-01-12 16:53:48 +01:00
Alessio Morale
a89a2cfb47 OP-801 replaced GetLLA with NED2LLA_HomeLLA 2013-01-11 01:11:07 +01:00
Alessio Morale
672519e559 OP-797 PFDGadgetWidget should use AirspeedActual.CalibratedAirspeed instead of BaroAirspeed 2013-01-11 01:11:07 +01:00
Alessio Morale
60eb36ab36 OP-799 removed Waypoint import export from uavsettingsimportexportfactory.cpp as it is handled by pathActionEditor 2013-01-11 01:11:06 +01:00
Alessio Morale
19c95a4f1b OP-798 uavobjectutil/devicedescriptorstruct.h miss a case for 0x903-revomini target 2013-01-11 01:11:06 +01:00
Alessio Morale
eaaad5edd1 OP-794 Revert "GCS Stabilization: Force the apply button to always be there as I can't find expert mode" 
This reverts commit 26408e286f.
 2013-01-11 01:10:11 +01:00
Brian Webb
be444db7f8 Added PPM output to OPLink firmware 2013-01-04 06:51:27 -07:00
Laurent Lalanne
c83bb4b450 My first commit... 
Rescan sources to get new strings to be translated,
Updated openpilotgcs_fr.ts, translation in progress,
Little changes in Qml files used in Welcome plugin : Titles translations with qsTr(), dont work in labels.
 2013-01-03 13:59:06 +01:00
filnet
a45578c250 OP-781: reorganized imports 2012-12-30 19:04:02 +01:00
filnet
d0447b5e06 OP-781: cleaned up; added comments; removed some debug code; fixed tabs 
into spaces
 2012-12-30 18:27:51 +01:00
Brian Webb
9f3d7a24f8 Merge branch 'revo-fixes' of ssh://git.openpilot.org/OpenPilot into brian/rfm22_autoconf 
Conflicts:
	flight/RevoMini/Makefile
 2012-12-30 07:59:09 -07:00
filnet
87632e6e13 OP-781: initial commit for slow Option Dialog creation fix; fix consists 
in lazilly creating option pages when user selects them instead of
creating them all upfront. Dummy placeholder widget (QLabel) are initially
created instead of the real option page; this commit also fixes a minor
issue where the left tree selection would not be in sync with the
displayed option page (see Jira for more details).
 2012-12-30 13:34:12 +01:00
Corvus Corax
37df2bcbf4 OP-742: Merge branch 'corvuscorax/airspeed_fixes' into revo-fixes 
Conflicts:
	flight/RevoMini/Makefile
 2012-12-29 12:09:58 +01:00
Oleg Semyonov
810a01ba28 Merge remote-tracking branch 'origin/master' into next 
Conflicts:
	HISTORY.txt
 2012-12-21 14:12:32 +02:00
Oleg Semyonov
55b35543a7 Last minute release notes update 2012-12-21 00:33:37 +02:00
Brian Webb
e0acb41379 Removed some unintended changes to RevoMini. 2012-12-15 10:35:51 -07:00
Brian Webb
3a1803b7a1 Added RFM22B (OPLink) receiver. 2012-12-13 21:07:19 -07:00
Brian Webb
6ffe518509 RFM22B: Improved link stability, and added tracking of error encountered in the processes of transmitting and receiving. 2012-12-11 17:44:15 -07:00
Brian Webb
6ed9b63da9 RFM22B: Changing configuration parameters over-the-air working. Added tracking of Tx/Rx sequence number. Still seeing too many resent packets. 2012-12-11 17:44:11 -07:00
Brian Webb
7aaa02268f RFM22B: Added TX Resent to OPLink status. Also removed the need for the packet queue. 2012-12-11 17:44:08 -07:00
Brian Webb
ca31fe99ac RFM22B: Fixed removal of the OPLink configuration window when the OPLink is disconnected. 2012-12-11 17:43:57 -07:00
Brian Webb
bd42083376 RFM22B: Changed the way the frequencies and power settings are set for the rfm22b device. 2012-12-11 17:43:55 -07:00
Brian Webb
dae382564a RFM22B/RM: Added rfm22b com device, moved remaining functionality in the radio module to the rfm22 driver, and simplified configuration of the PipX/OPLink. The radio device now presents itself completely as a com device, both in RadioComBridge (OPLink devices) and Telemetry (RM). Also change the PipXStatus and PipXSettings UAVOs to OPLinkStatus/OPLinkSettings. 2012-12-11 17:43:53 -07:00
Brian Webb
4b90f81f6f RFM22B: Modified the method of tracking RX errors, and now reporting Good, Corrected, Error, and Missed packets to the GCS. Also removed some less useful fields from the PipXStatus. 2012-12-11 17:43:49 -07:00
Oleg Semyonov
84c78f5e76 Merge remote-tracking branch 'origin/rel-12.10.2' into next 2012-12-04 15:31:53 +02:00
Oleg Semyonov
8ba73c2209 Merge remote-tracking branch 'origin/thread/OP-723' into rel-12.10.2 2012-12-04 12:27:21 +02:00
Oleg Semyonov
aa6886c305 [OP-703] Swap "About GCS" and "About plugins" menu items 2012-12-04 00:46:51 +02:00
Oleg Semyonov
2d938eaaa3 [OP-703] Rework GCS About dialog to remove 1.0.0 and show more repository info 2012-12-04 00:46:50 +02:00
Oleg Semyonov
8b2780bf71 Update CREDITS 2012-12-04 00:46:09 +02:00
Oleg Semyonov
510c443deb [OP-724] Rename "AF Response Time" to "Attitude Filter RT" in UI to stop confusion with Input LPF RT 2012-12-02 13:55:41 +02:00
Oleg Semyonov
41d56b282e [OP-724] Remove LPF from throttle input channel (not necessary) 2012-12-02 13:50:03 +02:00
a*morale
43f5bf09c2 Changed missing PipX labels for setup wizard 2012-12-02 13:39:03 +02:00
a*morale
903bbffc6b Changed reference to PipXtreme to OPLink on config tab and Firmware tab/OP-750 2012-12-02 13:39:02 +02:00
Oleg Semyonov
cc98962c36 [OP-724] Provide generic gimbal type 2012-11-29 18:03:05 +02:00
Oleg Semyonov
8adc2abd77 [OP-724] Now most camera options can be set independently per each axis. 2012-11-29 17:39:10 +02:00
Oleg Semyonov
8f5fb5aeb0 [OP-724] Add camera gimbal filtering and feed forward options 
This is a partial rework of Cossacs' camera gimbal software.

This patch adds LPF to airframe attitude used for camera stabilisation
and feed forward for camera actuators. Either of options can be
disabled on the compilation level to save flash and RAM if not
required.

Original Cossacs' code was optimized and code flow shortcuts were
added where applicable.
 2012-11-29 17:39:08 +02:00
Oleg Semyonov
ee333f1569 [OP-724] Add manual control input filtering (useful for camera gimbal) 
This is a partial rework of Cossacs' camera gimbal software.

This patch adds LPF to some of manual control inputs. Mostly
useful are accessory channels (for camera gimbal control) and
yaw channel (for smooth filming). The code may be used for
stand-alone CC[3D]-based gimbal software, but also should work
for complete FC+camera system.
 2012-11-29 17:39:07 +02:00
Oleg Semyonov
ea1199603b Merge remote-tracking branch 'origin/rel-12.10.2' into next 
Conflicts:
	MILESTONES.txt
 2012-11-29 17:31:50 +02:00