Laurent Lalanne
f3f28fc876
Merge branch 'thread/OP-1222_FW_Wizard' of ssh://git.openpilot.org/OpenPilot into laurent/OP-1222_FW_Wizard
2014-09-28 01:08:56 +02:00
m_thread
012c1ae940
OP-1222 Fixed a merge accident.
...
Some cleanup.
2014-09-28 01:04:47 +02:00
Fredrik Arvidsson
3d20e201af
OP-1222 Fixed 'default' values for TPS curve when no board is connected.
2014-09-27 15:49:53 +02:00
Fredrik Arvidsson
11822fa0a9
OP-1222 Fixed stab layout.
2014-09-27 14:26:01 +02:00
Fredrik Larson
6cb6d32f79
More tinkering, m_thread what do you think?
2014-09-27 18:08:20 +10:00
Fredrik Larson
5da07fecea
Testing layout
2014-09-27 17:16:30 +10:00
Laurent Lalanne
59ae41d89c
Merge branch 'thread/OP-1222_FW_Wizard' of ssh://git.openpilot.org/OpenPilot into laurent/OP-1222_FW_Wizard
2014-09-25 18:31:46 +02:00
m_thread
552d2dd727
Merge remote-tracking branch 'origin/next' into thread/OP-1222_FW_Wizard
2014-09-25 06:59:46 +02:00
Fredrik Larsson
0db0c1cc03
Save AuxMag settings
2014-09-24 19:17:20 +10:00
m_thread
0d6aabe37b
OP-1222 Added generated file name and export to a specific directory.
...
Added scaling of image to save file size.
Added sanity check of input data to not be empty fields.
2014-09-24 01:06:16 +02:00
m_thread
19aa3ed5a3
Merge remote-tracking branch 'origin/next' into thread/OP-1222_FW_Wizard
2014-09-22 23:05:21 +02:00
m_thread
cc381075ce
OP-1222 We don't add personal names to the @author tag
2014-09-21 22:59:56 +02:00
m_thread
daae74f9e8
Merge remote-tracking branch 'origin/next' into thread/OP-1222_FW_Wizard
...
Conflicts:
ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configfixedwingwidget.cpp
2014-09-21 22:58:15 +02:00
m_thread
508112d5a3
OP-1474 Fixed code asserting in debug.
2014-09-21 22:38:49 +02:00
m_thread
25cf7fcaf5
OP-1474 Added Axis labels to curves.
2014-09-21 14:28:07 +02:00
m_thread
e4d6171f2c
OP-1474 Moved TPS settings to PID banks. Rearranged GUI.
2014-09-20 17:30:19 +02:00
m_thread
76b45ea87a
OP-1474 Moving Thrust PID Curve to PID banks. Adding ThrustPIDScalingSource, ThrustPIDScalingTargets and ThrustPIDScalingAxis.
2014-09-19 15:14:29 +02:00
m_thread
3b1e67d185
Merge remote-tracking branch 'origin/next' into thread/OP-1474_PID_Scaling_Banks
...
Conflicts:
ground/openpilotgcs/src/plugins/config/stabilization.ui
2014-09-19 09:01:02 +02:00
Fredrik Larson
8a5174de67
Merge remote-tracking branch 'origin/skarlsso/OP-1458_remove_delays_from_tx_wizard' into next
2014-09-19 06:07:20 +10:00
Laurent Lalanne
e88b8ccbdb
OP-1222 FW_Wizard Ground shapes : Better labels, cleanup
2014-09-18 20:05:44 +02:00
Laurent Lalanne
d99aba54e3
OP-1222 Added ground shapes : Motorbike, Tank and Car
2014-09-17 22:44:08 +02:00
Fredrik Larson
c4e049f1ed
Merge remote-tracking branch 'origin/hayvosh/OP-1489_ILimits' into next
2014-09-18 02:37:53 +10:00
Fredrik Larson
db94453bdf
comment typeo
2014-09-18 00:35:07 +10:00
Fredrik Larson
e95689b0fc
Old bug, buttongroup clash
2014-09-17 22:33:32 +10:00
Fredrik Larson
1de454a4cf
Merge remote-tracking branch 'origin/next' into hayvosh/OP-1489_ILimits
2014-09-17 21:47:54 +10:00
Fredrik Larson
f5fa57c7da
Merge remote-tracking branch 'origin/laurent/OP-1134_Populate_new_custom_tab' into next
2014-09-17 08:15:31 +10:00
Fredrik Larson
e4e1e0ed24
Uncrusty
2014-09-17 07:23:58 +10:00
Fredrik Larson
d7ffa008b1
Make alt hold default buttons disabled, they were missing from the constructor
2014-09-17 06:15:07 +10:00
Fredrik Larson
6fe00a773c
Some buttons missing from UI setup
2014-09-17 05:47:27 +10:00
Fredrik Larson
cb38cfb118
New UI layout, remove a tab
2014-09-17 05:30:28 +10:00
Laurent Lalanne
a8f0bb6eb6
OP-1222 Uncrustify
2014-09-16 19:27:18 +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
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
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
Laurent Lalanne
adeb51bb10
OP-1491 Fixes for Config tab
2014-09-15 22:54:46 +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
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
Alessio Morale
c777f9e194
OP-1406 - Fixes from review comments
2014-09-08 23:24:18 +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
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
32773c0245
Merge remote-tracking branch 'origin/laurent/OP-1349_GCS_Neutral_Spinboxes_in_Input_and_Output' into next
2014-09-08 01:27:23 +10:00
m_thread
474466ac92
OP-1474 Uncrustify.
2014-09-07 00:23:20 +02:00
