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
James Cotton
badbadef2f
Remove legacy code for supporting two USB interfaces
2012-08-12 13:41:15 -05:00
James Cotton
a0ca56a071
HID: move all the variables to the top
2012-08-12 13:28:38 -05:00
James Cotton
b19a0947fb
AndroidGCS: In the telemetry class use a thread safe queue for transations and
...
removed the synhronized blocks to prevent deadlocks.
2012-08-12 13:23:51 -05:00
James Cotton
e3ab372516
AndroidGCS: Cleanup of the HID telemetry code
2012-08-12 13:23:51 -05:00
James Cotton
75c7c167f0
AndrodGCS: Correctly check HID packet format
2012-08-12 00:32:09 -05:00
James Cotton
4199562534
AndroidGCS: Make sure not to try and get interface to expired telemetry
2012-08-12 00:32:09 -05:00
Stacey Sheldon
4d73c1e2c2
makefile: fix clobbered JTAG macro in firmware-defs.mk
...
JTAG rules got clobbered at some point. This should
fix:
make fw_coptercontrol_program
and others like it.
2012-08-11 22:28:43 -04:00
Stacey Sheldon
9f8d22961f
cc makefile: enable -ffunction-sections and -fdata-sections
...
These compiler options place each function and each global variable
into its own ELF section in each .o file. This, combined with the
linker option --gc-sections allows the linker to evict unused functions
and variables from the final ELF file.
On CC, the firmware flash bank is only 118784 bytes in total.
This commit reduces the .text segment from 114120 to 83536 and .data
from 572 bytes to 560 bytes. That frees up a grand total of 30596 bytes
of flash and 12 bytes of RAM.
2012-08-11 20:13:09 -04:00
James Cotton
6fe2cb7738
Merge branch 'android_hid' into android_revo
...
Conflicts:
androidgcs/src/org/openpilot/androidgcs/telemetry/OPTelemetryService.java
2012-08-11 14:53:04 -05:00
James Cotton
d0bb6c3813
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-11 14:49:35 -05:00
Stacey Sheldon
bbe86332de
hid joystick: mentioned new feature in HISTORY file
2012-08-11 11:28:44 -04:00
Stacey Sheldon
b505602c15
Merge remote-tracking branch 'origin/stac/rc-tx-joystick-emulation' into next
2012-08-11 11:21:18 -04:00
James Cotton
5addc15f60
AndroidGCS: Get HID working properly for PipX
2012-08-11 02:29:26 -05:00
James Cotton
de2f6a64e2
AndroidGCS: Add support for HID to AndroidGCS
2012-08-10 23:19:47 -05:00
Stacey Sheldon
49c153003c
hid joystick: use linearly scaled channels
...
Scales each channel only based on max and min calibrated values.
The neutral value is now ignored so the joystick sees a linear
range between min and max.
This is particularly useful to allow the full range of values for
throttle to be passed through to the joystick.
2012-08-10 23:36:06 -04:00
Stacey Sheldon
07fde38887
hid joystick: factor out min/max range from report items
2012-08-10 23:29:34 -04:00
James Cotton
cab661e94b
AndroidGCS: Update the controller gadget to the newer style updates
2012-08-10 16:16:39 -05:00
James Cotton
9985910969
AndroidGCS TelemetryMonitor: Now that transactions are working more reliably we
...
can emit the connected signal at the end of fetching all the objects.
2012-08-10 16:11:20 -05:00
James Cotton
38117f6e69
AndroidGCS Telemetry: Telemetry no longer enqueues identical object
...
transactions multiple times so only the most recent will occur. Since it
doesn't enqueue the data the end behavior to the UAV should be identical.
Also renamed processObjectUpdates to enqueueObjectUpdates to make it more
intuitive.
2012-08-10 15:58:52 -05:00
James Cotton
1d361a53cd
AndroidGCS Telemetry: Make sure when telemetry changes settings it removes it's
...
listeners before adding more
2012-08-10 15:27:43 -05:00
James Cotton
de26c3297e
AndroidGCS Telemetry: Get rid of a tier of redirection through annoymous
...
classes that was legacy from the GCS port.
2012-08-10 15:22:56 -05:00
James Cotton
6ebf4fe87c
AndroidGCS UAVTalk: Pretty thorough clean up focused on how transactions are
...
handled at the UAVTalk level where there can only be one pending transaction on
the wire.
2012-08-10 14:18:41 -05:00
James Cotton
6b9b49734e
Check there is an active telemetry before trying to disconnect it
2012-08-10 10:21:28 -05:00
James Cotton
1bc8553658
Small typo in telemetry merge.
2012-08-10 10:20:45 -05:00
James Cotton
82637ff8ab
Now the callbacks disconnect system alarms shouldn't need to check the fields
...
are not null
2012-08-10 10:20:21 -05:00
James Cotton
d14ad1c354
Check in some missing artwork
2012-08-10 10:15:32 -05:00
James Cotton
d429cc200c
Merge branch 'sim_android_telemetry' into sim_android
...
Conflicts:
androidgcs/src/org/openpilot/androidgcs/telemetry/OPTelemetryService.java
2012-08-10 10:12:48 -05:00
James Cotton
a8fa1c6b0d
Merge branch 'android' into sim_android
2012-08-10 10:10:47 -05:00
James Cotton
29d5365f0a
AndroidGCS: More refactoring of ObjectManagerActivity. Now the updates are
...
disconnected on pause and reestabilished on resume. This only happens within
an onConnected/onDisconnected life cycle.
2012-08-10 10:04:22 -05:00
James Cotton
176922f41c
AndroidGCS: Also make the map disconnect its listeners.
2012-08-10 10:04:17 -05:00
James Cotton
749d695f4d
AndroidGCS: ObjectManagerActivity maintains a list of objects it is getting
...
updates from and disconnects them on onStop(). This should probably move to
onPause / onResume
2012-08-10 10:04:11 -05:00
James Cotton
4bcb5437cd
AndroidGCS: More refactoring of ObjectManagerActivity. Now the updates are
...
disconnected on pause and reestabilished on resume. This only happens within
an onConnected/onDisconnected life cycle.
2012-08-10 09:48:10 -05:00
James Cotton
4594a59155
AndroidGCS: Also make the map disconnect its listeners.
2012-08-10 08:53:29 -05:00
