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
6f74ffdc8d
Merge branch 'thread/OP-1222_FW_Wizard' of ssh://git.openpilot.org/OpenPilot into laurent/OP-1222_FW_Wizard
2014-09-26 18:22:55 +02:00
m_thread
8d76e6f671
OP-1222 Uncrustified code.
2014-09-25 23:19:50 +02:00
m_thread
b0e337c540
OP-1222 Added UUID to template file for identification.
...
Implemented the code to apply the template settings.
Fixed tab order in template export dialog.
Extended support for parsing and applying json data in uavobjectmanager.
2014-09-25 23:16:13 +02: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
m_thread
7ab2839b6e
OP-1222 Implemented scanning for and reading of optmpl files (json vehicle template files )
...
and implemented selection gui for the templates.
2014-09-24 15:48:28 +02:00
Fredrik Larsson
0db0c1cc03
Save AuxMag settings
2014-09-24 19:17:20 +10:00
m_thread
9c0c489e94
OP-1222 Added some constants instead of hard coded values.
2014-09-24 08:26:31 +02:00
Alessio Morale
adc9821cd3
uncrustify
2014-09-24 01:06:55 +02:00
Alessio Morale
5b968389a0
OP-1476 - AutoUpload description from OPFW firmwares
2014-09-24 01:06:55 +02: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
7bcdff9f2f
Merge remote-tracking branch 'origin/next' into thread/OP-1222_FW_Wizard
...
Conflicts:
ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp
ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp
ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationsource.h
2014-09-23 22:30:49 +02:00
Fredrik Larsson
5bbd6724d6
Merge remote-tracking branch 'origin/skarlsso/OP-1493_discoveryf4bare_support_in_gcs' into next
2014-09-23 21:11:15 +10:00
Fredrik Larsson
5e5928105c
Merge remote-tracking branch 'origin/laurent/OP-1435_Add_more_info_PFD' into next
2014-09-23 15:46:19 +10:00
m_thread
19aa3ed5a3
Merge remote-tracking branch 'origin/next' into thread/OP-1222_FW_Wizard
2014-09-22 23:05:21 +02:00
Fredrik Larson
c36e9a9122
Merge remote-tracking branch 'origin/thread/OP-1474_PID_Scaling_Banks' into next
2014-09-23 06:20:34 +10:00
Stefan Karlsson
9166363f09
OP-1474 Uncrustify
2014-09-22 22:05:20 +02:00
Fredrik Larson
ec14f81afd
Change wording to avoid a common cause of confusion for Futaba and
...
Spektrum users
2014-09-23 05:54:24 +10: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
602bfd3e4c
Merge remote-tracking branch 'origin/thread/OP-1474_PID_Scaling_Banks' into thread/OP-1474_PID_Scaling_Banks
2014-09-21 22:11:44 +02:00
m_thread
9d42430ee7
OP-1474 Fixed a sizing/value calculation issue.
2014-09-21 22:10:23 +02:00
Fredrik Arvidsson
1fd0c9a884
Merge remote-tracking branch 'origin/next' into thread/OP-1474_PID_Scaling_Banks
2014-09-21 20:17:34 +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
Laurent Lalanne
9c18917297
OP-1435 Small fixes. Common background color for Volt/Amp, display Lipo alarm if NbCells is defined.
2014-09-20 02:01:05 +02:00
Fredrik Larsson
a1bb86ee6a
Merge remote-tracking branch 'origin/filnet/OP-1481_cannot_send_more_than_a_few_waypoints_over_oplm' into next
2014-09-19 23:33:41 +10: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
Laurent Lalanne
7d110d7122
OP-1435 System tab update : FusionAlgorithm, Mag used and Gpstype
2014-09-18 23:25:47 +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
m_thread
1a06822e55
OP-1222 Changed name of button to select image for the template.
2014-09-16 23:51:36 +02:00
m_thread
865bbba9ee
Merge remote-tracking branch 'origin/laurent/OP-1222_FW_Wizard' into thread/OP-1222_FW_Wizard
...
Conflicts:
ground/openpilotgcs/src/plugins/setupwizard/setupwizardplugin.cpp
ground/openpilotgcs/src/plugins/uavobjects/uavobject.cpp
2014-09-16 23:48:06 +02:00
m_thread
0cb820d2e9
Merge branch 'thread/OP-1222_FW_Wizard' of ssh://git.openpilot.org/OpenPilot into thread/OP-1222_FW_Wizard
2014-09-16 23:44:39 +02:00
m_thread
f500f33326
OP-1222 Added vehicle template export function.
...
Exports vehicle information and image plus selected settings objects to JSon.
Uncrustified.
2014-09-16 23:44:23 +02:00
Fredrik Larson
e4e1e0ed24
Uncrusty
2014-09-17 07:23:58 +10:00
Alessio Morale
1de46ae493
OP-1476 - Clanup upload_tool and add Makefile target
2014-09-16 22:40:53 +02:00
Alessio Morale
85b397bc1f
OP-1476 - Make uploader_tool almost working
2014-09-16 22:40:53 +02:00
Alessio Morale
9a55b4ac63
OP-1476 - Fix Uploader tool for QT5xx, Comment out HID support
2014-09-16 22:40:53 +02:00
Fredrik Larson
d7ffa008b1
Make alt hold default buttons disabled, they were missing from the constructor
2014-09-17 06:15:07 +10:00
