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
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
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
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
Fredrik Arvidsson
7ff257ee77
OP-786 Removed code that set the Qt graphics system to type 'raster'. The 'raster' graphics system does not work correctly on MacOSX. The graphics system is now set to the default for each platform.
2013-01-27 21:33:17 +01:00
Fredrik Arvidsson
4f09e80489
Merge branch 'thread/OP-786_SplashScreen' of ssh://git.openpilot.org/OpenPilot into thread/OP-786_SplashScreen
...
Conflicts:
ground/openpilotgcs/src/app/main.cpp
2013-01-24 15:59:12 +01:00
Fredrik Arvidsson
87d15a4a64
OP-786 Changed delay before splash screen is closed to 1500 ms. Rebased on next.
2013-01-24 15:54:25 +01:00
Fredrik Arvidsson
d00b4efdea
OP-786 Changed the delay before closing the splash screen to 3 seconds.
2013-01-24 15:22:16 +01:00
Fredrik Arvidsson
3705a2d0a8
OP-786 Moved the actual file and the dependency to gcsversioninfo.pri to the /app sub project from the /plugins/coreplugin project. This was necessary since the new splash screen depends on defines in the generated gcsversioninfo.h header file.
...
Changed position of the revision text to make it look nicer.
2013-01-24 15:22:15 +01:00
Fredrik Arvidsson
3f30d7d101
OP-786 Fixed the Revision text to use the same info as in the about dialog. Updated text drawing code to use word wrap since developer build revision numbers are fairly long strings.
2013-01-24 15:22:15 +01:00
Fredrik Arvidsson
90b72798c4
OP-786 Implemented progress label drawing. Added timer to close splash window 5 seconds after main window opens if not clicked.
2013-01-24 15:22:14 +01:00
Fredrik Arvidsson
eccdf5fa91
OP-786 Added new splash screen art. Added new custom splash screen class. Added signal on plugin manager emitting signal when a plugin is about to be loaded.
2013-01-24 15:22:13 +01:00
Fredrik Arvidsson
cf40948bf0
OP-786 Added static splash screen shown during application launch.
2013-01-24 15:22:12 +01:00
Alessio Morale
1a303aa85f
Merge remote-tracking branch 'origin/next' into amorale/bigmerge
2013-01-23 19:47:32 +01:00
Fredrik Arvidsson
7eef09463d
OP-786 Changed the delay before closing the splash screen to 3 seconds.
2013-01-23 07:35:40 +01:00
Fredrik Arvidsson
6b683665b6
OP-786 Moved the actual file and the dependency to gcsversioninfo.pri to the /app sub project from the /plugins/coreplugin project. This was necessary since the new splash screen depends on defines in the generated gcsversioninfo.h header file.
...
Changed position of the revision text to make it look nicer.
2013-01-22 21:09:35 +01:00
Fredrik Arvidsson
38820f5d7d
OP-786 Fixed the Revision text to use the same info as in the about dialog. Updated text drawing code to use word wrap since developer build revision numbers are fairly long strings.
2013-01-22 15:18:40 +01:00
Fredrik Arvidsson
1246fb1b85
OP-786 Implemented progress label drawing. Added timer to close splash window 5 seconds after main window opens if not clicked.
2013-01-22 12:42:07 +01:00
Fredrik Arvidsson
365e087128
OP-786 Added new splash screen art. Added new custom splash screen class. Added signal on plugin manager emitting signal when a plugin is about to be loaded.
2013-01-22 07:16:14 +01:00
David Willis
684a5292b0
Add autotune to list of excluded items for flight mode position
2013-01-21 19:54:44 +00:00
Laurent Lalanne
b6852a0e2b
Little changes in French
2013-01-21 00:30:15 +01:00
Alessio Morale
ad6d071e52
OP-815 Coptercontrol hang on startupd due to WDG timeout
2013-01-20 16:20:49 +01:00
Alessio Morale
f293298118
Merge remote-tracking branch 'origin/revo-fixes' into amorale/revo-merge
...
Conflicts:
flight/Modules/ManualControl/manualcontrol.c
make/scripts/version-info.py
package/Makefile.linux
2013-01-19 20:23:48 +01:00
Fredrik Arvidsson
1b5bd0d884
OP-786 Added static splash screen shown during application launch.
2013-01-15 23:22:44 +01:00
Alessio Morale
b317415556
OP-788 reenable transaction lock for pios_jedec_flash.c
2013-01-14 01:31:07 +01:00
Alessio Morale
de44495055
OP-796 defaults USE_PATHPLANNER to enabled
2013-01-14 01:28:33 +01:00
filnet
d1236499c1
OP-805 - removed uneeded Uploader default configuration.
2013-01-13 21:53:14 +01:00
filnet
ae9def7f11
OP-805 - fixed GCS Options page crash by removing configurations for which
...
an options page could not be created.
2013-01-13 18:33:07 +01:00
Alessio Morale
9a10bd85bd
OP-806 fixed a compilation issue on win
2013-01-13 02:21:39 +01:00
Alessio Morale
a8b57b3e0f
OP-795 check and/or revert changes for mapwidget/waypointitem.cpp
2013-01-12 17:01:52 +01:00
