Fredrik Arvidsson
e14acffd5c
Merge branch 'thread/OP-1178_OPLink_Configuration' into rel-14.01
2014-01-20 07:21:13 +01:00
Fredrik Arvidsson
5fd8db6c5a
Merge branch 'thread/OP-1168_Reload_Board_Data_Fix' into rel-14.01
2014-01-19 23:18:10 +01:00
Fredrik Arvidsson
a2f69a5ad6
OP-1168, OP-1180 Fixing Reload for AltitudeHold page. Fixing Realtime updates checkboxes.
2014-01-19 23:15:53 +01:00
Fredrik Arvidsson
9727456ec2
OP-1178 Fixed QLineEdit support. Rgression from Re-factoring.
2014-01-19 17:20:03 +01:00
Fredrik Arvidsson
bfc2dc03a5
Merge branch 'thread/OP-1168_Reload_Board_Data_Fix' into rel-14.01
2014-01-19 14:09:00 +01:00
Fredrik Arvidsson
8fb17f7383
OP-1168 Bug made Reload board data not work.
2014-01-19 14:07:48 +01:00
Alessio Morale
ba0001981b
Merge remote-tracking branch 'origin/laurent/OP-1151_PFD_inverted_flight' into next
2014-01-19 12:34:34 +01:00
Fredrik Arvidsson
694abb26c6
OP-1169 Minor performance fix.
2014-01-19 00:19:12 +01:00
Fredrik Arvidsson
3936173017
OP-1169 Found the 'Control' item bug and fixed some minor things.
2014-01-18 23:39:46 +01:00
Alessio Morale
6d63b6b9b0
Merge remote-tracking branch 'origin/fnurgel/OP-1162_linux_deb_packaging_qt5' into next
2014-01-18 14:18:46 +01:00
Alessio Morale
e58f66db73
Merge remote-tracking branch 'origin/amorale/OP-1160_add_prepare_target_and_hooks' into next
2014-01-18 13:56:08 +01:00
Alessio Morale
f5bd8a556d
Merge remote-tracking branch 'origin/amorale/OP-1155_osx_package' into next
2014-01-18 13:54:57 +01:00
Corvus Corax
91d5a865da
uncrustification
2014-01-18 00:32:50 +01:00
m_thread
83b3a9bf12
OP-1154 Gui Fiddling.
2014-01-17 14:20:18 +01:00
m_thread
234626444e
Merge remote-tracking branch 'origin/next' into thread/OP-1154_Cruise_Control_automatically_increase_copter_throttle_per
2014-01-17 13:16:15 +01:00
m_thread
cc551d4acb
OP-1154 Fixed values from not loading in comboboxes properly.
2014-01-17 11:01:05 +01:00
Cliff Geerdes
42dda77264
OP-1154 neated up input page, tooltips, labels were cut off, etc.
2014-01-17 01:07:43 -05:00
Fredrik Arvidsson
60465bbd7d
OP-984 Missed something :/
2014-01-17 01:23:17 +01:00
Fredrik Arvidsson
2e2bd096d0
OP-984 Moved Cruise control settings to input config page. Added PID bank settings per flight mode switch position.
...
Field CruiseControlFlightModeSwitchPosEnable needs to be changed to an array of booleans to work with gui.
2014-01-17 01:15:02 +01:00
Cliff Geerdes
bfb5a248a0
OP-1154 enables for individual flight mode switch positions
2014-01-16 16:51:19 -05:00
Philippe Renon
9229da9c89
Merge branch 'next' of ssh://git.openpilot.org/OpenPilot into next
2014-01-16 19:02:39 +01:00
Philippe Renon
b69621ba11
OP-984 fixed jumping PID Tab in stabilization config panel
2014-01-16 19:01:44 +01:00
Corvus Corax
41202a0227
Merge branch 'corvuscorax/OP-1022_AH_improvements_amorale' into next
2014-01-15 22:47:42 +01:00
Philippe Renon
694747cd27
Merge remote-tracking branch 'origin/next' into filnet/OP-1122_gcs_waypoint_editor_stabilization
...
Conflicts:
ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
2014-01-15 20:12:08 +01:00
Corvus Corax
eb8d57cf31
uncrustification
2014-01-15 18:47:47 +01:00
Corvus Corax
9997f14d68
Merge remote-tracking branch 'origin/next' into corvuscorax/OP-1022_AH_improvements_amorale
2014-01-15 18:45:09 +01:00
Philippe Renon
d43b220dc0
OP-1122 uncrustified gcs and flight
2014-01-14 22:46:01 +01:00
Philippe Renon
c8cb666271
OP-1122 fixed wrong Timeout legend in waypoint editor (was (ms) instead of (s))
...
+review OPReview-609
2014-01-14 21:08:27 +01:00
Philippe Renon
96588ab13e
OP-1122 OP-1145 fixed logging helper as per review
...
+review OPReview-604
2014-01-14 21:05:27 +01:00
Philippe Renon
7f2c24db2b
OP-1122 OP-1158 - renamed uavobject FlightPlan to PathPlan
...
+review OPReview-609
2014-01-14 21:05:16 +01:00
Alessio Morale
0423d4ce99
OP-1160 Copydata was pointing to OPENSSL instead of OPENSSL_DIR, added related
...
export in tool.mk
2014-01-14 12:50:31 +01:00
Corvus Corax
07d5c8e4d2
OP-1022 fixed the config plugin widget to represent new simpler settings layout
2014-01-14 00:26:27 +01:00
Philippe Renon
a64720a9f1
OP-1122 OP-1158 added flight plan CRC consistency checks (in GCS and fixedwingpathfollower module)
...
- need to do the same in vtolpathfollower module)
- addressed an issue that could cause unwanted waypoints to be used (path follower was looping over all instanciated wp)
2014-01-12 19:42:12 +01:00
Philippe Renon
ff8a001a51
Merge remote-tracking branch 'origin/next' into filnet/OP-1122_gcs_waypoint_editor_stabilization
...
Conflicts:
ground/openpilotgcs/src/plugins/config/configpipxtremewidget.cpp
ground/openpilotgcs/src/plugins/uavobjectutil/uavobjectutilmanager.cpp
2014-01-12 16:29:17 +01:00
Philippe Renon
aa24f2193a
OP-1122 OP-1158 renamed FlightPlanInfo uavobject to FlightPlan
2014-01-12 15:23:21 +01:00
Philippe Renon
78fabdd4c3
OP-1122 OP-1158 added facility to update a CRC with uavobject data (ground side)
2014-01-12 15:08:12 +01:00
Fredrik Arvidsson
b43cf9a7fe
OP-984 Commented out some annoying debug prints.
2014-01-11 16:14:12 +01:00
Fredrik Arvidsson
38a709a0da
OP-984 Fixed false dirty indication. Added some constant.
2014-01-11 15:44:07 +01:00
Fredrik Arvidsson
b14c8bd4d2
OP-984 Gui fixes
2014-01-11 15:23:11 +01:00
Fredrik Arvidsson
92c7e96fc8
Merge remote-tracking branch 'origin/LesNewell/OP-984_PID_banks' into thread/OP-984_PID_banks_GUI
...
Conflicts:
ground/openpilotgcs/src/plugins/config/stabilization.ui
2014-01-11 09:41:36 +01:00
Corvus Corax
4c078f3dd8
Merge branch 'next' into corvuscorax/OP-1022_AH_improvements_amorale
2014-01-11 09:40:34 +01:00
Mikael Blomqvist
c98b8b4763
Fix for broken dependency lookup during deb packaging
2014-01-11 01:11:00 +01:00
a*morale
4738e4eafc
OP-1155 OSX Package: Add QtQuick plugin deployment to copydata.pro
2014-01-10 23:25:35 +01:00
a*morale
11259a3ac3
Merge remote-tracking branch 'origin/fnurgel/linux_deb_packaging_qt5' into amorale/OP-1155_osx_package
2014-01-10 23:24:18 +01:00
Les Newell
49cf33ee59
Merge branch 'next' into LesNewell/OP-984_PID_banks
...
Conflicts:
flight/modules/Stabilization/stabilization.c
2014-01-10 19:32:44 +00:00
Laurent Lalanne
e904c9f9cf
Horizon line is now displayed fine when board is in inverted flight, center of rotation is located on yellow arrows.
2014-01-10 19:10:28 +01:00
Les Newell
8eb2eefec7
Merge branch 'LesNewell/OP-984_PID_banks' into next
2014-01-10 15:24:28 +00:00
Alessio Morale
6d3dca6ee3
Merge remote-tracking branch 'origin/theothercliff/OP-1117_multi_wii_horizon_flight_mode_only' into next
2014-01-10 10:43:53 +01:00
a*morale
bab382a3df
OP-1155 OSX Package: Set QMAKE_MACOSX_DEPLOYMENT_TARGET
2014-01-10 00:44:12 +01:00
Philippe Renon
9c7fcbe47c
[OP-1105] uncrustified
2014-01-09 21:17:44 +01:00
