1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-29 07:24:13 +01:00
Commit Graph

4259 Commits

Author SHA1 Message Date
m_thread
5c2a013433 OP-1524 Added CharFieldTreeItem and the check for the 'char' unit in array fields. 2014-10-03 16:44:00 +02:00
Alessio Morale
e553014596 Merge branch 'amorale/OP-1476_1477_1275_GPSV9_pios_firmware_bootloader' into next 2014-10-03 00:37:55 +02:00
m_thread
a7a7d32ec8 OP-1517 Small adjustments. 2014-10-02 21:25:38 +02:00
m_thread
3aed610c36 OP-1512 Changed wording in ESC calibration dialog. 2014-10-02 18:32:10 +02:00
Laurent Lalanne
f27b35f71b OP-1337 Updates 2014-10-02 00:26:39 +02:00
m_thread
9b6f1a7d31 OP-1512 Added security questions to esc setup wizard. 2014-10-01 16:20:42 +02:00
Laurent Lalanne
538452ea02 Merge remote-tracking branch 'origin/next' into laurent/OP-1337_French_translations_updates 2014-10-01 15:41:39 +02:00
m_thread
f6e4e72ec2 OP-1517 Fixed a static declaration issue. 2014-10-01 15:10:22 +02:00
m_thread
2e472ec80c OP-1512 Fixed Platinum GPS setup
Fixed bug with number of mixer channels for fixed wing and octocopters.
2014-10-01 15:06:15 +02:00
m_thread
8123e816b6 OP-1517 Fixed saving of vehicle setup to be performed before output calibration and esc calibration. 2014-10-01 15:05:32 +02:00
m_thread
394df149b6 Merge remote-tracking branch 'origin/next' into thread/OP-1517_FW_Wizard_Fixes 2014-10-01 12:37:58 +02:00
m_thread
cc8c1c75f9 OP-1517 Fixed handling of configuration when sbus needs to use main port and gps is configured.
Enabled platinum gps configuration.
Cleaned up the naming standards in connection diagram svg file.
Re-factored the connection diagram code.
Uncrustified code.
2014-10-01 11:42:11 +02:00
Laurent Lalanne
002cd10cd8 OP-1337 Export template fixes 2014-09-30 22:31:54 +02:00
m_thread
7c2968e7ef OP-1512 Use QuadX as default muti vehicle. 2014-09-30 22:27:34 +02:00
m_thread
1a406d00d4 OP-1512 Simplified HTML text 2014-09-30 22:09:41 +02:00
Laurent Lalanne
9760495899 OP-1337 Typo fix (Wizard-fixedwingpage.cpp) - Translations updates 2014-09-30 20:58:11 +02:00
m_thread
be4ae80696 OP-1512 Fixed some magic numbers... 2014-09-30 20:48:20 +02:00
m_thread
9872a95bc3 OP-1512 Fixed issues found in review. 2014-09-30 20:40:54 +02:00
m_thread
ada27f2568 Merge remote-tracking branch 'origin/next' into thread/OP-1512_ESC_Cal
Conflicts:
	ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp
2014-09-30 20:17:26 +02:00
Laurent Lalanne
c0220e3efd Merge remote-tracking branch 'origin/next' into laurent/OP-1337_French_translations_updates 2014-09-30 17:40:56 +02:00
Fredrik Larson
4c88d878d4 add 500 as an option 2014-09-30 23:32:26 +10:00
Fredrik Larson
0556f6f6ad uncrusty 2014-09-30 15:47:01 +10:00
Fredrik Larson
34628cd194 Update rates 2014-09-30 15:40:02 +10:00
Fredrik Larson
4591733008 Add new Buttons to Wizard 2014-09-30 15:37:08 +10:00
Fredrik Larson
e54d7865af Add to resources 2014-09-30 15:24:34 +10:00
Fredrik Larson
8e581a2d18 New buttons 2014-09-30 15:23:05 +10:00
Fredrik Larson
bf145ad76b Name change 2014-09-30 13:16:29 +10:00
m_thread
9f8e0c0f05 OP-1512 Added ESC calibration implementation.
Fixed some minor issues.
2014-09-30 00:39:51 +02:00
Laurent Lalanne
4ab043fb65 OP-1222 Removed Tx wire for Sbus Rx (3 wires) - All wing frames heading top (follow revo red arrow) 2014-09-29 23:56:09 +02:00
Laurent Lalanne
1c7ab99e51 OP-1222 Updated connection-diagram with Vtail frame 2014-09-29 22:58:51 +02:00
Laurent Lalanne
87790711c2 OP-1222 Updated wizard shapes with Vtail frame 2014-09-29 22:35:33 +02:00
Laurent Lalanne
a0541f431c OP-1222 Added vtail propeller 2014-09-29 21:12:37 +02:00
Laurent Lalanne
e28b6d8d9f Merge branch 'thread/OP-1222_FW_Wizard' of ssh://git.openpilot.org/OpenPilot into laurent/OP-1222_FW_Wizard 2014-09-29 16:11:31 +02:00
Fredrik Larson
ee27357132 Only offer ESC calibration if ESC type and airframe type is correct 2014-09-28 23:25:39 +10:00
Fredrik Larson
488a359d85 add the page 2014-09-28 22:46:01 +10:00
Fredrik Larson
c643abf4fb Add files to the .pro 2014-09-28 15:11:40 +10:00
Fredrik Larson
f487ed3852 Start on ESC Calib page 2014-09-28 15:05:17 +10:00
Fredrik Larson
9cb5c21f23 test on summary page, inform users to not coneect battery yet 2014-09-28 13:01:36 +10:00
m_thread
7a00c7f905 OP-1222 Fixed false positive dirty indication for stabilization tab in configplugin.
Added tracking of TPS curve changes.
2014-09-28 02:00:54 +02:00
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
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
20300b7beb Merge remote-tracking branch 'origin/next' into laurent/OP-1337_French_translations_updates 2014-09-25 19:06:42 +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
Laurent Lalanne
565c86060f OP-1506 Remove Svg gradient, now draw in qml (linear from middle). Remove Vsi scale background. 2014-09-24 20:54:54 +02:00
Laurent Lalanne
95db735063 OP-1506 Speed, altitude and vertical speed units in cyan 2014-09-24 19:49:06 +02:00
Laurent Lalanne
ca3b74bdf4 OP-1506 Auto-select Vsi unit and scale from altitude unit : m/s or ft/s 2014-09-24 19:19:21 +02:00
Laurent Lalanne
27f0e06780 OP-1506 Wrong_display_alt_speed : Fix wrong scale display for speed and altitude. Hide scales (because do nothing) if no units defined in options km/h, m/s, knots, miles/h (speed) or meter / ft (altitude) 2014-09-24 17:49:22 +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
Laurent Lalanne
e320e9782d OP-1337 Pid Scaling translation 2014-09-23 23:41:33 +02:00
Laurent Lalanne
762c24ed7e Merge remote-tracking branch 'origin/next' into laurent/OP-1337_French_translations_updates 2014-09-23 22:56:55 +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
Laurent Lalanne
46dbf46f05 OP-1435 System Tab : Font size issue 2014-09-23 01:02:34 +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
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
e5ab845170 OP-1337 Translations for download/upload PathPlan 2014-09-20 10:52:03 +02:00
Laurent Lalanne
7ca288901f Merge remote-tracking branch 'origin/next' into laurent/OP-1337_French_translations_updates 2014-09-20 10:42:26 +02:00
Laurent Lalanne
faad0e0a15 Merge branch 'next' into laurent/OP-1337_French_translations_updates 2014-09-20 10:21:59 +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
Laurent Lalanne
d31c8bff9c OP-1435 V/A/Consumed displayed on top if Battery module enabled and no PathPlan 2014-09-19 22:45:53 +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
0742eb6b77 OP-1435 System tab : Right aligned text 2014-09-19 00:00:37 +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
Laurent Lalanne
e464983cfe Merge remote-tracking branch 'origin/next' into laurent/OP-1435_Add_more_info_PFD 2014-09-16 21:54:45 +02: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
b31feb31b3 OP-1222 FW_Wizard Fix : QuadH and HexaH do not load Svg file 2014-09-16 20:41:45 +02:00
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
Laurent Lalanne
a412f612ed OP-1337 French_translations_updates : Added some translations 2014-09-15 15:39:03 +02:00
Laurent Lalanne
748e284937 OP-1337_French_translations_updates Typo 2014-09-15 15:24:19 +02: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
Fredrik Larrson
d91db0af6f Revert "Merge remote-tracking branch 'origin/proff/OP-1373_DSMFixes' into next"
This reverts commit a39e393274, reversing
changes made to ebfdaf28b5.
2014-09-08 02:31:02 +10:00
Fredrik Larrson
a39e393274 Merge remote-tracking branch 'origin/proff/OP-1373_DSMFixes' into next
Conflicts:
	shared/uavobjectdefinition/hwsettings.xml
2014-09-08 01:54:59 +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
Laurent Lalanne
39ef705632 OP-1222 Fix collisions between nmea Gps and fixed wing connectors. 2014-09-07 14:25:46 +02:00
m_thread
7cd46bdeee OP-1222 Fixed handling of conflicting configurations. Config is now invalidated if use goes back and make changes introducing conflicts.
Added more configuration saving logic.
2014-09-07 13:52:28 +02:00
m_thread
1a2bf73969 OP-1222 Added constant for image padding. re-factored the firInView into a function.
Removed old comments.
Fixed background on saved image to be white. Was previous black.
2014-09-07 13:50:41 +02:00
Laurent Lalanne
e9dd37eaf8 OP-1222 Bigger size for wizard window + add margins for connection diagram 2014-09-07 12:24:05 +02:00
m_thread
436646d070 OP-1222 Added configuration code for GPS and Airspeed sensors to the hardware settings section.
Still some ?? since the Platinum GPS support not yet is merged to this branch.
2014-09-07 10:15:09 +02:00
m_thread
474466ac92 OP-1474 Uncrustify. 2014-09-07 00:23:20 +02:00
m_thread
45ea8015ed OP-1474 Updated GUI to follow the standard way of handling checked groups.
Added missing push buttons to widget list to make then enable/disable correctly.
2014-09-07 00:20:22 +02:00
m_thread
7fb064cf22 OP-1474 Added thrust PID scale curve to stabilization configuration GUI. 2014-09-06 23:53:44 +02:00
Fredrik Larson
27621f0f75 Fix spelling typeo, make sure npote is visable 2014-09-06 10:35:43 +10:00
Laurent Lalanne
a3c5b85fcd OP-1222 Update : Fix for bad rendering on wiring when sub-groups are used. 2014-09-05 23:50:37 +02:00
Laurent Lalanne
240afd1f2f OP-1222 Artwork : Added airspeed stuff + connectors - Resized all frames 2014-09-05 21:25:12 +02:00
m_thread
73d1217cc7 OP-1222 Added code to handle port conflicts in configuration. 2014-09-05 17:31:41 +02:00
m_thread
1d50f9e949 OP-1222 Added support for gps and airspeedsensors in connection diagram.
Optimized bounding rect handling. Got rid of need for background element.
2014-09-05 17:30:20 +02:00
Fredrik Larson
cefffefd7b Uncrustify 2014-09-05 17:22:59 +10:00
Fredrik Larson
ce64aa2ca7 Add for other airframe types 2014-09-05 17:21:37 +10:00
Fredrik Larson
b1a7f959b5 Initial tuning page 2014-09-05 17:14:27 +10:00
Fredrik Larson
135853d5a1 Add airspeed type selction to summary 2014-09-04 10:59:11 +10:00
Fredrik Larson
e2e437627b Add selected GPS type to summary 2014-09-04 10:40:08 +10:00
Fredrik Larson
6635e5d928 Update names in svg 2014-09-04 10:07:03 +10:00
Fredrik Larson
1b1c9938f3 MS4525DO airspeed sensor support to wizard page 2014-09-04 10:04:38 +10:00
Fredrik Larson
99ec1c727e Aadd new sensor items, airspeed (EagleTree) 2014-09-04 10:03:28 +10:00
Fredrik Larson
c673bea4f0 Start adding new sensor items, estimated 2014-09-04 10:01:54 +10:00
Fredrik Larson
b57ea9cb6c Add new Sensor-shapes from Laurent 2014-09-04 09:58:50 +10:00
Fredrik Larson
7073b7c9fe Remove actual file 2014-09-04 09:57:18 +10:00
Fredrik Larson
91244cd47a Airspeed shapes place holder gone 2014-09-04 09:57:04 +10:00
Fredrik Larson
62b321ffa1 GPS shapes place holder removed from qrc 2014-09-04 09:56:13 +10:00
Fredrik Larson
3fbfd82206 Actualy downfile deleted 2014-09-04 09:55:27 +10:00
Fredrik Larson
4c5afba2aa Actualy Up file deleted 2014-09-04 09:55:05 +10:00
Fredrik Larson
3e6bb1e09d Remove other state from qrc also 2014-09-04 09:54:26 +10:00
Fredrik Larson
769e871f58 Remove old button 2014-09-04 09:54:03 +10:00
Fredrik Larson
c73905b24d Start implimenting new Artwork from Laurent 2014-09-04 09:50:15 +10:00
Laurent Lalanne
8022fbc133 OP-1222 Revert : "No-sensor" icon available if needed. 2014-09-04 00:15:29 +02:00
Laurent Lalanne
b0b475bb60 OP-1222 Removed "No-sensor", polished estimated airspeed with gears 2014-09-04 00:11:00 +02:00
Laurent Lalanne
60f5fa068a OP-1222 connection-diagram.svg file : Added GPS and connectors 2014-09-03 21:41:09 +02:00
Stefan Karlsson
9bfd648879 OP-1077 Prevent GCS flight log corruption when no flight log is chosen 2014-09-03 21:19:15 +02:00
Laurent Lalanne
dec4c83b68 OP-1222 Artwork for airspeed and gps sensors 2014-09-03 17:28:38 +02:00
Laurent Lalanne
61e65734b2 Merge branch 'thread/OP-1222_FW_Wizard' of ssh://git.openpilot.org/OpenPilot into laurent/OP-1222_FW_Wizard 2014-09-03 00:44:25 +02:00
m_thread
fdeb1ccfc9 OP-1222 Minor changes in page path code. 2014-09-03 00:31:56 +02:00
m_thread
a36943c616 OP-1222 Added svg for gps shapes. Fixed some spelling errors. 2014-09-03 00:05:47 +02:00
Fredrik Larson
14574832b9 Tidy up text 2014-09-03 07:42:15 +10:00
Fredrik Larson
b93ff6bd89 Make a start on GPS page 2014-09-03 07:16:36 +10:00
Fredrik Larson
afeb464eb6 Add some line breaks 2014-09-03 04:41:49 +10:00
Fredrik Larson
577b38b786 Text for AirSpeed page 2014-09-03 04:31:39 +10:00
Laurent Lalanne
bc70db575d OP-1222 FW_Wizard New artwork for connection diagram button (up/down or hover), added to wizardResources.qrc 2014-09-02 20:22:07 +02:00
Stefan Karlsson
fa1bd4c946 OP-1458 Deregister previous channel when the back button is pressed 2014-09-02 18:53:02 +02:00
Fredrik Larson
b59857e3e7 Merge branch 'next' into fw_wiz
Conflicts:
	ground/openpilotgcs/src/plugins/welcome/welcomemode.cpp
2014-09-03 02:48:34 +10:00
Fredrik Larson
650cbd3b52 Uncrustify 2014-09-03 02:46:26 +10:00
Fredrik Larson
acee61b3b1 Skip bias calib on fixed wings 2014-09-03 02:39:18 +10:00
Fredrik Larson
b9f89e39e7 Uncrustify 2014-09-03 02:22:09 +10:00
Fredrik Larson
82a32a5d8e Create airspeed page 2014-09-03 02:19:15 +10:00
m_thread
4bf932d36b OP-1222 Uncrustification. 2014-09-02 16:46:40 +02:00
m_thread
af9dd99227 Merge remote-tracking branch 'origin/next' into thread/OP-1222_FW_Wizard
Conflicts:
	ground/openpilotgcs/src/plugins/welcome/welcomemode.cpp
2014-09-02 16:44:11 +02:00
Fredrik Larson
6243cad768 Change mouse pointr type to show this is a link 2014-09-02 23:18:45 +10:00
m_thread
655d02622f OP-1222 Minor ordering adjustments. 2014-09-02 14:01:02 +02:00
m_thread
b61471e8ef OP-1222 Fixed a merge regression. 2014-09-02 13:49:01 +02:00
m_thread
8c841fa5f1 Merge branch 'thread/OP-1222_FW_Wizard' of ssh://git.openpilot.org/OpenPilot into thread/OP-1222_FW_Wizard 2014-09-02 13:46:25 +02:00
m_thread
819e4d6b3b OP-1222 Finished re-factoring vehicle selection pages, 2014-09-02 11:03:52 +02:00
Fredrik Larson
11068197c5 Change motor for engine 2014-09-02 14:29:49 +10:00
Fredrik Larson
7486ba8803 Put channels in order, make outputs match the diagrams, channels now
reflect common fixed wing model conventions
2014-09-02 14:23:26 +10:00
Fredrik Larson
34d8ba608c Change button order in wizard to match the order of the config plugin,
also has two currently support types of airframe first
2014-09-02 13:30:22 +10:00
Fredrik Larson
f21a31cdbe Comment out destructor to fix compile 2014-09-02 12:31:19 +10:00
Laurent Lalanne
fd9700b578 OP-1435 Add_more_info_PFD Changes in panel functions + removed spaces 2014-09-02 01:28:27 +02:00
Laurent Lalanne
81999ced23 OP-1435 Add_more_info_PFD Follow up to previous review. Added Panels.qml, System tab panel, new behavior for panels with close icon. 2014-09-02 00:21:38 +02:00
m_thread
c56980e54e OP-1222 Re-factored and renamed selection page. 2014-09-02 00:10:31 +02:00
m_thread
5586b5b85c Merge remote-tracking branch 'origin/corvuscorax/OP-1222_FW_Wizard' into thread/OP-1222_FW_Wizard 2014-09-01 22:47:15 +02:00
Stefan Karlsson
6633e788b1 OP-1458 Embed the delayed next QTimer in ConfigInputWidget 2014-08-31 23:41:23 +02:00
Stefan Karlsson
a59e4defc5 OP-1458 Shorten the transition delays on the input control setup page 2014-08-31 21:27:55 +02:00
Stefan Karlsson
507aa51221 OP-1458 Make stick identification in the input wizard more stable 2014-08-31 21:27:55 +02:00
Stefan Karlsson
cd5efd61d3 OP-1458 Increase the update for the accessory channels 2014-08-31 21:26:00 +02:00
Corvus Corax
daefab99be OP-1222 fixed elevon mixer to be consistent with aileron type (no channel reversals needed), made FW wizzard and config widget create the same type of mixer setup 2014-08-31 20:15:36 +02:00
Corvus Corax
3f9fa97d0f OP-1222 fixed FW elevon wizzard channel assignment to be compatible with config widget 2014-08-31 20:15:20 +02:00
Corvus Corax
798defd12d OP-1222 uncrustify 2014-08-31 20:15:01 +02:00
Corvus Corax
5707459074 Merge branch 'next' into corvuscorax/OP-1222_FW_Wizard 2014-08-31 19:00:05 +02:00
Stefan Karlsson
644d35fa41 OP-1458 Restore to original input rate values when cancel is clicked 2014-08-31 15:47:13 +02:00
m_thread
4695a60df6 OP-1222 Added base page for selection kind of action. 2014-08-31 14:35:45 +02:00
Alessio Morale
f69e476ed3 Merge branch 'amorale/OP-1452_comusbbridge_improvements' into next 2014-08-29 20:25:29 +02:00
Laurent Lalanne
5f346d81e9 OP-1349_GCS Neutral_Spinboxes_in_Input_and_Output Disable keyboard tracking on inputform spinboxes (min, max, neutral). 2014-08-29 19:45:29 +02:00
Laurent Lalanne
c39424d50a OP-1222_FW_Wizard : Finished artwork diagram, cpp file. Wing tips for FW, polished Vtail and all frames in dark gray. 2014-08-29 16:04:28 +02:00
Laurent Lalanne
826048e923 OP-1222 FW_Wizard SVG artwork connection-diagrams.svg Work in progress 2014-08-29 03:47:02 +02:00
Fredrik Larson
d4d1c9c482 Merge remote-tracking branch 'origin/dwillis/OP-1453_VersionCheck' into next 2014-08-29 09:51:18 +10:00
Fredrik Arvidsson
5d928725f1 Merge remote-tracking branch 'origin/next' into thread/OP-1222_FW_Wizard
Conflicts:
	ground/openpilotgcs/src/plugins/config/cfg_vehicletypes/configmultirotorwidget.cpp
2014-08-29 00:50:08 +02:00
James Duley
e5d1676d44 OP-1463 allow for alternative_OPENPILOT_TOOLS_DIR:added check to see if it is set and use it if possible 2014-08-29 09:01:30 +12:00
Fredrik Larson
41ecbc3eba Merge remote-tracking branch 'origin/laurent/OP-1438_VSI_Arc_PFD+Status' into next 2014-08-29 07:00:58 +10:00
Fredrik Larson
8d691f0f48 Merge remote-tracking branch 'origin/laurent/OP-1422_Tricopter_mixers_settings' into next 2014-08-29 06:54:22 +10:00
Fredrik Larson
ed85e026b1 Merge remote-tracking branch 'origin/laurent/OP-1362_make_ts_errors' into next 2014-08-29 06:53:43 +10:00