rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-12-11 19:24:10 +01:00
Code Issues Releases Activity
11,616 Commits 5 Branches 8 Tags 266 MiB
f27b35f71b
Commit Graph

5464 Commits

Author SHA1 Message Date
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
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