James Duley
927c55291c
Merge branch 'parched/OP-1654_Fix_linux_rpath' into next
2015-01-03 11:39:49 +13:00
Mathieu Rondonneau
acc124cacb
OP-1625: DSM: more robust detection of resolution
...
This allows switching back and forth between 10 and 11 bit
code which prevents getting locked up in one or the other.
It also avoids a situation that can cause an infinite
recursion.
This changeset is cherry-picked from TauLabs (b7eaf87502085666d9738ae16c66170f187f3981).
Thanks to Taulabs for improving OpenPilot's DSM autodetect feature.
2014-12-30 21:29:06 -08:00
Fredrik Arvidsson
1c764c4001
Fixed a gcc compiler warning that was a result of clang compiler warning cleanup.
2014-12-30 09:41:37 +01:00
Fredrik Arvidsson
0f756668bc
Merge remote-tracking branch 'origin/cgudrian/OP-1664_clang_warnings' into next
2014-12-30 08:54:51 +01:00
Christian Gudrian
04dda828f0
added config parameter
2014-12-30 17:52:47 +13:00
Christian Gudrian
ed99869c7b
fixed comparison
2014-12-30 17:52:47 +13:00
Christian Gudrian
e5d19972e6
fixed type check warning
2014-12-30 17:52:47 +13:00
Christian Gudrian
98387d2639
fixed formatting of error message
2014-12-30 17:52:46 +13:00
Christian Gudrian
30b97bbb29
removed extraneous semicolon
2014-12-30 17:52:46 +13:00
Christian Gudrian
5caee931f5
fixed method signature to match the one in the superclass
2014-12-30 17:48:56 +13:00
Christian Gudrian
bdf4386dfa
fixed header guards
2014-12-30 17:48:56 +13:00
James Duley
0d17376e26
OP-1654 fix linux rpath: added Qt for plugins
2014-12-29 11:54:24 +13:00
James Duley
fa7196ddec
OP-1654 fix linux rpath: removed hardcoded QMAKE_RPATHDIR
2014-12-29 09:04:47 +13:00
James Duley
fea74125fa
OP-1654 Fix linux rpath: Refactored and changed for libs
2014-12-22 14:47:27 +13:00
James Duley
f6c9183dbf
OP-1653 Qt 5.2.1 backward compatibilty: used QStringLiteral for json value
2014-12-19 14:59:41 +13:00
Fredrik Larsson
aba566c43b
Merge remote-tracking branch 'origin/parched/OP-1557_update_qwt' into next
2014-12-19 12:32:23 +11:00
James Duley
cc5786c989
OP-1557 Update Qwt: Updated to 6.1.2
2014-12-19 13:48:09 +13:00
Laurent Lalanne
49a53757f7
OP-1643 Small fixes, typo
2014-12-19 10:15:36 +11:00
Laurent Lalanne
ff97b87765
OP-1643 Updated connection diagram with ground vehicles
2014-12-19 10:15:16 +11:00
Laurent Lalanne
c213e923ca
OP-1643 First commit : Add ground vehicle to setup wizard
2014-12-19 10:14:53 +11:00
Fredrik Larsson
4f7fc1bac7
Merge remote-tracking branch 'origin/corvuscorax/OP-1599_positionvario-reworks' into next
2014-12-14 23:45:57 +11:00
Fredrik Larsson
6eb97a0f81
Merge remote-tracking branch 'origin/parched/OP-1640_make_install_rule' into next
2014-12-14 18:53:05 +11:00
James Duley
7c1f9f99b3
OP-1640 make install rule: added install_qt rule
2014-12-10 11:03:06 +13:00
James Duley
1ecc10f045
OP-1640 make install rule: initial commit (doesn't install Qt)
2014-12-10 10:40:35 +13:00
James Duley
d956c1977a
change make source rule to more correct make dist rule
2014-12-10 10:40:35 +13:00
James Duley
ed2371e750
OP-1647 Welcome QML error: removed parent horiz align
2014-12-10 10:30:23 +13:00
James Duley
5ebee4acf0
OP-1646 qml welcome warning: made versionString CONSTANT
2014-12-10 09:50:54 +13:00
Mathieu Rondonneau
6844f8351d
run uncrustify.
2014-12-04 20:17:29 -08:00
Mathieu Rondonneau
9622a8919d
Merge branch 'Mathieu/OP-1626_dsm_binding_with_22ms_frame_rate' into next
2014-12-04 20:14:27 -08:00
Fredrik Larsson
69d146988b
Merge remote-tracking branch 'origin/laurent/OP-1620_FixedWing_Vtail_wizard' into next
2014-12-03 17:49:16 +11:00
Fredrik Larsson
16eec9caed
Merge remote-tracking branch 'origin/laurent/OP-1622_Ground_config_tab' into next
2014-12-03 17:49:09 +11:00
Fredrik Larsson
97f7d463d0
Remove duplicate cloud config
2014-12-01 18:25:50 +11:00
Fredrik Larsson
e8d182978f
Merge remote-tracking branch 'origin/parched/OP-1639_make_non-git_source' into next
2014-12-01 14:03:53 +11:00
James Duley
368c726769
OP-1639 make non-git source: made paths relative to help windows
2014-12-01 14:23:13 +13:00
Fredrik Larsson
fef3581b5e
Merge remote-tracking branch 'origin/parched/OP-1579_Add_LDFLAGS_to_Makefile_sanitize' into next
2014-12-01 10:44:10 +11:00
James Duley
f9de8f3afe
OP-1639 make non-git source: added git describe to archive name
2014-12-01 11:11:53 +13:00
James Duley
3c0a3ced92
OP-1639 make non-git source: added 'source' make rule
2014-12-01 10:08:21 +13:00
James Duley
993eeeda75
OP-1639 make non-git source: added save version info to json
2014-12-01 10:02:32 +13:00
James Duley
bf335d6eaa
OP-1639 make non-git source: added load version info from json
2014-12-01 10:01:56 +13:00
Mathieu Rondonneau
4b00f6039d
OP-1626: Allow binding to happen within satellite binding window.
...
- This is working for satellite 22ms (genuines and clones).
- This change only affect revo.
2014-11-29 19:59:18 -08:00
Laurent Lalanne
a0311e6522
OP-1543 Fix font used for sat numbers
2014-11-28 22:29:04 +01:00
Alessio Morale
99d73426b8
Uncrustify
2014-11-27 12:05:59 +01:00
Alessio Morale
6485ffbd9a
Merge branch 'master' into next
2014-11-27 11:31:34 +01:00
Alessio Morale
738b37c05a
Merge branch 'rel-14.10'
2014-11-27 10:17:56 +01:00
Alessio Morale
431b08a462
update WHATSNEW for release
2014-11-27 10:16:49 +01:00
Fredrik Larsson
6780957428
Add new CCs from Failsafe
2014-11-27 03:18:32 +11:00
Fredrik Larsson
091196a311
Merge remote-tracking branch 'origin/rel-14.10' into next
2014-11-26 07:34:14 +11:00
Alessio Morale
2b57a98ea3
Update WhatsNew for release
2014-11-24 23:58:31 +01:00
Fredrik Larsson
a1feaa98a8
Add Hexa CCs part 2
2014-11-24 12:22:32 +11:00
Fredrik Larsson
1832244cdf
Merge remote-tracking branch 'origin/laurent/Remove_quadH_wizard' into rel-14.10
2014-11-24 12:12:29 +11:00
