Brian Webb
46baec52ef
Merge remote-tracking branch 'origin/next' into brian/rfm22_multibind
2013-02-17 01:21:12 +00:00
Oleg Semyonov
aea1b4b544
Merge remote-tracking branch 'origin/os/OP-775_arm-dsplib' into next
2013-02-16 16:08:31 +02:00
Voha
6c24561ec4
* fix build error
2013-02-15 23:31:47 +01:00
Voha
8c5cded61a
OP-845: *fix code style
2013-02-15 23:31:47 +01:00
Voha
e4f98b31c6
fix code style
2013-02-15 23:31:47 +01:00
Voha
427bbd0a80
fixed reading serial number from USB device on mac platform
2013-02-15 23:31:46 +01:00
Laurent Lalanne
5b8b38ad7b
Minors changes, Errors. Thx Joël
2013-02-12 01:04:40 +02:00
Oleg Semyonov
e9c0f94628
translations: remove language override in default GCS configurations
...
Since in commit 518182a
all outdated languages were commented out
to avoid *.pm builds, it is ok to remove language override here and
use system language by default.
Related issues: OP-231, OP-723, OP-843
2013-02-11 22:13:57 +02:00
Oleg Semyonov
790e771b54
Merge remote-tracking branch 'origin/laurent/translations' into next
2013-02-11 22:05:29 +02:00
Oleg Semyonov
c8ce31f7a9
Merge remote-tracking branch 'origin/next' into theothercliff/elevon_cam_stab
2013-02-11 01:03:33 +02:00
Laurent Lalanne
518182ac0b
For now all languages files (*.pm) are build and included in release package.
...
Outdated translations are commented and not included in package.
Allow to remove <OverrideLanguage>C</OverrideLanguage> line in default config
files loaded on first GCS start and language is set to OS Lang if found
in translations directory.
2013-02-09 17:24:32 +01:00
Laurent Lalanne
b8a6358785
Corrections from Joël (Eyesonsky)
2013-02-08 20:01:57 +01:00
Laurent Lalanne
24fcc03007
Minors corrections, improved translations for radio mods.
2013-02-08 19:36:15 +01:00
Platypus
b5af81c8bf
Apport de traduction sur ConfigInputWidget
...
Signed-off-by: Platypus <platypusman@free.fr>
2013-02-08 10:50:24 +01:00
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
Oleg Semyonov
97436166e3
Merge remote-tracking branch 'origin/next' into os/OP-775_arm-dsplib
2013-02-06 12:55:14 +02: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
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
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