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

7156 Commits

Author SHA1 Message Date
James Cotton
6e114360f4 Merge branch 'next' into revo
Conflicts:
	shared/uavobjectdefinition/taskinfo.xml
2012-09-27 14:04:44 -05:00
James Cotton
684620dce6 Merge remote-tracking branch 'origin/hyper/uavobjectparser-tweaks' into next
Conflicts:
	shared/uavobjectdefinition/taskinfo.xml
2012-09-27 13:49:34 -05:00
James Cotton
5326d26487 Merge remote-tracking branch 'origin/stac/usb-cdc-fixes' into next 2012-09-27 12:16:16 -05:00
James Cotton
0fa4b062a4 Merge branch 'next' into revo 2012-09-26 00:43:02 -05:00
James Cotton
f77df97699 OSGEarth: Remove function definition without implementation. 2012-09-25 13:24:08 -05:00
James Cotton
7d8c61d33d OSGEarth: Remove reference to caching. Uses old API. 2012-09-25 13:19:18 -05:00
PT_Dreamer
43f85d9617 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next 2012-09-25 10:44:32 +01:00
PT_Dreamer
551c56f3c0 Merge branch 'pt/UAVO_Hash' of ssh://git.openpilot.org/OpenPilot into next 2012-09-25 10:43:59 +01:00
PT_Dreamer
3d5381893b GCS-Changed relaytuning uavo to gcs readOnly 2012-09-24 22:47:18 +01: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
PT_Dreamer
8b91e19733 GCS/Telemetry Fixes reconnection loop
This fixes a situation where the telemetry would keep looping from the
connected to the reconnecting state. One of the situations this was
happening was going from "halt" to "boot"
2012-09-24 12:32:46 +01:00
PT_Dreamer
c8de27cbaf GCS/Uploader Changes acording to review
Changed template comments.
Added UAVO hash to the GCS help dialog
2012-09-24 12:17:32 +01:00
PT_Dreamer
4e08fa548f GCS/Uploader- Added leading zeros to git hash 2012-09-24 11:50:15 +01:00
Stacey Sheldon
215ff56fe8 usbcdc: fix handling of CDC SET_LINE_CODING request
The SET_LINE_CODING request contains data and must be
handled as such.

Previously, the only requests that had data were IN
requests.  SET_LINE_CODING is an OUT request so it
required additional changes to support a new type of
data request.
2012-09-24 00:56:25 -04:00
Stacey Sheldon
5e37448814 usb: correct enum for CDC SET_CONTROL_LINE_STATE request 2012-09-24 00:53:52 -04:00
Stacey Sheldon
c056ac5261 usbcdc: don't assert on calls when CDC is not initialized
The CDC interface is always advertised in the FW USB
descriptors.  It is NOT always enabled/initialized at
runtime.  Specifically, it can be Disabled in HwSettings.

Previously, any CDC-related query that the host would send
resulted in an assert and a watchdog.

Now, a suitable return code indicating that the request is
unsupported is returned in this scenario.
2012-09-24 00:53:12 -04:00
Stacey Sheldon
6b2d1e3d6f uavo hash: ensure that uavo hash is stable across OSes
In python, os.walk() is not sorted.  This can result in the
hash being computed over the files in different orders on
different OSes, or even after touching a directory.

This ensures that the files are considered in lexical order
so that the hash is stable.
2012-09-23 20:45:06 -04:00
Dmytro Poplavskiy
dbbdb62173 Added the readymap based earth files 2012-09-23 19:30:10 +10:00
Dmytro Poplavskiy
28f028064a Fixed the osgearth cache only configuration
osgEarth enables it even if OSGEARTH_CACHE_ONLY is set to false
it's necessary to unset it instead
2012-09-23 19:13:05 +10: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
PT_Dreamer
c3b9e7a992 GCS-UAVObject Browser
Changed the save and load buttons order
2012-09-21 19:03:40 +01:00
PT_Dreamer
738cc44930 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next 2012-09-21 18:56:21 +01:00
PT_Dreamer
8f23905a99 GCS- Input config gadget
Text changes only from Berkely
2012-09-21 18:40:55 +01:00
James Cotton
aff29b5af5 GCS: Add some plugin dependencies. Thanks to Amedee for finding these. 2012-09-20 15:55:16 -05:00
James Cotton
64d8f64ea7 Matlab parser: small fix from Kenz 2012-09-20 15:28:47 -05:00
PT_Dreamer
8bd4a8c6fd GCS - Very small UI fix on the autotuning page 2012-09-20 10:22:52 +01: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
James Cotton
497683e571 Fix OSX simulator 2012-09-18 13:29:11 -05:00
PT_Dreamer
f8387bfaaa GCS-Only update the aiframe config widget after all relevant objects are updated
This was deleted by someone with any aparent reason.
2012-09-18 14:23:35 +01:00
PT_Dreamer
0d30138571 GCS-Reduced UAVO hash bytes displayed from 20 to 8 2012-09-18 13:51:44 +01:00
PT_Dreamer
fb073059ad GCS-Use uavo definition hash to check for compatability
Unfortunately had to change the iap object.
2012-09-17 17:08:15 +01:00
David Ankers
ca7ce48a4e Spelling fix with input wizard, add a t to transmitter spotted by Drifter. 2012-09-17 22:11:51 +10:00
Stacey Sheldon
6f9f737c35 gcs uavo: remove obsolete UAVOs from project for GCS 2012-09-16 21:42:05 -05:00
Stacey Sheldon
14123069be gdb: add gdb config file for CC BU image 2012-09-16 21:13:42 -04:00
David Ankers
410a9a1837 Add Steve's curve bg 2012-09-17 09:04:36 +10:00
Stacey Sheldon
368d57bc92 Merge remote-tracking branch 'origin/lilvinz/OP-300' into next 2012-09-16 16:05:25 -04:00
Stacey Sheldon
3e236bd3e6 makefile: change QT SDK install dir so we can support multiple installs
QT SDK version was changed but the install dir wasn't changed
to match.  This makes it impossible to keep both versions
installed at the same time which is essential in order to work
on/build old and new branches.

This update gives the new SDK version a unique install dir so
it can coexist with older versions.
2012-09-16 16:01:24 -04:00
Stacey Sheldon
05483e2a74 simposix: adapt simposix to addition of relay tuning 2012-09-16 15:40:47 -04:00
lilvinz
718062ed6e pios_led: added support for active_high connected leds 2012-09-16 18:19:27 +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
fa2aa81079 First pass on using the uavo hash to check compatability between GCS and FW 2012-09-15 23:02:45 +01:00
James Cotton
51683ffb65 Merge branch 'next' into revo
Conflicts:
	ground/openpilotgcs/src/plugins/config/input.ui
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.h
	ground/openpilotgcs/src/plugins/plugins.pro
2012-09-15 16:31:30 -05:00
PT_Dreamer
6d7fa8a083 Flight-Added sha1 uavo directory calculation to fw_version_info struct. 2012-09-14 23:31:13 +01:00
PT_Dreamer
c88c4f0fc0 Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
Conflicts:
	ground/openpilotgcs/src/plugins/config/config.pro
	ground/openpilotgcs/src/plugins/config/configccattitudewidget.cpp
	ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.cpp
	ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.h
2012-09-14 14:12:16 +01:00
Dmytro Poplavskiy
a8e6f4991b Added "use OpenGL" option to qml based PFD 2012-09-14 08:50:02 +10:00