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 26408e286fd9700b7efc07908a7bec28c7ef0e02.
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
David Ankers
aaea66a5d0
Fix splitter on Scopes screen
2012-10-05 11:18:16 +10:00
James Cotton
13cabd2ea4
Merge branch 'next' into revo
...
Conflicts:
flight/PiOS/Common/pios_rfm22b.c
2012-10-04 16:38:08 -05:00
PT_Dreamer
ac8d399d8d
GCS-Fixes Flight data tab icon not being displayed
2012-10-04 12:15:20 +01:00
David Ankers
af7fffdab6
Add Gadgets to HiTL screen
2012-10-04 13:09:54 +10:00
David Ankers
6b2ac1cf39
Spelling on browser config, add size settings to options so things don't
...
get scrunched.
2012-10-04 12:52:36 +10:00
PT_Dreamer
a1ebdc38fa
Merge branch 'thread/OP-39' of ssh://git.openpilot.org/OpenPilot into next
2012-10-03 14:13:28 +01:00
PT_Dreamer
399fc7fe85
Merge branch 'cp/extraGUIchanges' of ssh://git.openpilot.org/OpenPilot into next
2012-09-28 11:55:33 +01:00
chris pember
e2389af30d
fixed the stylesheets vertical sliders. pushing to correct branch
2012-09-27 21:06:19 -07:00
James Cotton
26408e286f
GCS Stabilization: Force the apply button to always be there as I can't find expert mode
2012-09-26 09:49:33 -05:00
Fredrik Arvidsson
f42085f6ac
Merge branch 'next' into thread/OP-39
2012-09-26 00:44:34 +02:00
PT_Dreamer
af36409e80
Merge branch 'dmytro/pfd_qml' of ssh://git.openpilot.org/OpenPilot into next
2012-09-24 19:02:51 +01:00
Dmytro Poplavskiy
dbbdb62173
Added the readymap based earth files
2012-09-23 19:30:10 +10:00
Fredrik Arvidsson
81efc2a931
Merge branch 'next' into thread/OP-39
...
Conflicts:
ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
2012-09-22 10:58:55 +02:00
David Ankers
570917f331
Remove old versions from source, however, they are still in the Artwork
...
folder.
2012-09-22 10:47:10 +10:00
Nuno Guedes
432642952c
Test Quad updated with CC3D
...
- Old Test Quad versions (OP Pro+AHRS+GPS) renamed to "old".
- New Test Quad versions updated with CC3D
2012-09-22 10:43:23 +10:00
Fredrik Arvidsson
69621ba2f8
Merge branch 'next' into thread/OP-39
...
Conflicts:
ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
2012-09-20 23:53:33 +02:00
David Ankers
7f71769c5b
Add Nuno's new models
2012-09-20 13:17:18 +10:00
David Ankers
b921e3213f
Minor tweak to make top row splitters better on smaller screens
2012-09-20 12:55:42 +10:00
Dmytro Poplavskiy
6174fa2d7f
PFD: display the side-slip indicator
2012-09-20 09:17:10 +10:00
Dmytro Poplavskiy
608297fbd3
Changed the default PFD widget to qml based one
2012-09-20 09:14:49 +10:00
Fredrik Arvidsson
bd3d3708eb
Merge branch 'next' into thread/OP-39
...
Conflicts:
ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.cpp
ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.h
ground/openpilotgcs/src/plugins/pfdqml/pfdqmlgadget.h
ground/openpilotgcs/src/plugins/plugins.pro
ground/openpilotgcs/src/plugins/setupwizard/pages/controllerpage.cpp
ground/openpilotgcs/src/plugins/setupwizard/pages/controllerpage.h
ground/openpilotgcs/src/plugins/setupwizard/pages/controllerpage.ui
ground/openpilotgcs/src/plugins/setupwizard/pages/endpage.cpp
ground/openpilotgcs/src/plugins/setupwizard/pages/endpage.ui
ground/openpilotgcs/src/plugins/setupwizard/pages/multipage.cpp
ground/openpilotgcs/src/plugins/setupwizard/pages/multipage.h
ground/openpilotgcs/src/plugins/setupwizard/pages/multipage.ui
ground/openpilotgcs/src/plugins/setupwizard/pages/startpage.ui
ground/openpilotgcs/src/plugins/setupwizard/pages/vehiclepage.ui
ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp
ground/openpilotgcs/src/plugins/setupwizard/setupwizard.h
ground/openpilotgcs/src/plugins/setupwizard/setupwizard.pro
ground/openpilotgcs/src/plugins/setupwizard/wizardResources.qrc
2012-09-16 15:14:47 +02:00
Dmytro Poplavskiy
6049f47296
Merge branch 'next' into dmytro/pfd_qml
2012-09-16 13:31:06 +10:00
Dmytro Poplavskiy
150314ff98
PFD qml: align elements to pixels grid
...
It improves the rendering quality,
sub pixels accuracy gives no benefits in placing PFD elements
2012-09-16 10:03:28 +10:00