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

6736 Commits

Author SHA1 Message Date
James Cotton
7eac1e2245 AndroidGCS Telemetry: Use more finely grained semaphores to fix a deadlock
between UAVTalk and Telemetry.

1. processInputStream -> updateObjReq (locks uavtalk) -> tranactionCompleted (locks transInfo)
2. transactionTimeout (locks transInfo) -> sendObjectRequest -> ? -> setupTransaction (locks uavtalk)
2012-10-14 16:03:23 -05:00
James Cotton
c142deaa9d When the UAVO collection is missing, list which are available. 2012-10-14 14:34:11 -05:00
James Cotton
16adf27082 AndroidGCS: Make the telemetry monitor deal with loading the UAVO set before
starting to retrieve all the objects.
2012-10-14 14:33:27 -05:00
PT_Dreamer
e43d3dd7db GCS-Show first 4 bytes of uavohash instead of last 4. 2012-10-14 19:32:19 +01:00
Stacey Sheldon
bc13c20bf3 uavohash: normalize line endings before computing hash
Line endings in the UAVO XML files differ from file to file
and this results in different SHA1 sums being computed on
Windows vs. Linux/Mac.

This normalizes the line endings to LF (python native) while
processing the XML files.
2012-10-14 13:33:58 -04:00
Fredrik Arvidsson
173cf041cb Fixed texts in Vehicle Setup Wizard.
Added new icons for PipX.
Enabled hyper link to esc wiki page on wizard output page.
2012-10-14 16:46:28 +02:00
PT_Dreamer
70d7d16aff GCS-Debug message to understand different uavohash behaviour 2012-10-14 14:52:04 +01:00
PT_Dreamer
30959b460d GCS-Airframe config
Fixes rounding issues. Needs TESTING.
2012-10-14 13:15:09 +01:00
sambas
731ac9bc48 Y6 Pitch and Yaw mixer load fix 2012-10-14 12:08:37 +01:00
PT_Dreamer
d25061ac0a GCS-Hides wizard to display dialog 2012-10-14 01:10:30 +01:00
Stacey Sheldon
9e75547bb4 makefile: remove nearly all reliance on symlinks
Symlinks to nonexistent files or directories don't
work on windows.
2012-10-13 18:59:15 -04:00
Stacey Sheldon
18b5bd4690 makefile: stop using extended regexp in sed
Looks like mac doesn't support the -r option to sed to
turn on extended regexps.  It only supports the -E option
which linux doesn't.

So, simplest fix is to avoid extended regexps and just
use as many dots as possible from now on.
2012-10-13 15:58:20 -04:00
chris pember
4226af60a4 GCS-Fix growing button on the calibration page 2012-10-13 19:26:05 +01:00
PT_Dreamer
2b48cf3d90 GCS-Ensure wizard is top window 2012-10-13 18:57:02 +01:00
James Cotton
0559c90689 OSX packaging: Finally link SDL in properly. 2012-10-13 18:03:18 +01:00
James Cotton
28d3cdcd7a SetupWizard: Store a flag if the wizard is running to prevent starting two.
This is still not as good as getting that dialog modal since the user can get
it lost behind the main window.
2012-10-13 17:48:57 +01:00
James Cotton
b99b221a6d Setup Wizard: Trigger the wizard with show() instead of exec() as using
exec blocks the main application event loop.
2012-10-13 17:46:31 +01:00
PT_Dreamer
ae80370b1d GCS-Fixes custom mixer saving bug 2012-10-13 17:45:41 +01:00
Stacey Sheldon
af1b290381 makefile: stop using -I or -i in xargs
Windows doesn't like -I.  Mac doesn't like -i.

This now avoids using either option to xargs by
using awk to reorder the ln command line args prior
to invoking xargs.
2012-10-12 23:57:02 -04:00
Stacey Sheldon
ccdd3de47e makefile: fix androidgcs build issues on windows
Use '-i' (deprecated) in xargs instead of '-I' so old
versions of xargs work.

Use only relative paths to files passed to tar since the
windows version doesn't seem to handle 'c:/' at the start
of the path.
2012-10-12 22:49:16 -04:00
PT_Dreamer
c6936870c1 GCS-Fixes custom mixer saving bug 2012-10-12 18:32:54 +01:00
James Cotton
96afe7cffd Merge remote-tracking branch 'origin/stac/add-debug-consoles' into next 2012-10-12 08:07:44 -05:00
James Cotton
d0ee515daf Merge remote-tracking branch 'origin/kenz/coax_heli' into next 2012-10-12 08:06:13 -05:00
Laura Sebesta
36087b1339 Changed new config files to include new HiTL settings. 2012-10-12 08:53:13 +02:00
Laura Sebesta
2bad221ec2 Merge branch 'kenz/hitl_merge' into next 2012-10-12 07:41:17 +02:00
PT_Dreamer
d8f99b4096 GCS - Remove test button 2012-10-11 22:33:05 +01:00
James Cotton
11dbdf3a52 AndroidGCS: Only use a 16 character name for UAVOs. Was breaking before on hardware. 2012-10-11 12:38:16 -05:00
PT_Dreamer
c99d048eb9 GCS-Wizard
Be a bit more verbose on one of the board update messages.
2012-10-11 14:59:18 +01:00
Oleg Semyonov
4aa3c38d40 packaging: fix opfw_resource build dependencies 2012-10-11 16:40:35 +03:00
Fredrik Arvidsson
18f2d8e219 Added new button graphix for upgrade button on autoupdate page. Changed the texts slightly to be less offending. ;) 2012-10-11 13:31:02 +02:00
Stacey Sheldon
f0e0c2e79e console: add debug console via USB CDC/VCP interface
The USB VCP Port has a new DebugConsole setting that
routes all output destined for PIOS_COM_DEBUG to the
emulated serial port.

To enable this in your build, you'll have to build like:
 - make fw_coptercontrol_clean
 - make fw_coptercontrol ENABLE_DEBUG_CONSOLE=YES

You can then output formatted text to the console
like this:
  #if defined(PIOS_INCLUDE_DEBUG_CONSOLE)
  PIOS_COM_SendFormattedString(PIOS_COM_DEBUG,
                               "foo is %u\r\n",
                               foo);
  #endif	/* PIOS_INCLUDE_DEBUG_CONSOLE */

Please ensure that all of your debug output is
wrapped with these macros so that your debug
code doesn't bloat the firmware image.
2012-10-11 00:51:09 -04:00
Stacey Sheldon
75170177df console: example usage of the debug console 2012-10-11 00:22:07 -04:00
Stacey Sheldon
6088c05946 console: add support for serial debug consoles
Serial ports now have a new HW setting called DebugConsole
which can be used to dump internal state to a serial port
for debug.

To enable this feature, you need to:
 - make fw_coptercontrol_clean
 - make fw_coptercontrol ENABLE_DEBUG_CONSOLE=YES
 - configure one of the serial ports as DebugConsole in the GCS
 - save settings
 - power-cycle your board

Things to note:
 - The console is at 57600,8N1.
 - This is not currently configurable via the GCS.
 - You can only have a single console enabled at a time.
2012-10-11 00:22:07 -04:00
PT_Dreamer
ea3eb984f4 Merge branch 'pt/wiz_autoupdate' of ssh://git.openpilot.org/OpenPilot into pt/wiz_autoupdate 2012-10-10 18:26:28 +01:00
PT_Dreamer
8863601715 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into pt/wiz_autoupdate 2012-10-10 18:22:53 +01:00
zedamota
27fd597795 GCS-Try to fix blanked out dialog on OSX. 2012-10-10 17:36:58 +01:00
zedamota
47f94143b7 GCS- Detect fw bundle presence in a not so ugly way 2012-10-10 16:38:57 +01:00
zedamota
fb27c5d93c GCS-Fw Auto update - Try to fix win build 2012-10-10 16:36:13 +01:00
James Cotton
6e3d9a7c72 Merge branch 'dynamic_uavo_next' into next 2012-10-10 08:31:07 -05:00
James Cotton
0e111a62ff OSX Packaging: Make sure to link libgamepad to the distributed SDL 2012-10-10 08:30:55 -05:00
James Cotton
0d42df9a02 AndroidGCS: Add a message when the UAVOs are loaded 2012-10-10 08:22:41 -05:00
James Cotton
fcaced59b5 AndroidGCS: Entire hash is now used to locate objects and they are pulled from
assets/uavos
2012-10-10 08:16:57 -05:00
James Cotton
557904fec9 AndroidGCS: Check in a uavobjects.jar into the assets directory and use that now
The previous hoops are still required to create that file.

Conflicts:

	androidgcs/assets/uavobjects.jar
2012-10-10 00:48:25 -05:00
James Cotton
80197f830c AndroidGCS: Remove the unit tests since they break the dynamic loading of UAVObjects 2012-10-10 00:29:22 -05:00
James Cotton
df6d7eb11d AndroidGCS: Make the tablet load the appropriate UAVO file based on the description
from the assets.

Rename the uavobjects.jar to match the uavo hash.

Conflicts:

	androidgcs/assets/875bbaadee717b2f.jar
2012-10-10 00:23:54 -05:00
James Cotton
76785cad57 AndroidGCS: Dynamic loading works. Currently won't work out of the box though.
From the build/uavobjects-synth/java:

1. mkdir -p src/org/openpilot/uavtalk/uavobjects
2. javac *.java ../../../androidgcs/src/org/openpilot/uavtalk/UAVDataObject.java \
   ../../../androidgcs/src/org/openpilot/uavtalk/UAVObject*.java \
   ../../../androidgcs/src/org/openpilot/uavtalk/UAVMetaObject.java \
   -d .
3. rm org/openpilot/uavtalk/*.class
4. jar cf tmp_org.openpilot.uavtalk.uavobjects.jar org
5. dx --dex --output org.openpilot.uavtalk.uavobjects.jar tmp_org.openpilot.uavtalk.uavobjects.jar
6. adb push org.openpilot.uavtalk.uavobjects.jar /data/org.openpilot.uavtalk.uavobjects.jar
2012-10-10 00:22:54 -05:00
James Cotton
c6341139c2 AndroidGCS: Dynamically load /data/uavobjects.jar for the objects 2012-10-10 00:22:45 -05:00
James Cotton
1a1aa85d1a AndroidGCS: Remove the old fake telemetry 2012-10-10 00:22:21 -05:00
James Cotton
11079a6dd7 AndroidGCS: Restore stripped down UAVObjectsInitialize which only registers
FlightTelementryStats GCSTelemetryStats and FirmwareIAPObj
2012-10-10 00:22:00 -05:00
James Cotton
51868437c6 Drop the old UAVObjects directory 2012-10-10 00:21:51 -05:00