Brian Webb
|
e3f7c1d138
|
Merge remote-tracking branch 'revo/james/revo' into brian/revo_link
Conflicts:
ground/openpilotgcs/src/plugins/plugins.pro
|
2012-08-25 13:03:44 -07:00 |
|
James Cotton
|
a9b48cf1ca
|
Merge remote-tracking branch 'revo/amorale/revolution_baro_fixes' into revo
|
2012-08-25 14:55:23 -05:00 |
|
Brian Webb
|
b3dc617702
|
Fixed PPM output from updated RadioComBridge module.
|
2012-08-25 12:52:06 -07:00 |
|
Brian Webb
|
e602b73a6f
|
Split out the PipX radio interface from RadioComBridge module to a separate Radio module. Now the RadioComBridge module just routes messages between the com ports and handles sending/receiving the PipX UAVOs.
Conflicts:
flight/Modules/RadioComBridge/RadioComBridge.c
flight/PipXtreme/System/pios_board.c
Conflicts:
flight/Modules/RadioComBridge/RadioComBridge.c
|
2012-08-25 12:29:02 -07:00 |
|
Brian Webb
|
415b86879c
|
Added the RFM22B driver to the Revo to support an RFM22B radio on the external SPI port.
|
2012-08-25 11:45:43 -07:00 |
|
Brian Webb
|
fad32dcc29
|
Split out the PipX radio interface from RadioComBridge module to a separate Radio module. Now the RadioComBridge module just routes messages between the com ports and handles sending/receiving the PipX UAVOs.
|
2012-08-25 11:41:32 -07:00 |
|
a*morale
|
c696cccff8
|
Added an option to be able to change the interleave between Pressure and Temperature conversion for the MS5611
To enable this option define the PIOS_MS5611_SLOW_TEMP_RATE with the number of Pressure conversion for each Temperature conversion.
|
2012-08-25 13:04:41 +02:00 |
|
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 |
|
Brian Webb
|
76907fe8f1
|
Changed PipXStatus UAVO to update 1 / second.
|
2012-08-23 07:02:51 -07: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
|
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
|
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 |
|
James Cotton
|
5e61f66fc0
|
Messed up merge on manualcontrol settings
|
2012-08-12 14:44:54 -05:00 |
|
James Cotton
|
e43819b129
|
Updated android objects from merge
|
2012-08-12 14:44:39 -05:00 |
|
James Cotton
|
18d63f7e9c
|
Merge commit 'b19a0947fb72dc069540561ffeb6983ee318fcb9' into revo
|
2012-08-12 14:39:30 -05:00 |
|
James Cotton
|
75db0fcb35
|
Merge branch 'next' into revo
Conflicts:
flight/Modules/GPS/GPS.c
shared/uavobjectdefinition/manualcontrolsettings.xml
shared/uavobjectdefinition/systemalarms.xml
|
2012-08-12 14:38:38 -05:00 |
|
James Cotton
|
ae56dc74c2
|
Make sure the USB scheduling is thread safe.
|
2012-08-12 14:12:35 -05:00 |
|
James Cotton
|
02a1c94545
|
HID: Since there is only one usb device connection queue read and write events
onto that single connection and wait for either.
|
2012-08-12 14:00:50 -05:00 |
|