Laurent Lalanne
b9136ef73e
Merge branch 'next' into translations_next
...
initial merge on local branch
2013-10-30 12:58:16 +01:00
Philippe Renon
dc2ee59850
Merge branch 'filnet/qt5.1.1' into next
2013-10-26 12:44:20 +02:00
Laurent Lalanne
c49e53977f
Merge branch 'next' into translations_next
2013-10-25 11:31:14 +02:00
Laurent Lalanne
9e3d464523
Merge branch 'master' into translations_next
...
Conflicts:
ground/openpilotgcs/copydata.pro
ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_fr.ts
2013-10-25 11:27:28 +02:00
Philippe Renon
f85498e7c5
[OP-1085] Qt5.1.1 - a bit of manual uncrustifying
2013-10-24 00:12:35 +02:00
Fredrik Arvidsson
cd83fc6d90
OP-1082 Added some more mapping between states and readable text.
2013-10-22 07:41:15 +02:00
Fredrik Arvidsson
e39c0b44ce
Merge remote-tracking branch 'origin/next' into thread/OP-1082_Activity_QML_Ticker
2013-10-20 10:03:06 +02:00
Corvus Corax
b3ebb91ceb
uncrustification
2013-10-19 21:59:07 +02:00
Fredrik Arvidsson
926e187365
Merge branch 'next' into thread/OP-1082_Activity_QML_Ticker
2013-10-19 09:32:21 +02:00
Rich von Lehe
d6e711cfd7
Additional fixes as a result of review comments.
2013-10-18 23:18:35 +02:00
Rich von Lehe
3affd6a7cd
Fixed some minor spelling errors in tooltips within stabilization.ui
2013-10-18 23:18:25 +02:00
Philippe Renon
6998c782db
Merge remote-tracking branch 'origin/filnet/qt5.1.0' into next
...
Conflicts:
ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.h
ground/openpilotgcs/src/plugins/coreplugin/workspacesettings.cpp
2013-10-17 22:00:54 +02:00
Philippe Renon
09408b40ca
[OP-835] Qt 5.1.0 - uncrustified gcs sources
2013-10-17 21:45:37 +02:00
Fredrik Arvidsson
162c19a438
OP-1082 Added mapping for event.
2013-10-17 18:23:24 +02:00
Fredrik Arvidsson
e122e60939
OP-1082 First commit of Activity panel, a QML RSS reader for OpenPilot development activity.
2013-10-13 23:38:09 +02:00
Laurent Lalanne
d02449048b
Little updates, help links to Wiki Fr
2013-10-09 15:01:00 +02:00
Laurent Lalanne
90940c2e4e
Added some tr() missing for Mapripper dialogs, AboutDialog, OpMap menu.
...
Modified ground/openpilotgcs/src/plugins/systemhealth/systemhealth.qrc (Alarms) to allow html files translations and added french html files in ground/openpilotgcs/src/plugins/systemhealth/html/fr/ directory.
2013-10-07 13:59:16 +02:00
Philippe Renon
c9895179f4
[OP-835] Qt 5.1.0 - disabled compilation of antennatrack plugin
2013-09-20 22:26:00 +02:00
Philippe Renon
a2ba33f28a
[OP-835] Qt 5.1.0 - migrated GCS plugins
2013-09-15 23:37:20 +02:00
Philippe Renon
560223da70
OP-996 Added GCS option to remember and restore the last selected workspace
...
Also reorganized the workspace options page
2013-09-15 23:24:13 +02:00
Philippe Renon
6dfd7c1c88
Merge branch 'filnet/OP-996_add_option_to_remember_last_selected_workspace' into next
2013-09-07 15:23:17 +02:00
Fredrik Arvidsson
50f82b3768
Fixed a .html file that was missing a leading < character.
2013-07-30 14:54:23 +02:00
Corvus Corax
27eadc200b
Merge branch 'corvuscorax/lla2nedfilter' into next
...
Conflicts:
flight/modules/StateEstimation/stateestimation.c
2013-07-10 14:38:12 +02:00
Corvus Corax
551780c74b
Merge branch 'corvuscorax/complementary_altitude_filter' into next
...
Conflicts:
flight/targets/boards/revolution/firmware/UAVObjects.inc
2013-07-10 14:27:25 +02:00
Brian Webb
c2df59498b
Merge remote-tracking branch 'origin/master' into next
2013-07-06 07:08:30 -07:00
Brian Webb
fd8d5352e2
OP-932 Adds tooltips to the channel widgets.
2013-07-03 20:20:31 -07:00
Corvus Corax
51a4b16af5
New Filter to calculate NED from LLA as part of StateEstimation
2013-06-30 18:49:29 +02:00
Fredrik Arvidsson
91c19ca829
Fixes 'Categorize' issue in UAVOBrowser.
2013-06-30 12:54:41 +02:00
Fredrik Arvidsson
3dcaea1cb0
Merge remote-tracking branch 'origin/glenneaux/OP-1027_GCS_UAVObjectBrowser_CategoryTreeItem_ButtonsNotDisabled' into thread/glenneaux_test
2013-06-30 11:18:42 +02:00
Fredrik Arvidsson
6ef2f3d626
Merge remote-tracking branch 'origin/glenneaux/OP-1004_GCS_UAVObjectBrowser_ScientificNotation_breaks_buttons' into thread/glenneaux_test
2013-06-30 11:18:30 +02:00
Corvus Corax
7745f93935
changed default coefficients and exposed them to a settings uavobject as they should be
2013-06-29 01:16:02 +02:00
Brian Webb
bab69401b9
OP-932 Allows configuring the Revo as coordinator.
2013-06-27 19:55:01 -07:00
Brian Webb
2aea2342ab
OP-932 Adds a direct PPM channel on each Tx packet when in PPM mode, and adds a PPM only mode that uses a 9600 bps air datarate. Also updates the OPLink configuration tab and moves all OPLink configuration to the OPLink configuration tab on the Revo, and customizes the OPLink configuration tab for the Revo.
2013-06-26 18:01:54 -07:00
Brian Webb
8c370df319
OP-932 A significant re-work of the OPLink and configuration of the OPLink. Auto-configuration is removed, and remote modems are bound the coordinator, rather than the other way around. Timing of the radio link is also significantly changed. The rfm22b code is also simplified so that it only sends packet, and has no notion about what those packets are, so the rfm22b is converteded to simply a com type device.
2013-06-26 17:56:56 -07:00
Oleg Semyonov
5a9cee51b9
Fix indentation in a .no-auto-format source file
2013-06-26 20:29:04 +03:00
Corvus Corax
0c43346292
Merge branch 'corvuscorax/OP-947_stateestimator-module' into next
...
Thanks everyone for helping getting this together, especially Alessio
and DLite :-)
2013-06-25 23:48:12 +02:00
Corvus Corax
c18cd85cf5
uncrustification
2013-06-25 22:31:10 +02:00
Fredrik Arvidsson
076b4bbf6e
Merge branch 'thread/OP-1024_Uploader_GUI_Fixes' into rel-13.06.01
2013-06-25 22:07:34 +02:00
Fredrik Arvidsson
01ff02eab5
Merge branch 'thread/OP-1020_Red_Cross_Save' into rel-13.06.01
2013-06-25 22:07:19 +02:00
Fredrik Arvidsson
b088d757d6
OP-1024 Fixes Uploader GUI and adds timer to automatically close AutoUpdate panel after 7s.
2013-06-25 15:51:33 +02:00
Fredrik Arvidsson
a46dfbfb00
OP-1028 Fixed a bug with disabled controls.
2013-06-25 13:41:15 +02:00
Fredrik Arvidsson
bf573e6adc
OP-1020 Removes AltitudeHoldSettings object from list of objects to save if connected board does not support it.
2013-06-25 12:21:16 +02:00
sambas
023ee2b97e
Fix windows hid connection failure if board was already connected and gcs started. Was getting sharing violation error.
2013-06-24 19:01:40 +02:00
Glenn Campigli
45eaecf0af
Creating Cateory tree items as TopTreeItem causes them to be treated like "Settings" or "Data Objects".
...
When the current tree item is changed (by mouse click or keyboard arrow) they are checked for their type, which disables the buttons to send/receive.
2013-06-24 22:58:13 +10:00
Glenn Campigli
a3a382cc35
Scientific and Categorized modes disconnect the "currentChanged" signal.
...
Reconnected the signals after configuring Scientific or Categorized notation.
Used "UniqueConnection" to avoid signal's triggering the same slot multiple times unintentionally.
2013-06-24 21:29:06 +10:00
Corvus Corax
00a603c88f
more bugfixes related to UAVObject renaming
2013-06-23 00:10:00 +02:00
Corvus Corax
6163c5f53a
Merge branch 'next' into corvuscorax/OP-947_stateestimator-module
...
Conflicts:
flight/modules/AltitudeHold/altitudehold.c
ground/openpilotgcs/share/openpilotgcs/pfd/default/AltitudeScale.qml
ground/openpilotgcs/share/openpilotgcs/pfd/default/PfdIndicators.qml
ground/openpilotgcs/share/openpilotgcs/pfd/default/SpeedScale.qml
ground/openpilotgcs/src/plugins/pfd/pfdgadgetwidget.cpp
2013-06-22 18:44:03 +02:00
Oleg Semyonov
8325cc3be7
Uncrustify
2013-06-22 14:24:47 +03:00
Philippe Renon
ee5d6957c8
Merge branch 'filnet/OP-1007_output_config_gadget_shows_unsaved_warning_when_no_chnage_were_made' into next
2013-06-21 22:10:26 +02:00
Philippe Renon
664e79c9e0
Merge branch 'filnet/OP-843_settings_dialog_show_language_selection_at_top' into next
...
Conflicts:
ground/openpilotgcs/src/plugins/coreplugin/dialogs/settingsdialog.cpp
2013-06-21 22:10:06 +02:00
