1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-11 19:24:10 +01:00
Commit Graph

330 Commits

Author SHA1 Message Date
Andres
7ec855af5f OP-1273 added and implemented Airpeed alarm for the PixHawk sensor 2014-03-28 14:18:14 +01:00
Corvus Corax
12eed41e58 OP-1216 modified alarms for manualcontrol/receiver to reflect new architecture 2014-03-02 20:12:19 +01:00
Alessio Morale
3cf1662bc8 Merge remote-tracking branch 'origin/amorale/OP-1212_telemetry_prio_queue' into next 2014-02-21 19:16:52 +01:00
Alessio Morale
49bc5b8cbd OP-1212 fix GCS plot configurations 2014-02-15 15:32:57 +01:00
Laurent Lalanne
d1252ce261 OP-1187 rel-14.01 Updates 2014-02-09 20:09:37 +01:00
Laurent Lalanne
8795b1aebd Merge remote-tracking branch 'origin/rel-14.01' into laurent/OP-1187_allow_french_translations_in_future_releases 2014-02-09 19:24:15 +01:00
m_thread
9f02d3c170 OP-1191 Added some tooltips and fixed tooltip font color in css to make it work in Fusion style on Linux. 2014-02-09 14:08:07 +01:00
m_thread
da137e18e7 OP-1191 Removed all special tweaks to the macosx css. No need to have this for fusion. 2014-02-08 13:55:32 +01:00
m_thread
0964031ae0 OP-1191 Minor gui fixes. Removed stuff from linux css file. No need to have minor tweaks to the fusion style. 2014-02-08 13:51:42 +01:00
Alessio Morale
4a29db4983 OP-1212 Remove priority task from taskinfo 2014-02-07 18:29:19 +01:00
Laurent Lalanne
f0a1555c14 OP-1187 Indentation 2014-02-03 11:57:33 +01:00
Laurent Lalanne
66fdc73e71 OP-1187 Removed "#" 2014-01-31 19:15:15 +01:00
Laurent Lalanne
8e837fb985 OP-1187 Wrong file copy in lasted commit.
qt_fr.qm located in tools/Qt_install_dir, allow copy of this file for all systems
2014-01-29 13:42:39 +01:00
Philippe Renon
40ecef4f94 Merge branch 'OP-1184/cleanup_stack_scope_widget_plot_list' into rel-14.01 2014-01-24 19:58:01 +01:00
Philippe Renon
16ff328bfb OP-1184 removed spurious drawAntialiased setting from stack scope config
+review OPReview-632
2014-01-24 19:53:13 +01:00
Philippe Renon
b58620c981 OP-1184 removed obsolete plots from the stack scope monitor gadget
did same in TaskInfo uav object
2014-01-24 00:17:47 +01:00
Laurent Lalanne
6e6f5804b5 OP-1172 Remove unused configurations files 2014-01-23 19:15:50 +01:00
Laurent Lalanne
ddde8a9596 OP-1187 Should be the last update before RC release if no changes in Gui/text 2014-01-22 23:34:21 +01:00
Laurent Lalanne
8c06db7c3d OP-1187 Spell check... 2014-01-22 19:59:32 +01:00
Laurent Lalanne
28f96ebd31 OP-1187 Review from Joël (eyesonsky) Thanks ! 2014-01-22 18:08:55 +01:00
Laurent Lalanne
eadb9d69f3 OP-1187 New branch laurent/OP-1187_allow_french_translations_in_future_releases
Updated lasted text in radio inputs
2014-01-21 20:52:52 +01:00
Laurent Lalanne
64485f1cf8 Merge remote-tracking branch 'origin/rel-14.01' into laurent/OP-1187_allow_french_translations_in_future_releases 2014-01-21 20:37:18 +01:00
Laurent Lalanne
faaf883a0b Updated Feed Forward tuning page 2014-01-19 14:35:17 +01:00
Laurent Lalanne
2c3d6445b9 Anti-windup / advanced Camera stab updated 2014-01-19 13:34:36 +01:00
Laurent Lalanne
bd66d4b263 Update 2014-01-19 00:06:20 +01:00
Laurent Lalanne
4d6baf47f9 Updates, re-read and some problems inside source code are reported with a flag "Typo" in translator comments. 2014-01-18 17:51:38 +01:00
Laurent Lalanne
4414d11417 OP-1172 Some fonts are not defined in config files
Fix all font names not defined in default Gcs config files
2014-01-18 12:30:24 +01:00
Laurent Lalanne
94f29cdb10 Cruize Control text updated 2014-01-18 01:43:45 +01:00
Laurent Lalanne
43703dd6d9 Updates about "Windup" 2014-01-18 00:02:00 +01:00
Laurent Lalanne
a162d885a8 Accentuations missed in capital letters 2014-01-16 23:19:54 +01:00
Laurent Lalanne
e0098b8f54 Updated new strings in Next 2014-01-16 19:59:59 +01:00
Laurent Lalanne
b0614259dc Translations fixes 2014-01-10 23:51:57 +01:00
Laurent Lalanne
e904c9f9cf Horizon line is now displayed fine when board is in inverted flight, center of rotation is located on yellow arrows. 2014-01-10 19:10:28 +01:00
Laurent Lalanne
529f0ade4b Translation progress 2014-01-03 13:52:54 +01:00
Laurent Lalanne
3081b94694 Translation progress 2013-12-28 21:37:33 +01:00
Laurent Lalanne
bdbbaa4f93 Merge branch 'next' into translations_next
Conflicts:
	ground/openpilotgcs/src/libs/utils/logfile.cpp
	ground/openpilotgcs/src/libs/utils/logfile.h
	ground/openpilotgcs/src/plugins/coreplugin/aboutdialog.cpp
	ground/openpilotgcs/src/plugins/coreplugin/aboutdialog.h
	ground/openpilotgcs/src/plugins/telemetry/monitorwidget.h
	ground/openpilotgcs/src/plugins/telemetry/telemetry_global.h
2013-12-23 13:02:27 +01:00
Laurent Lalanne
5e62b4bf63 Updates, fix spaces and words on Multirotor wizard 2013-12-18 22:09:36 +01:00
Laurent Lalanne
0929d045dc First translations update after merge from next 2013-12-18 21:18:03 +01:00
Laurent Lalanne
5112d465ad git merge next 2013-12-18 20:14:26 +01:00
Philippe Renon
17c9c8d8b0 Merge remote-tracking branch 'origin/next' into filnet/telemetry
Conflicts:
	ground/openpilotgcs/src/plugins/coreplugin/coreplugin.pro
2013-12-07 16:39:19 +01:00
Philippe Renon
37dab0e4fc Merge remote-tracking branch 'origin/next' into filnet/telemetry
Conflicts:
	ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.cpp
	ground/openpilotgcs/src/plugins/coreplugin/mainwindow.cpp
	ground/openpilotgcs/src/plugins/coreplugin/telemetrymonitorwidget.cpp
	ground/openpilotgcs/src/plugins/coreplugin/workspacesettings.cpp
	ground/openpilotgcs/src/plugins/uavtalk/telemetrymonitor.cpp
2013-12-02 22:54:00 +01:00
Alessio Morale
bac4f96d1c OP-1109: port plugins/pfdqml 2013-11-14 00:48:00 +01:00
Dmytro Poplavskiy
cab2d22bbb PFD: Display altitude vector bar 2013-11-13 16:30:11 +01:00
Dmytro Poplavskiy
40629f62db Display the altitude waypoint 2013-11-13 16:30:09 +01:00
Dmytro Poplavskiy
071f81370a Display the speed waypoint element
if not 0
2013-11-13 16:30:08 +01:00
Dmytro Poplavskiy
454a81760e Correctly find the position of GPS fix element
using coordinates of "gps-mode-text" element
2013-11-13 16:30:06 +01:00
Dmytro Poplavskiy
64179a70a2 Updated pfd.svg file
With some text only items conveted to path,
so they can be used to find coordinates on the scene
2013-11-13 16:30:05 +01:00
Dmytro Poplavskiy
ecbbfd0891 PFD view: added Warning and incomplete Info views
Only GPS info is implemented
2013-11-13 16:30:03 +01:00
Dmytro Poplavskiy
c06bbdb5cc Updated pfd.svg and related PFD qml files
Still WIP, implemented:
* horizont rendering
* altitude scale
* speed scale
* vsi scale
* basic compass, without extra marks/points
* fixed horizont center mark
2013-11-13 16:29:59 +01:00
Laurent Lalanne
a6a33b18da Modified SitesPanel.qml to allow translation. Reducing spacing from 80 to 40
Need dynamic spacing to fit window width on language changes.
2013-11-10 23:07:35 +01:00
Laurent Lalanne
d84918088d French translation : StabilizationWidget 2013-11-10 14:30:07 +01:00
Laurent Lalanne
6dd20318a1 Translations added, tipo fix 2013-11-08 21:24:20 +01:00
Laurent Lalanne
7e9358dc38 Translations FR : Work in progress 2013-11-05 16:52:31 +01:00
Patrick Huebner
0833cd206c OP-1103 Fix for build error on OSX 10.8 after Qt5.1.1 update 2013-11-04 00:13:14 +11:00
Laurent Lalanne
acb470dba1 French translations over next branch 2013-10-30 23:54:32 +01: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
Laurent Lalanne
fc61c423c0 Autotune module translation + little changes 2013-10-14 11:31:37 +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
Laurent Lalanne
f5d326caa0 More updates in French translations 2013-10-06 13:08:18 +02:00
Laurent Lalanne
44dc130c95 Progress, some typo errors. 2013-08-27 16:23:41 +02:00
Laurent Lalanne
19ff774915 More translations,
- setup Wizards should be done,
- Oplink, Opmap, Firmware Uploader, Revo calibration...
2013-08-26 15:35:48 +02:00
Laurent Lalanne
bf8a2089d9 Again 2013-08-26 01:53:54 +02:00
Corvus Corax
00a603c88f more bugfixes related to UAVObject renaming 2013-06-23 00:10:00 +02:00
Corvus Corax
73b22f5cb1 typo bugfix 2013-06-22 23:49:03 +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
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
Fredrik Arvidsson
11e0a26ebd OP-1005 Fixes ugliness in attitude dial and replaces PFD in default configuration with some analog dials on Firmware workspace. 2013-06-18 23:34:47 +02:00
Fredrik Arvidsson
e1851b4833 OP-1005 Fixes default configuration files to set altitude and speed factor. 2013-06-18 20:58:43 +02:00
Fredrik Arvidsson
ad954606f7 Merge remote-tracking branch 'origin/next' into thread/OP-1005_PFD_Velocity_Units 2013-06-18 18:35:51 +02:00
Fredrik Arvidsson
095d71b574 OP-1005 Reduced the number of decimals for the GPS PDP value to 1. 2013-06-18 18:35:13 +02:00
Fredrik Arvidsson
a6ac956127 OP-1005 Adds configurable units for velocity/speed and altitude in QML PFD. Units are configured in settings panel.
OP-1015 Reduces precision of the PDOP value in the PFD display to 3 decimals.
2013-06-18 00:52:27 +02:00
Fredrik Arvidsson
d28609349f OP-1005 Fixes velocity units in PFD and PFDQml widgets. 2013-06-17 07:43:56 +02:00
Mathieu Rondonneau
0073792561 OP-1011: Remove deprecated powerlog 2013-06-14 19:24:42 -07:00
Philippe Renon
7486263262 OP-963 made TelemetryMonitorWidget skinnable
- moved telemetry monitor widget from coreplugin to new telemetry plugin
- added a telemetry monitor gadget based on monitor widget.
- cleaned up telemetry monitor widget and made it skinnable
Dependencies have changed:
- connection manager (in coreplugin) is now unaware of the telemetry monitor widget
- the widget is added to the connection manager tray by the telemetry plugin
- the telemetry plugin depends on coreplugin and uavtalk
2013-06-13 01:36:02 +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
Philippe Renon
218d197aa8 OP-983 fixed minor spelling issues in GCS 2013-06-02 12:42:15 +02: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
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
Corvus Corax
9b95af2006 refaktored GPS Sensor UAVObjects 2013-05-22 22:36:23 +02:00
Corvus Corax
1236bf3ed9 renamed Magneto to Mag 2013-05-20 10:33:02 +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
176bd3c4f7 OP-935 Adds Responsiveness sliders to basic stabilization screen. 2013-05-05 12:45:35 +02:00
Fredrik Arvidsson
1758885266 OP-935 Updated stylesheet. 2013-05-04 09:53:42 +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
David Ankers
545422d9ea Remove old HiTLv2 gadget data, no longer used. 2013-04-29 00:49:08 +10:00
David Ankers
80c88fecc6 Another minor update of config 2013-04-28 20:03:00 +10:00
David Ankers
a5b6bb9692 OP-855 Remove empty Gadget from HiTL work space 2013-04-28 01:25:09 +10:00
Oleg Semyonov
f9f721a76a Reset executable bits from non-executable files (Windows legacy) 2013-04-24 01:18:46 +03: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
Oleg Semyonov
5040a13efb gcs: set default UDP port to 9000 as used by simposix firmware 2013-04-12 10:56:05 +02:00
Oleg Semyonov
5bb6b56b4a OP-772: Normalize line endings 2013-04-05 23:46:56 +03: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
8dc2f23eb2 Merge remote-tracking branch 'origin/muralha/artwork' into thread/OP-885_Update_Boards_Artwork 2013-04-02 19:43:29 +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
Oleg Semyonov
e24b66897b build: fix qmake ground/share copy commands for all platforms
Read share.pro comments for more details.

+review OPReview-429
2013-04-02 19:43:48 +03:00
Nuno Guedes
a2ddcf7f3b Added the Zagi plane to the openpilotgcs
Added the Zagi plane to the openpilotgcs folder, because this model wasn't added to the ModelView before.
2013-04-02 15:08:28 +01:00
Nuno Guedes
460873884f New OP 3D boards
- Revolution
- OP GPS
- OPLink
2013-04-02 14:39:42 +01:00
Oleg Semyonov
17a687e79d Revert "Removed creation of extra directory level on Windows."
This reverts commit 7c85fa5885.
2013-04-02 10:20:15 +02: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 Renon
caa9964fe5 OP-857 OP-876 made default Options dialog size even bigger 2013-03-26 00:37:39 +01:00
Oleg Semyonov
cdb3730edb OP-857 OP-876 made default Options dialog size bigger to avoid some scroll
bars showing up
2013-03-20 22:40:02 +02: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
Philippe Renon
6cbad966d0 OP-833 removed spurious plot entry in Uptime Scope Gadget 2013-02-21 02:04:53 +01:00
Fredrik Arvidsson
7c85fa5885 Removed creation of extra directory level on Windows. 2013-02-18 20:51:37 +01:00
Laurent Lalanne
5b8b38ad7b Minors changes, Errors. Thx Joël 2013-02-12 01:04:40 +02:00
Oleg Semyonov
e9c0f94628 translations: remove language override in default GCS configurations
Since in commit 518182a all outdated languages were commented out
to avoid *.pm builds, it is ok to remove language override here and
use system language by default.

Related issues: OP-231, OP-723, OP-843
2013-02-11 22:13:57 +02:00
Oleg Semyonov
790e771b54 Merge remote-tracking branch 'origin/laurent/translations' into next 2013-02-11 22:05:29 +02:00
Laurent Lalanne
518182ac0b For now all languages files (*.pm) are build and included in release package.
Outdated translations are commented and not included in package.

Allow to remove <OverrideLanguage>C</OverrideLanguage> line in default config
files loaded on first GCS start and language is set to OS Lang if found
in translations directory.
2013-02-09 17:24:32 +01:00
Laurent Lalanne
b8a6358785 Corrections from Joël (Eyesonsky) 2013-02-08 20:01:57 +01:00
Laurent Lalanne
24fcc03007 Minors corrections, improved translations for radio mods. 2013-02-08 19:36:15 +01:00
Platypus
b5af81c8bf Apport de traduction sur ConfigInputWidget
Signed-off-by: Platypus <platypusman@free.fr>
2013-02-08 10:50:24 +01:00
Platypus
6853791a03 Merge branch 'laurent/translations' of ssh://git.openpilot.org/OpenPilot into laurent/translations 2013-02-08 08:23:42 +01:00
Laurent Lalanne
866f6359a6 Errors corrected, thanks to Joël (eyesonsky) 2013-02-07 18:33:25 +01:00
Platypus
d76a61b430 Merge branch 'laurent/translations' of ssh://git.openpilot.org/OpenPilot into laurent/translations 2013-02-01 17:56:19 +01:00
Platypus
dfdd074997 Working progress...
Signed-off-by: Platypus <platypusman@free.fr>
2013-02-01 17:55:13 +01:00
Laurent Lalanne
cc8bb5dc5e Erreur de frappe 2013-01-31 11:51:03 +01:00
Platypus
21bb408c21 Quelques corrections et modifications - Any corrections and modifications
Signed-off-by: Platypus <platypusman@free.fr>
2013-01-31 09:24:50 +01:00
Laurent Lalanne
3dd37e51b2 Small corrections, spaces. 2013-01-31 01:23:39 +01:00
Platypus
0c77a2b374 Premières corrections et suggestions
Signed-off-by: Platypus <platypusman@free.fr>
2013-01-31 00:09:01 +01:00
Alessio Morale
1a303aa85f Merge remote-tracking branch 'origin/next' into amorale/bigmerge 2013-01-23 19:47:32 +01:00
Laurent Lalanne
b6852a0e2b Little changes in French 2013-01-21 00:30:15 +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
Nuno Guedes
092432a3cb PFD with some labels for better User eXperience 2013-01-18 22:22:48 +00:00
Nuno Guedes
d250e053f6 Some 3D models optimized 2013-01-18 19:05:23 +00:00
filnet
d1236499c1 OP-805 - removed uneeded Uploader default configuration. 2013-01-13 21:53:14 +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
Laurent Lalanne
81d3761f67 More updates in french : should be usable by beginners.
Need re-read by french users
2013-01-10 21:20:13 +01:00
Laurent Lalanne
66aa0fde43 More French updates : Setup Wizard text for configuration finished. 2013-01-07 14:51:22 +01:00
Laurent Lalanne
95b87c0cc5 More updates in French 2013-01-05 11:24:37 +01:00
Laurent Lalanne
eb0d3890e6 More updates in French language.
Still some text not displayed in french, need tuning in source code.
@Dev : See english remarks in ts file.
2013-01-03 21:34:11 +01:00
Laurent Lalanne
37fedc5319 Updated translations for input Wizard 2013-01-03 16:38:23 +01:00
Laurent Lalanne
d0789deb71 Minor changes for test 2013-01-03 15:10:11 +01: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
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
fb153fa669 [OP-685] Hide the debug window in the GCS by default
Currently GCS prints in the debug window too many messages confusing users.
Until it is fixed (so only important messages are printed) the debug
windows is removed from default GCS configurations. It still is available
as a widget and can be added to a GCS workspace.

It is better than hide it using options checkbox (as suggested in OP-685)
and keep empty window frame.
2012-12-01 20:54:38 +02:00
Fredrik Arvidsson
67fe7a5e04 OP-723 Changed from ISO locale 'en_US' to Qt special locale 'C'. 2012-11-24 22:48:32 +01:00
Fredrik Arvidsson
0e55f3c74d OP-723 Changed default locale to English. Updated default configuration files to have <OverrideLanguage> tag set to en_US. 2012-11-24 14:55:46 +01:00
Stacey Sheldon
2119067722 Merge remote-tracking branch 'op-revo/james/revo' into revo-next
Conflicts:
	Makefile
	flight/Modules/Attitude/revolution/attitude.c
	flight/Modules/Battery/battery.c
	flight/Modules/FixedWingPathFollower/fixedwingpathfollower.c
	flight/Modules/GPS/GPS.c
	flight/Modules/ManualControl/inc/manualcontrol.h
	flight/Modules/ManualControl/manualcontrol.c
	flight/Modules/OveroSync/overosync.c
	flight/Modules/PathPlanner/inc/pathplanner.h
	flight/Modules/PathPlanner/pathplanner.c
	flight/Modules/Sensors/sensors.c
	flight/Modules/VtolPathFollower/vtolpathfollower.c
	flight/PiOS/Boards/STM32F4xx_Revolution.h
	flight/PiOS/Boards/pios_board.h
	flight/PiOS/STM32F4xx/library.mk
	flight/PiOS/inc/pios_hmc5883.h
	flight/PiOS/inc/pios_l3gd20.h
	flight/PiOS/inc/pios_rfm22b_priv.h
	flight/Revolution/Makefile
	flight/Revolution/Makefile.osx
	flight/Revolution/System/inc/pios_config.h
	flight/Revolution/UAVObjects.inc
	ground/openpilotgcs/src/libs/utils/coordinateconversions.cpp
	ground/openpilotgcs/src/libs/utils/homelocationutil.cpp
	ground/openpilotgcs/src/libs/utils/homelocationutil.h
	ground/openpilotgcs/src/plugins/config/configrevowidget.cpp
	ground/openpilotgcs/src/plugins/hitlnew/il2simulator.cpp
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
	ground/openpilotgcs/src/plugins/plugins.pro
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
	package/Makefile
	shared/uavobjectdefinition/fixedwingpathfollowersettings.xml
	shared/uavobjectdefinition/fixedwingpathfollowerstatus.xml
	shared/uavobjectdefinition/flightstatus.xml
	shared/uavobjectdefinition/hwsettings.xml
	shared/uavobjectdefinition/manualcontrolsettings.xml
	shared/uavobjectdefinition/pathdesired.xml
	shared/uavobjectdefinition/vtolpathfollowersettings.xml
	shared/uavobjectdefinition/waypoint.xml
2012-10-30 00:08:43 -04:00
James Cotton
c1f9948a81 Merge branch 'master' into next 2012-10-16 14:26:35 -05:00
David Ankers
2db1bcdaf8 Wide Screen config, added UAVOB and some resizes. Synced normal and
widescreen so they are basically the same except for ID and splitters.
2012-10-16 09:08:47 +11:00
Laura Sebesta
36087b1339 Changed new config files to include new HiTL settings. 2012-10-12 08:53:13 +02:00
James Cotton
3110678321 Merge branch 'dynamic_uavo_next' into revo
Conflicts:
	androidgcs/src/org/openpilot/uavtalk/uavobjects/ActuatorSettings.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/AltitudeHoldSettings.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightBatterySettings.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightBatteryState.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/FlightStatus.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/HomeLocation.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/HwSettings.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/ManualControlSettings.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/OveroSyncStats.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/PipXSettings.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/PipXStatus.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/PositionActual.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/RelayTuning.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/RevoCalibration.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/SystemAlarms.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/TaskInfo.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/UAVObjectsInitialize.java
	androidgcs/src/org/openpilot/uavtalk/uavobjects/Waypoint.java
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
2012-10-10 08:27:11 -05:00
Laura Sebesta
c2b49b6ef3 Merge branch 'kenz/cc_hitl_merge' into next
Conflicts:
	ground/openpilotgcs/src/plugins/gcscontrol/gcscontrolgadgetoptionspage.ui
	ground/openpilotgcs/src/plugins/hitlnew/hitloptionspage.ui
	ground/openpilotgcs/src/plugins/hitlv2/hitlv2optionspage.ui
2012-10-08 15:30:27 +02:00
PT_Dreamer
d664ec9705 GCS-Try to fix linux file copy without braking Win 2012-10-07 16:50:04 +01:00
PT_Dreamer
5c879d5238 GCS-Fix file copying on linux
It got reverted on a merge
2012-10-06 23:41:14 +01:00
David Ankers
bcc39b7fad Make options window taller, turn on OpenGL by default on the map, we
already use this for the QML PFD and no issues reported.
2012-10-05 18:47:00 +10:00
James Cotton
82efb91fad Add developer GCS config layout 2012-10-04 20:44:00 -05:00