Alessio Morale
|
fe985d2326
|
Merge remote-tracking branch 'origin/laurent/OP-1241_TxPID_Bank3' into next
|
2014-04-01 21:34:18 +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 |
|
Alessio Morale
|
6a65ddca50
|
Merge remote-tracking branch 'origin/theothercliff/OP-1157_sin_lookup_deg()_returns_garbage_for_negative_angles' into next
Conflicts:
flight/libraries/math/sin_lookup.c
|
2014-04-01 21:17:39 +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
|
b7b09b5847
|
Merge branch 'corvuscorax/minifix-2014-03-30-1' into next
|
2014-03-30 18:09:13 +02:00 |
|
Corvus Corax
|
057563dfb2
|
OP-1170 re-activated accidently commented out code from commit a79efd7
|
2014-03-30 17:47:31 +02:00 |
|
Corvus Corax
|
96865faebd
|
fixed systemalarms throttling due to prolems over radio telemetry
|
2014-03-30 16:40:42 +02: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 |
|
Corvus Corax
|
5866983ba3
|
Merge remote-tracking branch 'origin/Bertrand/OP-1272_Fix_STM32F4_Watchdog_Freeze_In_Debug_Mode' into next
|
2014-03-27 22:33:32 +01:00 |
|
Corvus Corax
|
fe04cf7d29
|
uncrustification
|
2014-03-27 21:19:03 +01:00 |
|
Corvus Corax
|
7bd7c20fd9
|
Merge remote-tracking branch 'origin/Bertrand/OP-1267_Update_HomeLocation_In_LLA_Filter' into next
|
2014-03-27 21:17:42 +01:00 |
|
Cliff Geerdes
|
d38360b665
|
OP-1259 small code beautification
|
2014-03-26 13:35:04 -04:00 |
|
Cliff Geerdes
|
eaa58fd1dc
|
Merge branch 'theothercliff/OP-1260_Rattitude_Tweaks' into next
|
2014-03-26 12:22:17 -04:00 |
|
Bertrand Oresve
|
199193aa3f
|
OP-1267 Fix UAV position after a HomeLocation Update (adding #define to be clearer)
|
2014-03-25 21:00:10 +01:00 |
|
m_thread
|
7affc034c4
|
Merge branch 'next' into thread/OP-1245_FlightLog_Configuration_And_Control_GUI
|
2014-03-24 09:20:06 +01:00 |
|
Cliff Geerdes
|
d36cfe28ed
|
OP-1260 finish renaming RattitudeModeTransition I don't know how it built before.
|
2014-03-23 19:04:17 -04:00 |
|
Cliff Geerdes
|
5ecea4bf33
|
OP-1260 fix misspelling of RattitudeModeTransition
|
2014-03-23 13:00:00 -04:00 |
|
Alessio Morale
|
63e9abdacf
|
Merge branch 'next' of git://git.openpilot.org/OpenPilot into next
|
2014-03-23 17:59:37 +01:00 |
|
Philippe Renon
|
c3e29fc826
|
OP-1233 fixed parallel build regression introduced when splitting openpilotgcs target into _make and _qmake
both _make and _qmake would wrongly run in parallel when using -j2 or similar option
|
2014-03-23 16:01:51 +01:00 |
|
Alessio Morale
|
abd7da20df
|
Merge branch 'amorale/OP-1026_cpu_idle' into next
|
2014-03-23 15:32:19 +01:00 |
|
Bertrand Oresve
|
10dec58a10
|
OP-1267 Fix UAV position after a HomeLocation Update
|
2014-03-23 12:56:01 +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 |
|
Bertrand Oresve
|
ea665d1270
|
OP-1272 Fix STM32F4 Watchdog in debug mode
|
2014-03-22 18:44:47 +01:00 |
|
Philippe Renon
|
7bdc1e2c00
|
OP-1233 documented new GCS make options (QMAKE_SKIP and MAKE_DIR)
|
2014-03-22 15:25:01 +01:00 |
|
Cliff Geerdes
|
820e8dfa3e
|
OP-1260 use predefined macro for size of Flight Mode Switch
|
2014-03-21 22:34:03 -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 |
|
Cliff Geerdes
|
945b60cf99
|
OP-1260 Fixed typo in a fairly important comment
|
2014-03-20 12:41:48 -04: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
|
2190ccdf77
|
Merge branch 'filnet/OP-1233_add_make_options_to_skip_qmake_and_build_single_gcs_dir' into next
|
2014-03-20 01:50:42 +01:00 |
|
Philippe Renon
|
d5e9f42fd1
|
Merge branch 'filnet/OP-1194_persist_scope_gadget_plot_and_legend_visibility_state' into next
|
2014-03-20 01:49:21 +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
|
61707f0726
|
Merge branch 'filnet/OP-1243_opmap_widget_duplicate_popup_menu_entries' into next
|
2014-03-20 01:32:14 +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 |
|
m_thread
|
a327d49049
|
OP-1245 Added code to read current log settings from uavos.
|
2014-03-19 17:08:33 +01:00 |
|
Cliff Geerdes
|
1cb9d9548f
|
OP-1160 limit values in flight code (not just GCS) to avoid DZ. Set GCS tab index back to 0.
|
2014-03-17 22:40:19 -04:00 |
|
m_thread
|
1dae98a378
|
OP-1245 Added code to load settings from xml file.
|
2014-03-15 13:57:28 +01:00 |
|
Werner Backes
|
ef715ecd73
|
Make WriteFile use Events to signal when write requests are
finished. This avoids lockups on Windows platforms during hid_write. (see OP-1261)
|
2014-03-14 12:19:02 +01:00 |
|
Cliff Geerdes
|
390533f2e3
|
OP-1160 Oops, forgot to remove #if 0's after testing
|
2014-03-14 02:14:02 -04:00 |
|
Cliff Geerdes
|
297b0d01cb
|
OP-1260 remove anti-windup, 2 PIDs, mode transition
|
2014-03-14 01:47:37 -04:00 |
|
Alessio Morale
|
8218becdac
|
uncrustify
|
2014-03-09 16:43:31 +01:00 |
|
Alessio Morale
|
0f2d65a8e4
|
Merge branch 'amorale/OP-974_make_bl_info_available_to_fw' into next
|
2014-03-09 16:17:34 +01:00 |
|
Alessio Morale
|
597a6b4670
|
Merge branch 'amorale/OP-1230_autoload_dev_firmware' into next
|
2014-03-09 16:15:09 +01:00 |
|