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

6491 Commits

Author SHA1 Message Date
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
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