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 |
|
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
|
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 |
|
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 |
|
Fredrik Larsson
|
65e0124a74
|
Remove QtCreator user file from git
|
2014-09-08 18:19:03 +10: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 |
|