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
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
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
PT_Dreamer
9f0ad56745
GCS-Minor cleaning acording to review comments
2012-09-13 16:25:32 +01:00
James Cotton
42213b21f7
Make OSG selection a QMake config option (OSG)
...
To include this module from the command line:
make GCS_QMAKE_OPTS="CONFIG+=OSG" -j7 gcs
2012-09-13 09:46:03 -05:00
James Cotton
69688813b5
GCS Build: Include UAVTalk in SystemHealth dependencies
2012-09-13 09:28:46 -05:00
James Cotton
36242fa70e
Delete file that shouldn't have been committed
2012-09-12 16:06:47 -05:00
PT_Dreamer
abbf858123
Fixes special settings not being saved.
2012-09-12 21:57:49 +01: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
James Cotton
f9fd2bd1af
Merge branch 'pidt1' into next
2012-09-11 23:39:50 -05: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
James Cotton
7cb6e71fae
Remove a Q_UNUSED where the parameter doesn't exist.
2012-09-11 10:21:01 -05:00
James Cotton
2488b48f50
Merge branch 'usb_fixes' into next
2012-09-11 10:18:45 -05:00
James Cotton
d74b9c9b9f
Revert changes from Kenn in pjrc_rawhid which conflict with usb cleanup
2012-09-11 10:18:31 -05:00
James Cotton
509e7a2ec1
Merge remote-tracking branch 'origin/hyper/gcs-levelling-fixes' into next
2012-09-11 03:05:47 -05:00
PT_Dreamer
09f950ff76
GCS Fixes -clean-config command line argument segfault
2012-09-10 19:46:13 +01:00
Richard Flay (Hyper)
5b7fb6bcef
Minor improvement to GCS bias calibration logic, plus minor UI behaviour tweak
2012-09-10 22:22:36 +09:30
James Cotton
59dcbf5cb6
GCS OSX: More refinements to the USB code to make it more robust and work for reset/halt.
2012-09-10 02:04:59 -05:00
James Cotton
e027c25071
OSX USB: Add write and read mutexs to avoid closing mid write.
2012-09-10 00:32:40 -05:00
James Cotton
f8e5654ff4
Remove some comments
2012-09-09 23:45:04 -05:00
James Cotton
26ff40b5f3
GCS OSX: Work on how the receive threads are stopped properly
2012-09-09 23:43:38 -05:00
James Cotton
604e125251
GCS RawHID: Refactor the code to move most of the
...
functionality into one class. Removed support for
multiple open devices since we can just use multiple
classes.
2012-09-09 17:10:50 -05:00
James Cotton
741207ddc0
GCS OSX HID: Tweak the closing so that it doesn't crash. Still fails to unregister
...
the input callback.
2012-09-09 13:03:57 -05:00
James Cotton
8bb6a2600f
GCS Serial: Was double detecting USBCDC devices.
2012-09-09 11:40:14 -05:00
James Cotton
06fc1ed963
GCS USB: More the opening and closing code into the read
...
thread to simplify some threading issues on OSX. Should
not influence other operating systems.
2012-09-09 11:04:52 -05:00
PT_Dreamer
78a4241ba2
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
...
Conflicts:
ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configfixedwingwidget.cpp
ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configgroundvehiclewidget.cpp
ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp
ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/vehicleconfig.cpp
ground/openpilotgcs/src/plugins/config/configinputwidget.cpp
ground/openpilotgcs/src/plugins/config/configoutputwidget.cpp
ground/openpilotgcs/src/plugins/config/configvehicletypewidget.cpp
2012-09-09 13:04:29 +01:00
PT_Dreamer
ba575edbbc
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
...
OPReview 248
2012-09-09 12:30:09 +01:00
chris pember
6a94cd49b5
reworked ALL the ui pages in windows so they work there, so pushing this for now, it just needs love in osx
2012-09-08 18:35:14 -07:00
James Cotton
b84f833287
GCS Uploader: Remove dialog about another board since it's
...
not used for any boards now.
2012-09-08 20:05:07 -05:00
James Cotton
44d271ac79
GCS USB: Get rid of some unnecessary code
2012-09-08 20:04:44 -05:00
James Cotton
cf1c986550
OSX USB: Close more handles properly
2012-09-08 19:48:33 -05:00
James Cotton
3f11c398db
GCS USB: Start with polling enabled so it acts like before and grabs first available USB device
2012-09-08 19:46:45 -05:00
James Cotton
1aadcf4e70
GCS USB: Make sure to fully unregister all the callbacks when disconnect.
2012-09-08 19:31:32 -05:00
James Cotton
9b7060a491
GCS USB: Increase the max timeout before giving up on stopping the USB threads.
2012-09-08 19:07:14 -05:00
James Cotton
82f752685a
GCS ConnectionManager: When polling is disabled don't automatically connect to boards either.
2012-09-08 19:06:03 -05:00
James Cotton
2ec8434941
OSX USB: Make sure to store the run loop handle before connecting the signals that can use it.
2012-09-08 16:06:01 -05:00
James Cotton
6840b8934b
GCS ConnectionManager: More cleaner code structure.
2012-09-08 16:05:51 -05:00
James Cotton
8e8cbd0b75
GCS ConnectionManager: Use some cleaner code coventions
2012-09-08 15:45:08 -05:00
James Cotton
19eaa77a15
Remove some comments and unused variables
2012-09-08 15:32:12 -05:00
James Cotton
65ef8a59b4
GCS ConnectionManager: Get rid of all the copies of various forms of the names and
...
store a handle to the IConnection::device and generate the appropriate names from
consistent functions.
2012-09-08 15:14:06 -05:00
James Cotton
1ca8abb3c8
GCS ConnectionManager: Properly check it is the active connection before closing it when a USB device is disconnected.
2012-09-08 14:31:16 -05:00
James Cotton
3563c7376f
GCS ConnectionManager: When plugging in a new device don't glitch the connectionwq
2012-09-08 14:04:59 -05:00
James Cotton
9912432e84
GCS ConnectionManager: Remove some commented code
2012-09-08 13:33:50 -05:00
James Cotton
44e7c4542f
GCS USB: Implement structure for only adding new devices but need a way of
...
identifying them
2012-09-08 13:23:37 -05:00
James Cotton
e5ab9f0fda
GCS ConnectionManager: Consolidate the unregistering and registering devices
...
into one method
2012-09-08 12:53:00 -05:00
James Cotton
e6bcf96e2a
GCS USB: Remove unused include file
2012-09-08 12:47:15 -05:00
Richard Flay (Hyper)
c5745b0817
Fixes/tweaks to GCS levelling code. Fixed a deadlock and take more samples
2012-09-08 15:58:39 +09:30
PT_Dreamer
6325263a1d
Merge branch 'pt/CC3D_Release' of ssh://git.openpilot.org/OpenPilot into pt/CC3D_Release
...
Conflicts:
ground/openpilotgcs/src/plugins/config/configccattitudewidget.cpp
2012-09-06 12:41:08 +01:00
