1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-02 10:24:11 +01:00
Commit Graph

5437 Commits

Author SHA1 Message Date
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
Corvus Corax
b64326208e Merge branch 'next' into corvuscorax/OP-1456_struct_to_array_improvement 2014-08-31 18:43:48 +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
Fredrik Larson
82c38a0b90 Merge remote-tracking branch 'origin/laurent/OP-868_Text_in_Barographs' into next 2014-08-29 06:52:49 +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
Laurent Lalanne
eda53adf9e OP-1134 Populate_new_custom_tab Sub task OP-790 : Added custom labels in output, up to 8 Motors, revMotors or Servos 2014-08-28 13:40:02 +02:00
Laurent Lalanne
4e64710c54 OP-1134 Populate_new_custom_tab Fix struct size 2014-08-28 10:43:21 +02:00
Laurent Lalanne
a78e71c31a OP-1134 Populate_new_custom_tab Fixes for files description 2014-08-28 09:55:55 +02:00
Fredrik Larson
6e86b3f157 Merge remote-tracking branch 'origin/parched/OP-1461_fix_copyqt_logic' into next 2014-08-28 09:59:30 +10:00
Fredrik Larson
8c65661e54 Merge remote-tracking branch 'origin/parched/OP-1460_copy_icu_again' into next 2014-08-28 09:59:25 +10:00
Laurent Lalanne
c6fc46403c OP-1362 make_ts_errors Better fix, replace 0 with NULL and no more 'make ts' error. Tks Filnet 2014-08-28 00:11:46 +02:00
Laurent Lalanne
2202bbc7aa OP-1362_make_ts_errors : Fix the last real error (filesearch.cpp) 2014-08-27 23:48:51 +02:00
James Duley
21d8159135 OP-1461 fix copyqt logic: renamed variables 2014-08-28 08:56:27 +12:00
m_thread
d87cf62c00 OP-1222 Added support for correct image scaling on open and resize. 2014-08-27 22:52:30 +02:00
Fredrik Larson
271f6090b5 Enable vtail again 2014-08-28 06:43:34 +10:00
Fredrik Larson
772ea8e051 Disable sliders by default, as default airframe is Aileron and on a clean
board with no settings the mixer slider will be enabled.

Use setCurrentText rather than relying on an index
2014-08-28 05:58:14 +10:00
Laurent Lalanne
9857ef56dd OP-1422 Tricopter_mixers_settings : Uncrustify ! 2014-08-27 20:38:04 +02:00
Laurent Lalanne
f313bef2e5 OP-1422 Tricopter_mixers_settings Store mixing / sliders values on board - Wizard/Config tab. Tricopter Yaw mixing now applies to servo, 100% default. 2014-08-27 20:33:11 +02:00
Fredrik Larson
63c4392932 Fix slider links, did this before but reator removed them due to wrong
naming in the UI by me.
2014-08-27 18:13:45 +10:00
Laurent Lalanne
4099507bf6 OP-1422_Tricopter_mixers_settings Wizard : Wrong mixer type for servo (was ReversedMotor). M3/M4 bugfix 2014-08-27 02:24:14 +02:00
Laurent Lalanne
2e5a28c5c3 OP-1362 make_ts_errors : Revert filesearch.cpp changes (compile error). Added Q_OBJECT for xmlconfig.cpp error 2014-08-27 01:35:09 +02:00
Fredrik Larson
4d420429ba Merge branch 'fw_wiz2' into fw_wiz 2014-08-27 08:46:03 +10:00
Fredrik Larson
73ef79a95e Header also 2014-08-27 08:45:50 +10:00
Fredrik Larson
dca5a92104 Replace with new version 2014-08-27 08:43:28 +10:00
m_thread
a215bca34c OP-1222 Added fixed wings to connection diagram dialog. 2014-08-27 00:30:05 +02:00
Laurent Lalanne
5f3699fbaa OP-1362 make_ts_errors Fix for 'make ts' errors. Still two errors, with one to fix (xmlconfig.cpp:61: Class 'XmlConfig' lacks Q_OBJECT macro) 2014-08-26 23:30:57 +02:00
m_thread
b31ee46724 OP-1222 Uncrustify 2014-08-26 22:34:58 +02:00
Laurent Lalanne
093d06b7a4 OP-868 Text_in_Barographs : Add space in vertical Barograph 2014-08-26 21:54:44 +02:00
Laurent Lalanne
0edf70d0aa OP-1422_Tricopter_mixers_settings : Uncrustify 2014-08-26 19:31:08 +02:00
Laurent Lalanne
94809de9c4 OP-1422_Tricopter_mixers_settings Ternary operator and include qmath.h in cpp 2014-08-26 19:27:05 +02:00
Laurent Lalanne
aea2adf2df OP-1422 Tricopter_mixers_settings Normalize mixer values saved from Wizard and Config tab. Fix bad values saved previously like -63/64. 2014-08-26 17:07:00 +02:00
Laurent Lalanne
458120cce2 OP-1422 Tricopter_mixers_settings : Do the same calc as Gcs and round values so Wizard set same values as Gcs defaults. Little fix for HexaX wizard that set HexaH frame ! 2014-08-26 14:17:24 +02:00
Fredrik Larson
a7ad51d335 Minor UI improvment with the sliders 2014-08-26 19:44:31 +10:00
Fredrik Larson
71a6726749 This file looked fine in inkscape but rendered with a missing gradient in
the elevon artwork, a long battle with inkscape and it now renders correctly
again
2014-08-26 19:25:06 +10:00
Fredrik Larson
9a59cf347e Create image for vtail in svg 2014-08-26 18:20:56 +10:00
Fredrik Larson
6ea2fc67db When qcombo disabled, change index to None, cosmetic, was never used in
mixer but could confuse users, per Eric's suggestion.

Reenabled v-tail
2014-08-26 16:46:52 +10:00
Fredrik Larson
8befdeb9b2 Cleanup the fixed-wing part of the config plugin, I am not sure what
happened to this file and I'm not sure I want to know.
2014-08-26 16:16:01 +10:00
Alessio Morale
4d0af3b6aa OP-1452 - fix hwwidget 2014-08-26 05:50:32 +02:00
Fredrik Larson
a4d2582cec Move Config plugin for fixed wings back to oly Aileron type per Eric 2014-08-26 12:44:11 +10:00