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

3877 Commits

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