James Cotton
|
223a3473c2
|
Merge branch 'next' into revo-mini
|
2012-09-12 02:03:39 -05:00 |
|
James Cotton
|
f9fd2bd1af
|
Merge branch 'pidt1' into next
|
2012-09-11 23:39:50 -05: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 |
|
James Cotton
|
c97e3ddb3d
|
Merge branch 'usb_fixes' into revo-mini
Conflicts:
ground/openpilotgcs/src/plugins/rawhid/pjrc_rawhid_mac.cpp
ground/openpilotgcs/src/plugins/rawhid/rawhid.cpp
|
2012-09-10 15:21:27 -05:00 |
|
James Cotton
|
38e9d105aa
|
Merge branch 'pidt1' into test2
Conflicts:
flight/Modules/ManualControl/inc/manualcontrol.h
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
shared/uavobjectdefinition/flightstatus.xml
shared/uavobjectdefinition/hwsettings.xml
shared/uavobjectdefinition/manualcontrolsettings.xml
shared/uavobjectdefinition/taskinfo.xml
|
2012-09-10 14:37:52 -05:00 |
|
James Cotton
|
386a9d41ef
|
Merge branch 'next' into test2
Conflicts:
ground/openpilotgcs/src/plugins/config/configrevowidget.cpp
ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
ground/openpilotgcs/src/plugins/uavobjects/uavobjecttemplate.m
|
2012-09-10 14:29:26 -05: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
|
ba575edbbc
|
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
OPReview 248
|
2012-09-09 12:30:09 +01: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 |
|
James Cotton
|
2f65fc1e8e
|
Merge branch 'next' into relay_tuning
Conflicts:
shared/uavobjectdefinition/manualcontrolsettings.xml
shared/uavobjectdefinition/taskinfo.xml
|
2012-09-04 10:43:04 -05:00 |
|
James Cotton
|
a3b75a3cc7
|
Merge remote-tracking branch 'origin/kenz/matlab_parser_vectorizing' into next
|
2012-09-02 19:23:18 -05:00 |
|
James Cotton
|
db083aa0e9
|
Merge branch 'android' into next
|
2012-09-02 19:19:23 -05:00 |
|
James Cotton
|
c9f66f5145
|
Merge branch 'revo' into revo-mini
Conflicts:
androidgcs/AndroidManifest.xml
androidgcs/res/layout/gcs_home.xml
androidgcs/res/values/strings.xml
androidgcs/src/org/openpilot/androidgcs/AttitudeView.java
androidgcs/src/org/openpilot/androidgcs/HomePage.java
flight/PipXtreme/System/pios_board.c
ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
shared/uavobjectdefinition/taskinfo.xml
|
2012-09-01 16:57:27 -05:00 |
|
James Cotton
|
2c003d8b0b
|
PathCompiler: Link up the path compiler to the map again. Got broken in the merge.
|
2012-09-01 16:50:08 -05:00 |
|
James Cotton
|
6bfb2a5e45
|
Merge branch 'next' into revo
Conflicts:
ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/mapgraphicitem.cpp
ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/mapripper.cpp
ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointitem.cpp
ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointitem.h
ground/openpilotgcs/src/libs/utils/coordinateconversions.cpp
ground/openpilotgcs/src/libs/utils/coordinateconversions.h
ground/openpilotgcs/src/plugins/opmap/opmap.pro
ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.h
ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
shared/uavobjectdefinition/taskinfo.xml
shared/uavobjectdefinition/waypoint.xml
|
2012-09-01 16:18:03 -05:00 |
|
James Cotton
|
60051e88cc
|
Calibration: Fix both accels and gyros to 30 ms. Should be reasonably sustainable through USB.
|
2012-08-30 11:38:15 -05:00 |
|
James Cotton
|
75db9f5941
|
OP-669: Gyros were not being sent at a rapid rate during calibration making the results quite noisy.
Now both accels and gyros require a minimum number of updates before calibration completes.
Thanks to ti.dyer for the report and fix.
|
2012-08-29 04:29:55 -05:00 |
|
James Cotton
|
3e6f98b2e8
|
Update the OSX packaged icons to those from 3rdeyepro / dacat.
|
2012-08-28 18:32:49 -05:00 |
|
James Cotton
|
001c43c090
|
Increase timeout to shut down the telemetry threads. Might fix some OSX USB related crashes.
|
2012-08-25 23:44:58 -05:00 |
|
Stacey Sheldon
|
144fea1bd1
|
gcs: fix pipx-related typos in GCS
This also fixes the auto-selecting of FW images for
pipx in the uploader GUI by making the board name
match fw_pipxtreme.
|
2012-08-25 23:22:56 -05:00 |
|
Stacey Sheldon
|
d4794d139f
|
gcs: fix pipx-related typos in GCS
This also fixes the auto-selecting of FW images for
pipx in the uploader GUI by making the board name
match fw_pipxtreme.
|
2012-08-25 23:46:40 -04:00 |
|