a*morale
257b00a400
Fixed a typo on I2C speed for the MS5611
2012-08-25 12:28:25 +02:00
a*morale
789746151a
Fixes the selection of the oversample settings from the pios_ms5611_cfg.oversapling configuration
2012-08-25 11:29:01 +02:00
Brian Webb
34b433e074
Added UAVTalkSendBuf function and added locking in UAVTalkSendAck and UAVTalkSendNack.
2012-08-24 19:42:10 -07:00
Brian Webb
b1c88628f6
Merge branch 'james/revo' of ssh://git.openpilot.org/revo into brian/revo_link
2012-08-24 19:35:40 -07:00
Brian Webb
7ce0004c47
Added include of stdint.h to aes.c
2012-08-24 19:26:06 -07:00
James Cotton
5ec44d3407
Merge branch 'android_osg' into android_revo
...
Conflicts:
androidgcs/AndroidManifest.xml
androidgcs/res/layout/gcs_home.xml
androidgcs/res/values/strings.xml
androidgcs/src/org/openpilot/androidgcs/HomePage.java
2012-08-24 20:26:04 -05:00
James Cotton
f37433e280
AndroidGCS OSG: Force inclusion of the 3DS plugin and use a 3DS model. Also include the jpeg and png libraries and plugins to load the textures. However they currently aren't visible.
2012-08-23 11:20:01 -05:00
Brian Webb
76907fe8f1
Changed PipXStatus UAVO to update 1 / second.
2012-08-23 07:02:51 -07:00
James Cotton
08bb355749
AndroidGCS OSG: Increase OSG debugging level and try and include osgdb_3ds without success from the git build.
2012-08-22 22:34:20 -05:00
Brian Webb
88c8cba0ff
Reduced size of temporaries to the correct size in rs.c
2012-08-22 06:46:51 -07:00
Brian Webb
2cd0733f7d
Removed unecessary include of stm32f10x.h from aes.h
2012-08-22 06:45:44 -07:00
James Cotton
f60a6baf3e
AndroidGCS OSG: Switch to hardcoded quad model instead of cow. The quad file was made from the 3DS models using
...
osgconv --enable-object-cache -s 0.01,0.01,0.01 --simplify 0.1 --smooth ~/Programming/OpenPilot/artwork/3D\ Model/multi/joes_cnc/J14-QT_X.3DS quad.osg
to get teh scaling normal for the screen too.
2012-08-21 15:24:07 -05:00
James Cotton
f8804574e8
AndroidGCS OSG: Clean up function API
2012-08-21 11:25:14 -05:00
James Cotton
4dbaa63931
AndroidGCS OSG: Register for attitude updates in the OSG view
2012-08-21 11:09:52 -05:00
James Cotton
b9e20ad0b7
AndroidGCS OSG: Add the OSG view to the main launcher page
2012-08-21 11:02:57 -05:00
James Cotton
616f488c6c
AndroidGCS OSG: Add stub for rotating model
2012-08-21 10:30:20 -05:00
James Cotton
905a81844c
AndroidGCS OSG: Now shows a cow. The model path is hardcoded.
2012-08-21 00:23:04 -05:00
James Cotton
129edf4398
AndroidGCS OSG: Get context showing
2012-08-21 00:04:26 -05:00
James Cotton
34b21bec3c
AndroidGCS: OSG import basic OSG code
2012-08-20 22:56:21 -05:00
James Cotton
f7751655d7
Merge branch 'android' into android_revo
2012-08-20 22:01:23 -05:00
James Cotton
d58831d3f1
GCS: Add conditial flag to include OGS plugins. Must compile with qmake CONFIG+=OSG
...
To include this module from the command line:
make GCS_QMAKE_OPTS="CONFIG+=OSG" -j7 gcs
2012-08-20 15:36:18 -05:00
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