Laurent Lalanne
a8f0bb6eb6
OP-1222 Uncrustify
2014-09-16 19:27:18 +02:00
Laurent Lalanne
d0c9e236a1
OP-1222 Fix label for quad-h in connection-diagrams.svg
2014-09-16 19:01:17 +02:00
Laurent Lalanne
bc9e6b24f9
Merge remote-tracking branch 'origin/laurent/OP-1491_HQuad_mixing_values' into laurent/OP-1222_FW_Wizard
...
Conflicts:
ground/openpilotgcs/src/plugins/setupwizard/pages/multipage.cpp
ground/openpilotgcs/src/plugins/setupwizard/resources/connection-diagrams.svg
Conflicts resolved in artwork, same style as FW branch
2014-09-16 18:55:43 +02:00
Fredrik Larson
20b635fa07
Merge branch 'next' into hayvosh/OP-1489_ILimits
2014-09-17 02:25:53 +10:00
Fredrik Larson
ad65312b41
Merge branch 'next' into fw_wiz
2014-09-17 02:09:07 +10:00
Philippe Renon
3c4d754e2f
OP-1481 send and request path plans in user space instead of relying on magic (but broken) sendAll and requestAll uavo methods
2014-09-16 09:11:18 +02:00
Philippe Renon
92e3779997
OP-1481 specified default timeout for AbstractUAVObjectHelper
2014-09-16 09:11:18 +02:00
Philippe Renon
a045b10472
OP-1481 fixed telemetry multi-threading issue: was not possible to create and request an uavo instance in one go
2014-09-16 09:11:18 +02:00
Laurent Lalanne
4bc89ef638
OP-1491 HQuad_mixing_values : Renamed with quad-h labels, artwork fixes.
2014-09-16 01:47:34 +02:00
Laurent Lalanne
365a9c5026
OP-1491 HQuad_mixing_values : Wizard fixes, should works now
2014-09-16 01:16:45 +02:00
Laurent Lalanne
fb4b9b05cd
OP-1491 Artwork fixes + wizard support - work in progress
2014-09-16 00:48:45 +02:00
Alessio Morale
c49497f2e0
Merge branch 'amorale/OP-1434_GPSV9_fc_support' into next
2014-09-15 23:49:54 +02:00
Stefan Karlsson
09a943f17f
OP-1493 Make Vehicle and TX Wizards work with the discoveryf4bare target
2014-09-15 23:43:58 +02:00
Stefan Karlsson
dd86e7f9c4
OP-1493 Update BOARD_REVISION for discoveryf4bare and fix AutoUpdate
2014-09-15 23:30:17 +02:00
Stefan Karlsson
61a58eeba9
OP-1493 Fix stack overflow problem when the firmware code size is large
2014-09-15 23:19:51 +02:00
m_thread
46b95ee7d1
Merge remote-tracking branch 'origin/next' into thread/OP-1222_FW_Wizard
2014-09-15 22:55:19 +02:00
m_thread
54b6d74a4d
Merge branch 'thread/OP-1222_FW_Wizard' of ssh://git.openpilot.org/OpenPilot into thread/OP-1222_FW_Wizard
2014-09-15 22:54:48 +02:00
Laurent Lalanne
adeb51bb10
OP-1491 Fixes for Config tab
2014-09-15 22:54:46 +02:00
m_thread
1c2efe0868
OP-1222 Added JSon serialization code.
2014-09-15 22:46:28 +02:00
Laurent Lalanne
3f9cd2f3aa
OP-1491 Missing quadH code
2014-09-15 22:29:55 +02:00
Laurent Lalanne
48ce38370c
OP-1491 HQuad_mixing_values First commit : add QuadH artwork, config tab
2014-09-15 22:25:07 +02:00
Fredrik Larson
bc0e8521e0
Prefer this wording, technically might be wrong, but it's what it acts
...
like it does
2014-09-16 01:28:07 +10:00
Fredrik Larson
5c7fbebb1c
More usability bits, less scary knobs to tweek.
2014-09-16 01:14:17 +10:00
Fredrik Larson
599112e50e
Some Minor language changes
2014-09-16 01:03:11 +10:00
Fredrik Larson
98cf9d7063
ILimits are so not touched by usrs, even the tinkers, lets clean this up a
...
bit.
2014-09-16 00:54:43 +10:00
Philippe Renon
4ed8fb0188
OP-1488 fixed typo in uavobject.java.template
2014-09-15 09:00:44 +02:00
Laurent Lalanne
4d81aad85d
OP-1222 FW_Wizard : Modified Sbus Rx on MainPort, added Gps for FlexiPort
2014-09-14 18:01:20 +02:00
Fredrik Larsson
aebf41aad7
Merge remote-tracking branch 'origin/parched/OP-1478_fix_win_qtc_variables' into next
2014-09-14 22:50:43 +10:00
James Duley
5cc91467ef
OP-1478 fix_win_qtc_variables: added MESAWIN_DIR variable
2014-09-14 12:50:30 +12:00
James Duley
18ad22a177
OP-1478: allow alternate SDL_DIR or OPENSSL_DIR
2014-09-14 12:01:14 +12:00
James Duley
684180ef87
OP-1478: added a qmake variable OPENSSL_DIR
2014-09-13 17:48:30 +12:00
James Duley
17bb1d2fc0
OP-1478 fix win qtc vairables: fixed TOOLS_DIR check
2014-09-13 16:37:30 +12:00
James Duley
ea64284d7d
OP-1478: added a qmake variable SDL_DIR
2014-09-13 15:24:52 +12:00
Stefan Karlsson
8cd7a71c18
Merge branch 'next' into thread/OP-1474-PID_Scaling
2014-09-11 00:00:02 +02:00
Stefan Karlsson
eacf0a1693
Merge branch 'skarlsso/OP-1474-PID_Scaling' into thread/OP-1474-PID_Scaling
...
Conflicts:
shared/uavobjectdefinition/stabilizationsettings.xml
2014-09-10 21:41:40 +02:00
Stefan Karlsson
7afb211330
OP-1474 Revert TPS debugging code
2014-09-10 00:42:40 +02:00
Laurent Lalanne
956e5ad9d0
OP-1435 Add_more_info_PFD : Smeter jitter free when OPLink is really connected
2014-09-09 22:32:28 +02:00
Laurent Lalanne
ac16c2722c
OP-1435 Add_more_info_PFD : Increase timer value, remove jitter. Tx/rx rates should be updated every 500ms.
2014-09-09 20:47:36 +02:00
Laurent Lalanne
b7a348e7c3
OP-1435 Add_more_info_PFD : Total distance counter always visible. Check telemetry activity for link status (Smeter real or log replay)
2014-09-09 20:27:01 +02:00
Alessio Morale
c777f9e194
OP-1406 - Fixes from review comments
2014-09-08 23:24:18 +02:00
m_thread
9a13c49722
OP-1222 Added JSon Api embryo.
2014-09-08 22:27:02 +02:00
m_thread
1a68ba062d
Merge remote-tracking branch 'origin/next' into thread/OP-1222_FW_Wizard
...
Conflicts:
ground/openpilotgcs/src/libs/sdlgamepad/sdlgamepad.pro.user
2014-09-08 21:48:33 +02:00
James Duley
67e7801949
OP-1478: move TOOLS_DIR out of linux scope
2014-09-08 21:29:44 +12:00
Fredrik Larsson
65e0124a74
Remove QtCreator user file from git
2014-09-08 18:19:03 +10:00
Fredrik Larrson
353e3ec0a8
Merge remote-tracking branch 'origin/parched/OP-1463_allow_for_alternative_OPENPILOT_TOOLS_DIR' into next
2014-09-08 15:53:03 +10:00
Stefan Karlsson
c0152b7e19
OP-1474 Thrust PID scaling
2014-09-08 00:14:49 +02:00
Laurent Lalanne
20218a0788
OP-1435 Add_more_info_PFD : Add FrameType, Cpuload/temp, MemFree to SystemTab
2014-09-07 20:29:31 +02:00
Fredrik Larrson
849bbfd481
Merge remote-tracking branch 'origin/skarlsso/OP-1455_no_output_from_test_outputs' into next
2014-09-08 04:25:02 +10:00
Fredrik Larrson
b9a2cac03f
Merge remote-tracking branch 'origin/skarlsso/OP-1077_gcs_corrupts_flight_log_files' into next
2014-09-08 04:24:07 +10:00
Fredrik Larrson
11a4a249b8
Merge remote-tracking branch 'origin/skarlsso/OP-1459_workaround_white-box_issue' into next
2014-09-08 02:33:39 +10:00
