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
|
ad65312b41
|
Merge branch 'next' into fw_wiz
|
2014-09-17 02:09:07 +10:00 |
|
Alessio Morale
|
c49497f2e0
|
Merge branch 'amorale/OP-1434_GPSV9_fc_support' into next
|
2014-09-15 23:49:54 +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 |
|
m_thread
|
1c2efe0868
|
OP-1222 Added JSon serialization code.
|
2014-09-15 22:46:28 +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 |
|
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 |
|
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 |
|