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
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
ad65312b41
Merge branch 'next' into fw_wiz
2014-09-17 02:09:07 +10: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
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
ef341c8a06
Added Stefan Karlsson to CREDITS.txt
2014-09-15 22:49:21 +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
Alessio Morale
ece0d64c9f
OP-1434 - Update a (old, now wrong) comment
2014-09-15 15:27:19 +02:00
Fredrik Larsson
857924ff6b
Damn man, missed Sam - updated Credits.
...
If I missed you also, email me.
2014-09-15 19:51:41 +10:00
Fredrik Larsson
55ef67e424
Update Credits to add new contributors
2014-09-15 18:02:25 +10:00
Philippe Renon
4ed8fb0188
OP-1488 fixed typo in uavobject.java.template
2014-09-15 09:00:44 +02:00
Alessio Morale
3e785cf929
OP-1434 - Use vector_lengthf, fix a typo in a comment
2014-09-14 21:44:41 +02:00
Werner Backes
2f0c43c6e5
Wrong I2C bus used for the onboard magnetometer
2014-09-15 03:11:31 +10: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
25c718aaa8
Add Jim's amazing nav flight
2014-09-14 23:02:56 +10: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
5d55766573
OP-1478 fix_win_qtc_variables: reworded comments
2014-09-14 11:55:32 +12:00
Alessio Morale
03dc92124c
Merge remote-tracking branch 'origin/amorale/OP-1465_update_stm32flash' into next
2014-09-13 19:03:15 +02:00
Alessio Morale
3fd5ca08cd
OP-1434 - Switch to common aux mag support library
2014-09-13 16:15:02 +02:00
Alessio Morale
76b9b1c40f
OP-1406 - Create a support library to share common calibration and sample publishing logic
2014-09-13 16:14:34 +02: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
Fredrik Larsson
34c3706ded
Use Rod's real name
2014-09-11 17:23:20 +10:00
Werner Backes
907b4668aa
Merge remote-tracking branch 'origin/next' into D-Lite/OP-1462-NewEKFdefaults
2014-09-10 12:51:20 +02:00
Fredrik Larsson
f6b097ee77
Add missing 20km flight
2014-09-10 04:24:06 +10:00
Fredrik Larsson
10703aaf46
Update Miletones
2014-09-10 04:16:40 +10: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
Alessio Morale
2907af618f
OP-1465 - fixes for some review suggestions
2014-09-08 14:39:41 +02:00
James Duley
67e7801949
OP-1478: move TOOLS_DIR out of linux scope
2014-09-08 21:29:44 +12:00
Fredrik Larsson
d04b8fecfb
Update gitignore to make sure we keep that pro.user out of git
2014-09-08 18:23:03 +10: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
