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

6561 Commits

Author SHA1 Message Date
James Cotton
113a759cd9 Merge branch 'next' into revo 2012-08-19 21:22:02 -05:00
James Cotton
4a0d43cb54 GCS: When PipX is detected do not make it the active configuration tab to prevent the dialog about dirty tabs appearing.
Conflicts:

	ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp
2012-08-19 21:20:18 -05:00
James Cotton
237ec188f9 GCS: When PipX is detected do not make it the active configuration tab to prevent the dialog about dirty tabs appearing. 2012-08-19 21:17:37 -05:00
James Cotton
d186069ebd Update hardcoded OSG paths. Very dirty I need to fix this properly. 2012-08-19 12:48:48 -05:00
Stacey Sheldon
bb26f5118d Merge remote-tracking branch 'origin/stac/enable-sections-gc-options' into next 2012-08-18 19:12:03 -04:00
Brian Webb
171f91336c Removed assert that was no longer needef form PipX pios_board.c 2012-08-18 08:40:19 -07:00
Brian Webb
1335ba2636 Turned off compile of osgearthview plugin. 2012-08-18 08:40:07 -07:00
James Cotton
31267d9b8c Merge branch 'android_telemetry_handler' into revo
Conflicts:
	androidgcs/src/org/openpilot/uavtalk/Telemetry.java
2012-08-16 03:59:37 -05:00
James Cotton
caff64ed7e AndroidGCS Telemetry: Fix the determination of whether a transaction is pending 2012-08-16 03:44:11 -05:00
James Cotton
b614368359 AndroidGCS Telemetry: Use a runnable for the transaction timeout. Now all of
telemetry is using handlers nicely, but we still can have multiple
transactions queued for the same object.
2012-08-16 03:44:11 -05:00
James Cotton
9f326f28d8 AndroidGCS: Handler based telemetry. Now reschedule transactions if one is
pending.
2012-08-16 03:44:11 -05:00
James Cotton
a78fd852b1 AndroidGCS Telemetry: Finish moving telemetry into a runnable. 2012-08-16 03:44:11 -05:00
James Cotton
319baa9e6f AndroidGCS: Start moving the telemetry object queue to a handler and a looper 2012-08-16 03:44:11 -05:00
James Cotton
d5c1e3578e AndroidGCS HID: Remove more locks to try and prevent HID deadlocking 2012-08-16 03:44:10 -05:00
James Cotton
f96b419a85 AndroidGCS: Add a toast message when connected (all objects downloaded) 2012-08-16 03:44:10 -05:00
James Cotton
53d4d8b507 AndroidGCS HID: Use the dettached message to shut down HID telemetry properly 2012-08-16 03:44:10 -05:00
James Cotton
5e163861a4 AndroidGCS HID: Go back to a read and write thread but now use synchronous
bultTransfer for write which gets rid of the segfaults with running two
asynchronous transfers.
2012-08-16 03:44:10 -05:00
James Cotton
785cda8052 AndroidGCS: Add back a few synchronize blocks in telemetry to avoid removing
elements twice.
2012-08-16 03:43:29 -05:00
James Cotton
335ccc54a3 AndroidGCS Controller: Make sure to remove the callback on manual control
settings before updating it.
2012-08-16 03:43:28 -05:00
James Cotton
75ce520503 Make sure the USB scheduling is thread safe. 2012-08-16 03:43:28 -05:00
James Cotton
69fbefee85 HID: Since there is only one usb device connection queue read and write events
onto that single connection and wait for either.
2012-08-16 03:43:28 -05:00
James Cotton
6b4a14fa87 Remove legacy code for supporting two USB interfaces 2012-08-16 03:43:28 -05:00
James Cotton
050ec8096b HID: move all the variables to the top 2012-08-16 03:43:28 -05:00
James Cotton
f8ba049d56 AndroidGCS: In the telemetry class use a thread safe queue for transations and
removed the synhronized blocks to prevent deadlocks.
2012-08-16 03:43:28 -05:00
James Cotton
405c5a60f0 AndroidGCS: Cleanup of the HID telemetry code 2012-08-16 03:43:27 -05:00
James Cotton
3d34a5d280 AndrodGCS: Correctly check HID packet format 2012-08-16 03:43:27 -05:00
James Cotton
5fa36ddd5c AndroidGCS: Make sure not to try and get interface to expired telemetry 2012-08-16 03:43:27 -05:00
James Cotton
90779506be AndroidGCS: Refactor TCP and HID onto a common TelemTask class which handles
most of the logic of setting up the UAVTalk, ObjectMangager, Telemetry and
TelemetryMonitor classes.  Provides a cleaner shutdown too.
2012-08-16 03:43:10 -05:00
James Cotton
4eb846ba93 AndroidGCS: Get HID working properly for PipX 2012-08-16 03:43:10 -05:00
James Cotton
dc90210cfa AndroidGCS: Add support for HID to AndroidGCS 2012-08-16 03:43:10 -05:00
James Cotton
8a5819379a AndroidGCS Telemetry: Fix the determination of whether a transaction is pending 2012-08-15 02:02:05 -05:00
James Cotton
7f028f6d42 AndroidGCS Telemetry: Use a runnable for the transaction timeout. Now all of
telemetry is using handlers nicely, but we still can have multiple
transactions queued for the same object.
2012-08-15 01:21:16 -05:00
James Cotton
1bbfb35446 AndroidGCS: Handler based telemetry. Now reschedule transactions if one is
pending.
2012-08-15 00:01:14 -05:00
James Cotton
653702ac23 AndroidGCS Telemetry: Finish moving telemetry into a runnable. 2012-08-13 23:47:37 -05:00
James Cotton
2d7bb4d3bb AndroidGCS: Start moving the telemetry object queue to a handler and a looper 2012-08-13 15:02:15 -05:00
James Cotton
2f65952952 AndroidGCS HID: Remove more locks to try and prevent HID deadlocking 2012-08-13 02:00:54 -05:00
James Cotton
aa9894c481 AndroidGCS: Add a toast message when connected (all objects downloaded) 2012-08-13 01:37:15 -05:00
James Cotton
3ea9ecd53b AndroidGCS HID: Use the dettached message to shut down HID telemetry properly 2012-08-13 01:25:08 -05:00
James Cotton
daab45d14d AndroidGCS HID: Go back to a read and write thread but now use synchronous
bultTransfer for write which gets rid of the segfaults with running two
asynchronous transfers.
2012-08-13 01:07:09 -05:00
James Cotton
f012248fd1 Updated android objects from merge 2012-08-13 00:09:10 -05:00
James Cotton
ef581342ac AndroidGCS: Add back a few synchronize blocks in telemetry to avoid removing
elements twice.
2012-08-13 00:08:14 -05:00
James Cotton
d77912e4b0 AndroidGCS Controller: Make sure to remove the callback on manual control
settings before updating it.
2012-08-13 00:08:08 -05:00
James Cotton
c4b82fa1fd Disable transmitter updating PH location while using a tablet. 2012-08-12 17:51:52 -05:00
James Cotton
e43651e57e AndroidGCS: Add back a few synchronize blocks in telemetry to avoid removing
elements twice.
2012-08-12 17:21:59 -05:00
James Cotton
cf4dbe2b07 AndroidGCS Controller: Make sure to remove the callback on manual control
settings before updating it.
2012-08-12 17:21:13 -05:00
James Cotton
44dc01126e Merge branch 'next' into revo 2012-08-12 16:12:54 -05:00
James Cotton
63e490a922 Update the config file so the mag scopes selection works 2012-08-12 16:12:21 -05:00
James Cotton
3a0c259de3 Update the config file so the mag scopes selection works 2012-08-12 16:11:49 -05:00
James Cotton
3d1a6cbcba Attitude: Make sure the EKF can init if HomeLocation is not set but the
magnetic field is.  Good for switching between indoor and outdoor mode.
2012-08-12 16:11:04 -05:00
James Cotton
880eb5eb11 Fix revo for the removal of SDCard supprot 2012-08-12 14:45:06 -05:00