1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-12 20:08:48 +01:00
Commit Graph

3506 Commits

Author SHA1 Message Date
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
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
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
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
4d81aad85d OP-1222 FW_Wizard : Modified Sbus Rx on MainPort, added Gps for FlexiPort 2014-09-14 18:01:20 +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
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
Stefan Karlsson
c0152b7e19 OP-1474 Thrust PID scaling 2014-09-08 00:14:49 +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
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
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
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
Laurent Lalanne
d5c8e9a51e OP-1134 Populate_new_custom_tab Lock Custom mixer table until frameType is saved on board, next edit. 2014-08-28 22:30:30 +02:00
Laurent Lalanne
485600ab5d OP-1134 Populate_new_custom_tab : Fix comment 2014-08-28 20:25:22 +02:00
Laurent Lalanne
944e6882c5 OP-1134 Populate_new_custom_tab : Removed question mark 2014-08-28 20:18:54 +02:00
Laurent Lalanne
465f6dc701 OP-1134 Populate_new_custom_tab Protect current mixer table : Changes on Custom tab can't be saved until frameType is set to Custom. 2014-08-28 15:59:32 +02:00
Laurent Lalanne
b8913209dc OP-1134_Populate_new_custom_tab : Typo, bad cleannup 2014-08-28 14:47:37 +02:00
Laurent Lalanne
c00aef04f8 OP-1134 Populate_new_custom_tab : Always update custom tab from airframe's mixer currently used 2014-08-28 14:43:52 +02:00