Platypus
6853791a03
Merge branch 'laurent/translations' of ssh://git.openpilot.org/OpenPilot into laurent/translations
2013-02-08 08:23:42 +01:00
Brian Webb
9b6493eeca
Set the binding on the OPLink after configuring the radio.
2013-02-08 01:56:23 +00:00
Brian Webb
57b4d8c720
RFM22: Added support for binding to multiple remove OPLinks.
2013-02-08 01:56:22 +00:00
Brian Webb
6de2252c23
OP-814: Added PPM input on the FlexiPort for CC/CC3D.
2013-02-08 01:06:41 +00:00
Cliff Geerdes
6d4e8e4657
OP-824 Feedforward fix, 0.0f, coding style, and var name changes.
2013-02-07 18:27:59 -05:00
Laurent Lalanne
866f6359a6
Errors corrected, thanks to Joël (eyesonsky)
2013-02-07 18:33:25 +01:00
Brian Webb
e50e645e7b
Merge remote-tracking branch 'origin/next' into brian/oplink_ppm_out
2013-02-07 13:39:21 +00:00
David Willis
13cb5b8fbb
OP-825 Add first pass test project. Contains basic tests for OPTelemetryService
2013-02-06 23:57:50 +00:00
Philippe Renon
69fb6f6de3
OP-833 gcs options dialog polishing: zeroed margin of top level widget
2013-02-06 23:27:05 +01:00
Oleg Semyonov
97436166e3
Merge remote-tracking branch 'origin/next' into os/OP-775_arm-dsplib
2013-02-06 12:55:14 +02:00
David Willis
99a3708586
OP-825 Add code to track lifetime of service. Add task started intent to allow synchronising with telemetry task creation: makes testing a bit easier
2013-02-06 00:11:13 +00:00
David Willis
40a157fbad
OP-825 Only attempt to unregister broadcast receivers if they have been registered
2013-02-06 00:09:03 +00:00
Oleg Semyonov
17a9c7c1de
build-info.txt: minor text fix
...
This template will be used to comment auto builds created with Bamboo.
Currently it is emulated by Bamboo build agents using build scripts,
but should be generated using Makefile. As soon as majority of branches
will be updated to this next, those scripts will be removed and this
template used.
2013-02-06 00:51:38 +02:00
Oleg Semyonov
4314faa3f9
Merge remote-tracking branch 'origin/os/android-bamboo-builds' into next
2013-02-04 16:50:58 +02:00
Oleg Semyonov
e09705d604
Makefile: add build-info target (for CI builds)
2013-02-04 15:56:11 +02:00
Cliff Geerdes
8104ae25dd
OP-824 Add CameraStab Elevon-type mixing. Redo servo reversing.
2013-02-03 19:02:34 -05:00
Corvus Corax
7642f44cad
Merge remote branch 'origin/corvuscorax/sanity_additions' into corvus/directory_and_sanity
...
Conflicts:
flight/Modules/FirmwareIAP/firmwareiap.c
flight/Modules/ManualControl/manualcontrol.c
flight/targets/SimPosix/Makefile
shared/uavobjectdefinition/systemalarms.xml
2013-02-03 14:57:54 +01:00
Oleg Semyonov
c1b0972492
android: make it compatible with RELEASE-12.10.2
2013-02-03 05:11:47 +02:00
Oleg Semyonov
d7efcd28af
android: provide debug/release build option
2013-02-03 05:10:38 +02:00
Oleg Semyonov
3daaea3385
android: downgrade Google API version (16 -> 14)
...
Make it Android 4.0 compatible (was: 4.1.2 and above).
2013-02-03 05:10:37 +02:00
Oleg Semyonov
a0bbd9ec94
android: update SDK version (20.0.3 -> 21.0.1)
2013-02-03 02:10:06 +02:00
James Cotton
5e20705347
Windows copy data: Use the environmental $$(QTMINGW) variable to locate
...
files to copy into the package. This makes it more robust against various
relative locations of mingw and qt.
It may be necessary to move all SDL-related files (SDL.dll, static libraries
and include files) from, for instance, .\QtSDK\Desktop\Qt\4.8.1\mingw\bin
to .\QtSDK\mingw\bin to be found.
Conflicts:
ground/gcs/copydata.pro
ground/gcs/src/plugins/hitl/aerosimrc/src/plugin.pro
2013-02-03 01:06:07 +02:00
Philippe Renon
3ab33cf163
OP-833 gcs options dialog polishing:
...
- createOptionsPage() now returns NULL to avoid having empty page in
Options dialog
- removed Gadget from gadget name
- added some TODOs for for further cleanups
2013-02-02 16:09:53 +01:00
Philippe Renon
6b3e0c7ee3
OP-833 gcs options dialog polishing: zeroed margin of top level widget
2013-02-02 16:08:37 +01:00
Philippe Renon
03ca63978b
OP-833 gcs options dialog polishing:
...
- zeroed margin of top level widget
- chnaged size policy of scrollArea from Expanding to Minimum to get a
tighter fit
2013-02-02 16:06:13 +01:00
Philippe Renon
96651e302a
OP-833 gcs options dialog polishing: zeroed margin of top level widget
2013-02-02 16:03:54 +01:00
Philippe Renon
d8ce755cfd
OP-833 gcs options dialog polishing:
...
- increased width of splitter handle from default (6) to 9
- removed bottom Line widget
2013-02-02 15:58:47 +01:00
Brian Webb
ca6aa9fcea
Reformatted PPM output code to match coding standards.
2013-02-02 01:53:39 +00:00
Brian Webb
18c592a37a
Reformatted PPM output code to match coding standards.
2013-02-02 01:50:02 +00:00
David Willis
3b5f3c8125
OP-825 set minimum and target api versions to 14 & 17 respectively. Tidy formatting.
2013-02-02 00:57:57 +00:00
Alessio Morale
153db89663
OP-815 changed PIOS_WDG_RegisterFlag to reset the WDG to prevent timeouts during module initialization
2013-02-01 20:05:44 +01:00
Platypus
d76a61b430
Merge branch 'laurent/translations' of ssh://git.openpilot.org/OpenPilot into laurent/translations
2013-02-01 17:56:19 +01:00
Platypus
dfdd074997
Working progress...
...
Signed-off-by: Platypus <platypusman@free.fr>
2013-02-01 17:55:13 +01:00
Brian Webb
a4faa22c4b
Merge remote-tracking branch 'origin/brian/rfm22_autoconf' into next
...
Conflicts:
ground/openpilotgcs/src/plugins/config/configgadgetwidget.cpp
2013-01-31 13:40:32 +00:00
Laurent Lalanne
cc8bb5dc5e
Erreur de frappe
2013-01-31 11:51:03 +01:00
Cliff Geerdes
5e2aeeea76
Fixed tab stops in two c files.
2013-01-31 05:38:10 -05:00
Fredrik Arvidsson
da55998f27
OP-786 Removed the Qt::WindowStaysOnTopHint since it conflicts with the dialog opened to select default configuration first time GCS is launched.
2013-01-31 11:33:43 +01:00
Platypus
21bb408c21
Quelques corrections et modifications - Any corrections and modifications
...
Signed-off-by: Platypus <platypusman@free.fr>
2013-01-31 09:24:50 +01:00
Laurent Lalanne
3dd37e51b2
Small corrections, spaces.
2013-01-31 01:23:39 +01:00
Cliff Geerdes
6806e895cc
First version. Passes simple tests.
2013-01-30 18:57:32 -05:00
Platypus
0c77a2b374
Premières corrections et suggestions
...
Signed-off-by: Platypus <platypusman@free.fr>
2013-01-31 00:09:01 +01:00
filnet
d03db9c6d1
OP-803 remove spurious commit
2013-01-29 23:12:55 +01:00
Fredrik Arvidsson
f59bcd1949
OP-786 Replaced the splash screen backdrop image to address some shadow transparency issues.
2013-01-29 09:37:58 +01:00
filnet
3e9c819850
OP-803 more cleanups
2013-01-28 23:13:47 +01:00
Oleg Semyonov
396f210d07
Remove stray file in RemoteSystemsTempFiles
2013-01-28 03:02:04 +02:00
Stacey Sheldon
f500ac1e23
rename: move UAVObjects and UAVTalk directories under targets
2013-01-28 02:33:06 +02:00
Stacey Sheldon
e55519b1e2
makefile: split tool install rules into separate makefile
...
The rules for downloading/building/installing the various
tools were cluttering the top-level makefile.
Conflicts:
Makefile
2013-01-28 02:29:08 +02:00
Stacey Sheldon
0fda8035c2
makefile: update to released openocd 0.6.1
2013-01-28 02:13:17 +02:00
Stacey Sheldon
2f93d983b0
makefile: update ARM toolchain to 4.6-2012-q4
2013-01-28 02:11:26 +02:00
Stacey Sheldon
dbcf440bb9
makefile: factor out paths for major flight components
...
Conflicts:
flight/targets/CopterControl/Makefile
2013-01-28 02:01:39 +02:00