Corvus Corax
c63540b2ec
Merge branch 'corvuscorax/OP-1309_Stabilization-Refactoring' into corvuscorax/OP-1259_Cruise_Control_Tweaks
...
Conflicts:
flight/modules/Stabilization/stabilization.c
shared/uavobjectdefinition/stabilizationsettings.xml
2014-05-02 18:25:57 +02:00
Corvus Corax
f7a2e31809
Merge branch 'next' into theothercliff/OP-1259_Cruise_Control_Tweaks
...
Conflicts:
flight/pios/stm32f10x/inc/usb_conf.h
2014-05-01 22:58:10 +02:00
Corvus Corax
e47cad8ab8
OP-1309 changed default maximum rate for yaw (was too low, old Stabi ignored that setting)
2014-05-01 19:33:03 +02:00
Corvus Corax
6993570cc9
OP-1309 integrated AltitudeHold into new Stabilization
2014-05-01 11:48:38 +02:00
Corvus Corax
3ada1da71a
uncrustify
2014-04-30 22:20:07 +02:00
Cliff Geerdes
5ee2930181
OP-1259 Removed inverted flight pitch and yaw reverse option
2014-04-29 20:24:49 -04:00
Corvus Corax
33acbc4209
OP-1309 added new thrust mode default to setup wizard
2014-04-26 20:57:39 +02:00
Corvus Corax
599661ba18
OP-1309 UAVObject changes, GCS changes and Makefile changes needed for Stabi refactoring
2014-04-26 15:14:40 +02:00
Alessio Morale
7be6c16a40
OP-1301 allow GPS protocol selection only if GPS module is enabled.
...
This allow to be able to save HW settings with GPS module disabled.
2014-04-20 13:26:06 +02:00
Alessio Morale
d9b25db36d
OP-1196 Populate attitude tab at connection for CC
2014-04-20 13:08:07 +02:00
Alessio Morale
000ba5e8f3
Merge remote-tracking branch 'origin/laurent/OP-1172_fonts_in_default_config_files' into next
...
Conflicts:
ground/openpilotgcs/share/openpilotgcs/default_configurations/Developer.xml
ground/openpilotgcs/share/openpilotgcs/default_configurations/OpenPilotGCS_wide.xml
2014-04-15 22:42:18 +02:00
Corvus Corax
4b50708db6
uncrustify
2014-04-08 16:26:55 +02:00
Alessio Morale
c83284b21e
Merge remote-tracking branch 'origin/next' into shared/OP-1252_update_to_qt521
2014-04-08 11:31:23 +02:00
Alessio Morale
6e0f478f43
OP-1291 fix Matlab/Octave converter after UAVTalk changes.
...
Also made several optimization.
2014-04-05 13:00:55 +02:00
Alessio Morale
8bb1d0148c
Uncrustify
2014-04-01 22:58:23 +02:00
Alessio Morale
b58dd938d2
Merge remote-tracking branch 'origin/andrecillo/OP-1283_SystemHealthGadgetWidget_updateAlarms_coordinate_calculation_correction' into next
2014-04-01 22:11:32 +02:00
Alessio Morale
6540c69698
Merge remote-tracking branch 'origin/andrecillo/OP-1273_PixHawk_airspeed_sensor_MS4525DO' into next
2014-04-01 22:05:12 +02:00
Alessio Morale
840e4727fd
Merge remote-tracking branch 'origin/Bertrand/OP-1250_Add_GPS_Protocol_Config' into next
2014-04-01 21:45:11 +02:00
Alessio Morale
8fb8c8c9ff
Merge branch 'next' of git://git.openpilot.org/OpenPilot into next
2014-04-01 21:42:34 +02:00
Alessio Morale
0b66e2e96c
Merge remote-tracking branch 'origin/laurent/OP-1257_No_GCS_Audio_Linux' into next
2014-04-01 21:36:39 +02:00
Alessio Morale
18be34db05
Merge remote-tracking branch 'origin/filnet/OP-1246_RadioComBridge_bugs' into next
2014-04-01 21:31:32 +02:00
Fredrik Arvidsson
da5d5aa977
Fixed dll export related issue in uavobjectutil/uavobjecthelper.h, this bug only affected windows.
2014-04-01 17:07:03 +02:00
m_thread
93ce3a1e54
Merge branch 'next' into thread/OP-1245_FlightLog_Configuration_And_Control_GUI
2014-03-30 18:36:53 +02:00
Corvus Corax
057563dfb2
OP-1170 re-activated accidently commented out code from commit a79efd7
2014-03-30 17:47:31 +02:00
Andres
fd27a23225
OP-1283 Matrix inversion outside loop, mapRect called once
2014-03-28 18:16:03 +01:00
Andres
c8c9411fca
OP-1283 spelling error in comment corrected
2014-03-28 14:43:39 +01:00
m_thread
c91bb83f00
Merge branch 'next' into thread/OP-1245_FlightLog_Configuration_And_Control_GUI
2014-03-28 14:37:58 +01:00
m_thread
6cb2797c4f
OP-1245 Made the dialog raise to front if hidden by main window.
2014-03-28 14:34:33 +01:00
Andres
f73d75704b
OP-1283 corrected the coordinate calculation of alarm items by including a multiplication of the inverse of the background matrix and the alarm item matrix
2014-03-28 14:22:21 +01:00
Andres
7ec855af5f
OP-1273 added and implemented Airpeed alarm for the PixHawk sensor
2014-03-28 14:18:14 +01:00
Cliff Geerdes
45fa3220a5
Merge branch 'next' into theothercliff/OP-1259_Cruise_Control_Tweaks
2014-03-26 13:49:17 -04:00
Cliff Geerdes
81f31e64a9
OP-1259 WIP to merge next in locally
2014-03-26 13:48:24 -04:00
Cliff Geerdes
eaa58fd1dc
Merge branch 'theothercliff/OP-1260_Rattitude_Tweaks' into next
2014-03-26 12:22:17 -04:00
Cliff Geerdes
5ecea4bf33
OP-1260 fix misspelling of RattitudeModeTransition
2014-03-23 13:00:00 -04:00
Philippe Renon
2d52720a87
OP-1263 fixed minor memory leak introduced during SDL refactoring
2014-03-23 16:53:17 +01:00
m_thread
629bf807b5
Merge branch 'next' into thread/OP-1245_FlightLog_Configuration_And_Control_GUI
2014-03-23 10:52:15 +01:00
Corvus Corax
1babe4383a
Merge remote-tracking branch 'origin/D-Lite/OP-1261-winHIDfix' into next
2014-03-22 21:34:53 +01:00
Cliff Geerdes
6d7d10caba
OP-1259 PowerDelayComp addtl inverted modes
2014-03-22 01:18:06 -04:00
m_thread
3e3309860a
Merge branch 'next' into thread/OP-1245_FlightLog_Configuration_And_Control_GUI
2014-03-20 23:00:46 +01:00
m_thread
f95e6833e3
OP-1245 Uncrustify
2014-03-20 22:59:27 +01:00
m_thread
77f9294548
OP-1245 Changed the code that saves the logging metadata for all objects and DebugLogSettings object.
2014-03-20 22:58:09 +01:00
m_thread
786d3c97a1
OP-1245 Added tooltips. Added correct colors.
2014-03-20 22:57:21 +01:00
m_thread
b508c7dc96
OP-1245 Re-factored saving to board. Added code to save more things.
2014-03-20 17:02:44 +01:00
m_thread
838d8dd15f
OP-1245 Added code to update and store meta data on the board.
2014-03-20 14:10:16 +01:00
m_thread
cfff73361b
Merge branch 'next' into thread/OP-1245_FlightLog_Configuration_And_Control_GUI
2014-03-20 07:25:20 +01:00
Philippe Renon
7a6fcba12a
OP-1194 uncrustified
2014-03-20 01:46:38 +01:00
Philippe Renon
03bdd5e03e
Merge remote-tracking branch 'origin/next' into filnet/OP-1194_persist_scope_gadget_plot_and_legend_visibility_state
2014-03-20 01:42:26 +01:00
Philippe Renon
3594e70437
Merge remote-tracking branch 'origin/next' into filnet/OP-1243_opmap_widget_duplicate_popup_menu_entries
2014-03-20 01:28:47 +01:00
Philippe Renon
82bcc65d4c
OP-1263 cleaned up gcscontrol.pro
2014-03-20 01:09:25 +01:00
Philippe Renon
40f648eab1
OP-1255 Windows toolchain : upgraded Qt from version 5.1.1 to version 5.2.1
...
- Qt installer is now downloaded from official web site
- Qt is not anymore tweaked to contain the SDL SDK (see OP-1263)
- Installing Qt now requires 7-Zip to be available (run "./make/scripts/win_sdk_install.sh [<OpenPilot tools dir>]" to get it)
- SLD needs to be installed with "make sdl_sdk_install"
KNOWN ISSUE : GCS build fails unless V=1 command line arg is provided
2014-03-20 00:46:05 +01:00
