rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-11 19:24:10 +01:00
Code Issues Releases Activity
7,768 Commits 5 Branches 8 Tags 266 MiB
1d7e4e0fc2
Commit Graph

90 Commits

Author SHA1 Message Date
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
PT_Dreamer
d4cd0a9f89 GCS- Config fix and new copy method for data collections 2012-09-12 13:39:35 +01:00
PT_Dreamer
7b1f9bf14e Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 2012-09-12 11:10:15 +01:00
PT_Dreamer
c11958c9b6 GCS-Review comments changes 
Added font mixer curve font size to linux default and wide stylesheets
Change Node class name to MixerNode to ease stylesheet access
Changed language selection to top of the list
 2012-09-12 11:09:30 +01:00
David Ankers
a4729ea27c Changes to default config, make UAVOB fill left side, add logging as it 
fits on system better, add GPS desplay gadget also.
 2012-09-12 07:49:16 +10:00
Dmytro Poplavskiy
02c00fabb2 GCS/PFDqml: split the world view to smaller parts 
Ground and sky is rendered as QML Rectangle with gradients;
Pitch scale and center line are rendered separately from the world
element, so they always fit the maximum texture size.
 2012-09-11 15:25:13 +10:00
Dmytro Poplavskiy
288cb40c92 Updated the pfd.svg file 
compass-band has a hidden vertical square to make the vertical limit.

New IDs:
world-bg (group of sky and ground)
sky (blue part of the world)
ground (orange part of the world)
pitch_scale (the center scale)
world-centerline (the centerline in the center of the world and in 
the middle of the sky and ground)

By muralha
 2012-09-11 15:22:04 +10:00
Dmytro Poplavskiy
18a9ad3aa8 PFD: split the compass band to parts to fit the texture limit 
On older graphics cards the texture size limit
may be smaller than the compass band width,
QML downscales the element to fit the texture.

To avoid this, split compass band to tiles.

Added parameter like hslice=2:8 to svg image provider
and SvgElementImage.
 2012-09-11 15:16:58 +10:00
Dmytro Poplavskiy
4cc13c9eea GCS/PFDqml: use the correct sceneSize for svg element images 
Pass the element source size instead of the scene source size
to ensure the element is not downscalled.
 2012-09-09 16:58:54 +10:00
Dmytro Poplavskiy
1102587570 GCS/PFDqml: fixed compass rendering 
Converted AttitudeActual.Yaw to -180..180 range,
so the whole compass band is always filled
 2012-09-03 15:23:51 +10:00
Dmytro Poplavskiy
99b898c5c2 GCS/PFDqml: display the VSI bar 
updated pfd.svg file with new compass and VSI bar
 2012-09-02 13:33:29 +10:00
chris pember
26b682122b fixed the text on the mixer, need mike or someone to hook up the reverse button for the yaw mixer, as well as change the range on the slider 2012-09-01 11:11:44 -07:00
chris pember
77ea0277d0 made some more adjustments to the stylesheet for osx, sliders in particular 2012-09-01 01:20:51 -07:00
chris pember
777bad5708 fixed the vertical sliders, fixed input/output header spacing over the config sliders, switched around the progress bar in stabi ui, more to come 2012-08-30 23:00:25 -07:00
chris pember
528cea9418 almost done fixing any spacing isues, changed the font so its bigger, added some new stylesheet properties to linux and osx 2012-08-28 23:27:36 -07:00
David Ankers
ca7827e0cd Monkey work!! 2012-08-17 09:21:46 +10:00
PT_Dreamer
525dec1748 GCS-Added gradient to edit gadgets bar 2012-08-16 23:30:31 +01:00
PT_Dreamer
b91afc2c12 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release 2012-08-16 19:37:55 +01:00