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

6713 Commits

Author SHA1 Message Date
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
James Cotton
4d0490dde9 Androidgcs: Symlink build/androidgcs/assets/uavo to the androidgcs directory to keep eclipse happy 2012-10-10 00:18:46 -05:00
Stacey Sheldon
201ee521d6 makefile: fall-back to android dx in the PATH 2012-10-10 01:10:53 -04:00
Stacey Sheldon
5314d9ad54 makefile: make android builds more quiet 2012-10-10 00:46:20 -04:00
Stacey Sheldon
f7467cbb47 makefile: generate multiple versions of UAVOs
This will allow a single GCS to have access to multiple
sets of UAVO libraries.
2012-10-10 00:35:14 -04:00
Stacey Sheldon
6da6274543 version-info: add subst for text version of UAVO sha1sum 2012-10-10 00:35:13 -04:00
Fredrik Arvidsson
befa5da671 Fixed layouts in the setup wizard and made the wizard resizeable. 2012-10-10 00:36:29 +02:00
Laura Sebesta
4b3994a550 Merge branch 'next' into kenz/hitl_merge
Conflicts:
	ground/openpilotgcs/src/plugins/plugins.pro
2012-10-09 22:47:20 +02:00
Fredrik Arvidsson
fc69eaa205 Merge branch 'next' into pt/wiz_layouts 2012-10-09 21:56:27 +02:00
Fredrik Arvidsson
8bb4a14e28 Merge branch 'pt/wiz_layouts' of ssh://git.openpilot.org/OpenPilot into pt/wiz_layouts 2012-10-09 21:56:14 +02:00
Oleg Semyonov
d60be79133 GCS: fix plugin build dependencies
They should reflect the pro/pri files included and be sufficient to
build. Chained dependencies should be built by the make system.
2012-10-09 21:57:58 +03:00
PT_Dreamer
d1b78faeb3 Revert "GCS-Config wizard"
This reverts commit 4b5c88589c.
2012-10-09 18:59:01 +01:00
Fredrik Arvidsson
d98c2aacf3 Merge branch 'next' into pt/wiz_layouts 2012-10-09 19:56:04 +02:00
PT_Dreamer
4b5c88589c GCS-Config wizard
Made the wizard set stab1,2,3 as default flight modes for multis
2012-10-09 00:16:22 +01:00
PT_Dreamer
047201211b GCS-Change config file name
This is to force a new configuration to be loaded and used.
2012-10-08 22:36:32 +01:00
Stacey Sheldon
80f038f579 Merge remote-tracking branch 'origin/stac/linux-64bit-qt' into next 2012-10-08 13:17:31 -04:00
Laura Sebesta
c2b49b6ef3 Merge branch 'kenz/cc_hitl_merge' into next
Conflicts:
	ground/openpilotgcs/src/plugins/gcscontrol/gcscontrolgadgetoptionspage.ui
	ground/openpilotgcs/src/plugins/hitlnew/hitloptionspage.ui
	ground/openpilotgcs/src/plugins/hitlv2/hitlv2optionspage.ui
2012-10-08 15:30:27 +02:00
Laura Sebesta
993cd0f8f6 Added conversion from rotation matrix to quaternions. 2012-10-08 15:17:47 +02:00
Laura Sebesta
db8563f69f Fix aerosimrc hitl merge issues. 2012-10-08 00:41:58 +02:00
Stacey Sheldon
4f6bca2a8a makefile: choose correct qt installer for 64-bit machines 2012-10-07 17:29:27 -04:00
PT_Dreamer
64d2922e71 Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into pt/wiz_autoupdate
Conflicts:
	ground/openpilotgcs/share/share.pro
2012-10-07 21:01:21 +01:00
Fredrik Arvidsson
c03ac35780 Added functionality for skipping autoupdate page if no firmware is available in resource bundle. 2012-10-07 21:49:07 +02:00
chris pember
bb2637054b hopefully fixed any conflicts 2012-10-07 10:57:53 -07:00
chris pember
ee031fe80d Merge branch 'next' into cp/extraGUIchanges
Conflicts:
	ground/openpilotgcs/src/plugins/hitlv2/hitlv2optionspage.ui
	ground/openpilotgcs/src/plugins/uavobjectbrowser/uavobjectbrowseroptionspage.ui
2012-10-07 10:32:21 -07:00