m_thread
|
2bd808995d
|
OP-1170 got rid of all compiler warnings in Core plugin.
|
2014-02-26 17:19:58 +01:00 |
|
m_thread
|
a632b4ad06
|
OP-1170 Got rid of all compiler warning in Config Plugin
|
2014-02-26 17:17:37 +01:00 |
|
m_thread
|
749703d187
|
OP-1245 GUI fixing.
|
2014-02-26 15:56:20 +01:00 |
|
m_thread
|
607466f937
|
OP-1245 Adjustments to qml dialog design to accomodate log settings and control.
|
2014-02-26 14:44:45 +01:00 |
|
m_thread
|
7150a3c4be
|
OP-1244 Changed formatting of objectid and instance id in xml export format.
|
2014-02-26 12:56:01 +01:00 |
|
m_thread
|
1d237aff96
|
OP-1244 Added support for flight start adjusted time stamps in exported files.
|
2014-02-26 12:55:32 +01:00 |
|
m_thread
|
c5549a287b
|
OP-1244 Added csv export implementation.
|
2014-02-26 12:36:53 +01:00 |
|
m_thread
|
b7ab2701a4
|
OP-1244 Implemented xml export of flight logs.
|
2014-02-26 12:10:02 +01:00 |
|
m_thread
|
b272948ff4
|
OP-1244 Added basic streaming xml write support to UAVObjects.
|
2014-02-26 11:19:00 +01:00 |
|
m_thread
|
905e6a8eda
|
OP-1244 Added basic support for multiple export format.
|
2014-02-26 11:17:26 +01:00 |
|
Alessio Morale
|
92839fe95d
|
Uncrustify
|
2014-02-21 19:19:24 +01:00 |
|
Alessio Morale
|
89b1a43b76
|
Merge remote-tracking branch 'origin/amorale/OP-1100_fix_osx_file_associations' into next
|
2014-02-21 19:18:06 +01:00 |
|
Alessio Morale
|
3cf1662bc8
|
Merge remote-tracking branch 'origin/amorale/OP-1212_telemetry_prio_queue' into next
|
2014-02-21 19:16:52 +01:00 |
|
Alessio Morale
|
b759d38f5c
|
Merge branch 'rel-14.01' into next
|
2014-02-21 19:16:02 +01:00 |
|
Alessio Morale
|
85c222e7cb
|
Merge branch 'amorale/OP-1166_fix_min_less_than_1000' into rel-14.01
|
2014-02-21 19:05:04 +01:00 |
|
Corvus Corax
|
e97ce303b8
|
Merge branch 'corvuscorax/OP-942_task-diagnostics-for-callbacks' into next
|
2014-02-18 00:03:07 +01:00 |
|
Philippe Renon
|
f6c7b5c185
|
OP-1228 disabled telemetry monitor option page creation to fix gcs crash
- a fully functional option page will be re-introduced with OP-1185
+review OPReview
|
2014-02-17 21:32:30 +01:00 |
|
Corvus Corax
|
0ebc92d9f5
|
Merge branch 'corvuscorax/OP-942_task-diagnostics-for-callbacks' into corvuscorax/OP-1216_flight-control-refurbishment
Conflicts:
flight/modules/AltitudeHold/altitudehold.c
|
2014-02-16 19:08:39 +01:00 |
|
Corvus Corax
|
5f2ce2e0a1
|
Merge branch 'next' into corvuscorax/OP-1216_flight-control-refurbishment
|
2014-02-16 12:26:45 +01:00 |
|
Corvus Corax
|
4fa62d71f8
|
drive-by-enhancement: assert on existance of qml fields in debug mode, helps debugging qml
|
2014-02-16 12:18:41 +01:00 |
|
Alessio Morale
|
49bc5b8cbd
|
OP-1212 fix GCS plot configurations
|
2014-02-15 15:32:57 +01:00 |
|
Alessio Morale
|
15b1fe88cb
|
OP-1230 Fix filename with empty label
|
2014-02-15 14:49:14 +01:00 |
|
Alessio Morale
|
8bed1e02ce
|
OP-1230 Automatically load the firmware in build/fw_<boardname> in development environment
|
2014-02-15 14:34:05 +01:00 |
|
Alessio Morale
|
7640f72e1f
|
OP-974 add bootloader revision info in Uploader gadget's Device Information.
|
2014-02-15 12:42:22 +01:00 |
|
Alessio Morale
|
9bb09bb4a1
|
OP-1100 fix app plist for invalid file associations
|
2014-02-11 12:22:03 +01:00 |
|
Alessio Morale
|
d7c18b1022
|
OP-1166 there was still a problem with ManualcontrolSettings.channelMin. This is a hacky workaround until the binding framework does not allow for a cleaner solution.
|
2014-02-10 21:53:08 +01:00 |
|
Laurent Lalanne
|
d1252ce261
|
OP-1187 rel-14.01 Updates
|
2014-02-09 20:09:37 +01:00 |
|
Corvus Corax
|
b5a27d05e7
|
OP-1197 configurable failsafes OP-1219 thrust control OP-1217 separate manualcontrolsettings apart
|
2014-02-09 19:37:22 +01:00 |
|
Laurent Lalanne
|
8795b1aebd
|
Merge remote-tracking branch 'origin/rel-14.01' into laurent/OP-1187_allow_french_translations_in_future_releases
|
2014-02-09 19:24:15 +01:00 |
|
m_thread
|
3e6192f2d1
|
OP-1191 Uncrustify.
|
2014-02-09 19:12:45 +01:00 |
|
m_thread
|
184b161d45
|
OP-1191 Fixed weirdness showing in 'Edit Gadgets Mode' after switch to Fusion style.
|
2014-02-09 17:39:16 +01:00 |
|
m_thread
|
9f02d3c170
|
OP-1191 Added some tooltips and fixed tooltip font color in css to make it work in Fusion style on Linux.
|
2014-02-09 14:08:07 +01:00 |
|
m_thread
|
64d0f861b1
|
OP-1191 Gui fixes to Output configuration gui.
|
2014-02-09 11:36:57 +01:00 |
|
Fredrik Arvidsson
|
277410061a
|
OP-1166 Channel number dropdowns not initialized properly.
|
2014-02-09 11:00:51 +01:00 |
|
m_thread
|
53c5b511af
|
OP-1191 Fixed Stabilization gui issues.
|
2014-02-09 10:59:50 +01:00 |
|
m_thread
|
da137e18e7
|
OP-1191 Removed all special tweaks to the macosx css. No need to have this for fusion.
|
2014-02-08 13:55:32 +01:00 |
|
m_thread
|
0964031ae0
|
OP-1191 Minor gui fixes. Removed stuff from linux css file. No need to have minor tweaks to the fusion style.
|
2014-02-08 13:51:42 +01:00 |
|
m_thread
|
7d44e38daf
|
OP-1088 Changes to the Vehicle configuration page. Changed combo box for tab bar and made the tab text translate-able.
|
2014-02-08 13:50:14 +01:00 |
|
Alessio Morale
|
4a29db4983
|
OP-1212 Remove priority task from taskinfo
|
2014-02-07 18:29:19 +01:00 |
|
Alessio Morale
|
0b36b39a5b
|
OP-1150 cleanup stale debug code, fix warnings
|
2014-02-07 12:12:18 +01:00 |
|
Alessio Morale
|
679e800d48
|
OP-1150: Fix start button not enabled due to uninitialized member variables;
|
2014-02-07 12:09:03 +01:00 |
|
m_thread
|
986f2e3e8e
|
OP-1191 Fixed a typo.
|
2014-02-06 18:30:01 +01:00 |
|
m_thread
|
6bfbe88813
|
OP-1191 Added message box stating that board reboot is needed after bind/unbind
|
2014-02-06 17:51:13 +01:00 |
|
Fredrik Arvidsson
|
9b50c26e8f
|
OP-1088 Switched to use 'Fusion' style on the application
|
2014-02-06 16:37:13 +01:00 |
|
m_thread
|
e6a8d8f02c
|
OP-1191 General Configuration cleanup
|
2014-02-06 16:28:26 +01:00 |
|
m_thread
|
517123d521
|
OP-1191 OPLink Configuration cleanup
|
2014-02-06 16:27:58 +01:00 |
|
Alessio Morale
|
7dc358ecae
|
OP-1150 fix and uniform ui style
|
2014-02-06 02:14:59 +01:00 |
|
Alessio Morale
|
19d1618996
|
OP-1150: Try to fix some cases where Start in not enabled postponing m_thermalCalibrationModel->init()
|
2014-02-06 01:40:22 +01:00 |
|
Alessio Morale
|
128daa9f03
|
OP-1150: remove couts left from old debug code
|
2014-02-06 01:00:40 +01:00 |
|
Alessio Morale
|
8a3e737cd8
|
OP-1150: second order polynomial for all gyro axis.
|
2014-02-06 00:59:42 +01:00 |
|
Alessio Morale
|
f7fd5ab1d9
|
OP-1150: remove non existing file in config.pro
|
2014-02-04 21:59:15 +01:00 |
|
Alessio Morale
|
77288b723a
|
OP-1150 UI for thermal calibration: show a message if calibration failed, some cleanup.
|
2014-02-04 00:54:57 +01:00 |
|
Alessio Morale
|
6431e80a5c
|
OP-1150 UI for thermal calibration: fix missing dependency on version_info
|
2014-02-03 23:32:47 +01:00 |
|
Alessio Morale
|
ef066a63b1
|
OP-1150 UI for thermal calibration: get rid of accel_scale no more needed after refactoring
|
2014-02-03 20:25:59 +01:00 |
|
Laurent Lalanne
|
f0a1555c14
|
OP-1187 Indentation
|
2014-02-03 11:57:33 +01:00 |
|
Corvus Corax
|
b076ba02a1
|
OP-942 API change to CallbackScheduler - include unique ID for each callback for a taskinfo like UAVObject
|
2014-02-02 19:54:17 +01:00 |
|
Alessio Morale
|
27c19d7cb1
|
OP-1149/OP-1150: uncrustify/Cleanup
|
2014-02-02 18:53:35 +01:00 |
|
Alessio Morale
|
1ea4a5bf0d
|
OP-1150 UI for thermal calibration: add a full debug log stored into a temporary directory.
Path is show in console log message. Files are cleaned up as soon as board is disconnected.
|
2014-02-02 18:37:33 +01:00 |
|
Alessio Morale
|
fb8bba4bec
|
OP-1150 UI for thermal calibration: fill calibration extent fields for accel/gyro
|
2014-01-31 21:01:59 +01:00 |
|
Laurent Lalanne
|
66fdc73e71
|
OP-1187 Removed "#"
|
2014-01-31 19:15:15 +01:00 |
|
Philippe Renon
|
9e16e8f6a9
|
OP-1194 minor cleanups to scope gadget state persistence handling
|
2014-01-30 21:54:05 +01:00 |
|
Laurent Lalanne
|
8e837fb985
|
OP-1187 Wrong file copy in lasted commit.
qt_fr.qm located in tools/Qt_install_dir, allow copy of this file for all systems
|
2014-01-29 13:42:39 +01:00 |
|
Alessio Morale
|
bd5824f83d
|
OP-1150 UI for thermal calibration: fill calibraion extent fields for baro
|
2014-01-28 23:11:04 +01:00 |
|
Alessio Morale
|
61354eaac9
|
OP-1150 UI for thermal calibration: UI fixes and change target gradient to .2
|
2014-01-28 00:13:13 +01:00 |
|
Alessio Morale
|
57554ec44f
|
OP-1150 UI for thermal calibration: fix wrong condition for validating gyro calibration
|
2014-01-27 22:56:17 +01:00 |
|
Alessio Morale
|
159ba7f697
|
OP-1150 UI for thermal calibration: Zero gyro/accel calibration before acquisition
|
2014-01-27 00:25:16 +01:00 |
|
Alessio Morale
|
afb7ba7ea4
|
OP-1150 UI for thermal calibration: calculate variance before and after calibration as sanity check
|
2014-01-27 00:24:53 +01:00 |
|
Philippe Renon
|
cdeebeebb4
|
OP-1194 scope gadget will now persistent plot and legend visibility state between runs
+review OPReview
|
2014-01-26 16:54:24 +01:00 |
|
Philippe Renon
|
decb996801
|
OP-1198 allow GCS gadgets to store/restore individual state (needed for OP-1194)
|
2014-01-26 16:30:08 +01:00 |
|
Alessio Morale
|
8cb8977a9e
|
Merge branch 'rel-14.01' of git://git.openpilot.org/OpenPilot into rel-14.01
|
2014-01-24 22:13:36 +01:00 |
|
Philippe Renon
|
7ecc247e4c
|
Merge branch 'filnet/OP-1183_uavbrowser_displays_hex_string_as_decimal' into rel-14.01
|
2014-01-24 21:54:45 +01:00 |
|
Philippe Renon
|
6f9fe4479e
|
Merge branch 'filnet/OP-1182_telemetry_widget_is_too_small_on_mac' into rel-14.01
|
2014-01-24 20:51:59 +01:00 |
|
Philippe Renon
|
a234f52b6d
|
OP-1182 minor tweak of telemetry monitor widget margin for better centering
|
2014-01-24 20:50:13 +01:00 |
|
Alessio Morale
|
e28e6a76fa
|
OP-1176 : fix Cruise Control checkboxes use wrong Default button
|
2014-01-24 20:19:13 +01:00 |
|
Philippe Renon
|
40ecef4f94
|
Merge branch 'OP-1184/cleanup_stack_scope_widget_plot_list' into rel-14.01
|
2014-01-24 19:58:01 +01:00 |
|
Philippe Renon
|
16ff328bfb
|
OP-1184 removed spurious drawAntialiased setting from stack scope config
+review OPReview-632
|
2014-01-24 19:53:13 +01:00 |
|
Philippe Renon
|
b58620c981
|
OP-1184 removed obsolete plots from the stack scope monitor gadget
did same in TaskInfo uav object
|
2014-01-24 00:17:47 +01:00 |
|
Alessio Morale
|
02c7084196
|
Merge remote-tracking branch 'origin/next' into amorale/OP-1149_gyro_accel_thermal_calibration
Conflicts:
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
|
2014-01-23 01:02:13 +01:00 |
|
Laurent Lalanne
|
ddde8a9596
|
OP-1187 Should be the last update before RC release if no changes in Gui/text
|
2014-01-22 23:34:21 +01:00 |
|
Laurent Lalanne
|
15dfec2d70
|
Merge remote-tracking branch 'origin/rel-14.01' into laurent/OP-1187_allow_french_translations_in_future_releases
|
2014-01-22 23:24:45 +01:00 |
|
Philippe Renon
|
ae3d2f41b8
|
OP-1183 UAVObjectBrowser - fixed issue in newly added hex string editor
|
2014-01-22 21:35:06 +01:00 |
|
Philippe Renon
|
a41930a5e2
|
Merge remote-tracking branch 'origin/filnet/OP-1182_telemetry_widget_is_too_small_on_mac' into rel-14.01
|
2014-01-22 20:59:26 +01:00 |
|
Alessio Morale
|
2d11f81e8a
|
Merge branch 'amorale/OP-1179_about_box_not_working_on_linux' into rel-14.01
|
2014-01-22 20:27:14 +01:00 |
|
Laurent Lalanne
|
8c06db7c3d
|
OP-1187 Spell check...
|
2014-01-22 19:59:32 +01:00 |
|
Corvus Corax
|
59b50ee84e
|
uncrustification
|
2014-01-22 18:30:30 +01:00 |
|
Laurent Lalanne
|
28f96ebd31
|
OP-1187 Review from Joël (eyesonsky) Thanks !
|
2014-01-22 18:08:55 +01:00 |
|
Philippe Renon
|
d8e1d849f5
|
OP-1183 UAVObjectBrowser now displays and allows editing of integers in
hex format (when unit is set to hex)
+review OPReview
|
2014-01-21 23:08:13 +01:00 |
|
Philippe Renon
|
0c8756b496
|
OP-1182 second attempt at fixing telemetry monitor widget size too small on Mac
|
2014-01-21 22:51:46 +01:00 |
|
Laurent Lalanne
|
eadb9d69f3
|
OP-1187 New branch laurent/OP-1187_allow_french_translations_in_future_releases
Updated lasted text in radio inputs
|
2014-01-21 20:52:52 +01:00 |
|
Laurent Lalanne
|
64485f1cf8
|
Merge remote-tracking branch 'origin/rel-14.01' into laurent/OP-1187_allow_french_translations_in_future_releases
|
2014-01-21 20:37:18 +01:00 |
|
Philippe Renon
|
3ce504ac6e
|
OP-1182 tried to make device list combo box wide enough to display "USB: OPLinkMini" on all OSes
|
2014-01-21 02:42:11 +01:00 |
|
Philippe Renon
|
ff6c5e80a0
|
OP-1182 attempt at fixing telemetry monitor widget size too small on Mac
|
2014-01-21 02:40:15 +01:00 |
|
Fredrik Arvidsson
|
1537dc4187
|
OP-1166 Adde some more nice to have functionality to the channel configuration gui.
|
2014-01-21 00:49:46 +01:00 |
|
Fredrik Arvidsson
|
4cac7d18ac
|
OP-1166 Fixes the maxed out bug and beautifies some gui.
|
2014-01-21 00:06:20 +01:00 |
|
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 |
|
Alessio Morale
|
e55345223c
|
OP-1179 fix linux packages for missing .so that causes blank about box
|
2014-01-19 18:12:44 +01:00 |
|
Fredrik Arvidsson
|
9727456ec2
|
OP-1178 Fixed QLineEdit support. Rgression from Re-factoring.
|
2014-01-19 17:20:03 +01:00 |
|
Laurent Lalanne
|
faaf883a0b
|
Updated Feed Forward tuning page
|
2014-01-19 14:35:17 +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 |
|
Laurent Lalanne
|
2c3d6445b9
|
Anti-windup / advanced Camera stab updated
|
2014-01-19 13:34:36 +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 |
|
Laurent Lalanne
|
bd66d4b263
|
Update
|
2014-01-19 00:06:20 +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 |
|
Laurent Lalanne
|
4d6baf47f9
|
Updates, re-read and some problems inside source code are reported with a flag "Typo" in translator comments.
|
2014-01-18 17:51:38 +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 |
|
Alessio Morale
|
ab0406a6c8
|
OP-1150 UI for thermal calibration: Uncrustify
|
2014-01-18 13:48:41 +01:00 |
|
Alessio Morale
|
25f75f0b8e
|
OP-1150 UI for thermal calibration: add a completed state, some other fixes to FSM
|
2014-01-18 13:46:32 +01:00 |
|
Alessio Morale
|
3a5213ac9f
|
OP-1150 UI for thermal calibration: Calculation relative error checking
|
2014-01-18 13:46:05 +01:00 |
|
Alessio Morale
|
a82873f7ba
|
OP-1150 UI for thermal calibration: fix acquisition not stopping after exiting its state
|
2014-01-18 13:45:00 +01:00 |
|
Alessio Morale
|
ebb075fcfd
|
OP-1150 UI for thermal calibration: Add calibration calculation
|
2014-01-18 13:43:45 +01:00 |
|
Laurent Lalanne
|
ae679d5a04
|
Fixes in config.pro with original from next
|
2014-01-18 03:59:56 +01:00 |
|
Laurent Lalanne
|
0b27657dcf
|
Merge remote-tracking branch 'origin/next' into translations_next
|
2014-01-18 02:39:06 +01:00 |
|
Laurent Lalanne
|
94f29cdb10
|
Cruize Control text updated
|
2014-01-18 01:43:45 +01:00 |
|
Corvus Corax
|
91d5a865da
|
uncrustification
|
2014-01-18 00:32:50 +01:00 |
|
Laurent Lalanne
|
96555373e7
|
Merge remote-tracking branch 'origin/next' into translations_next
|
2014-01-18 00:03:13 +01:00 |
|
Laurent Lalanne
|
43703dd6d9
|
Updates about "Windup"
|
2014-01-18 00:02:00 +01:00 |
|
Alessio Morale
|
eef8bebf15
|
OP-1150 UI for thermal calibration: put everything inside OpenPilot namespaces
|
2014-01-17 18:58:35 +01:00 |
|
Alessio Morale
|
3f5af83d42
|
OP-1150 UI for thermal calibration: fix deadlock at end of acquisition, moved uavo disconnect at state exit to handle abort
|
2014-01-17 18:57:09 +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 |
|
Laurent Lalanne
|
a162d885a8
|
Accentuations missed in capital letters
|
2014-01-16 23:19:54 +01:00 |
|
Alessio Morale
|
847c3327eb
|
OP-1150 UI for thermal calibration: Samples acquisition and rough progressbar working
|
2014-01-16 23:09:08 +01:00 |
|
Cliff Geerdes
|
bfb5a248a0
|
OP-1154 enables for individual flight mode switch positions
|
2014-01-16 16:51:19 -05:00 |
|
Laurent Lalanne
|
e0098b8f54
|
Updated new strings in Next
|
2014-01-16 19:59:59 +01:00 |
|
Laurent Lalanne
|
8c4e45a893
|
Merge remote-tracking branch 'origin/next' into translations_next
|
2014-01-16 19:18:44 +01: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 |
|
Alessio Morale
|
0a43971dc1
|
OP-1150 UI for thermal calibration: Uncrustify
|
2014-01-13 02:35:41 +01:00 |
|
Alessio Morale
|
70e13b461f
|
OP-1150 UI for thermal calibration: Fix cut/paste incident
|
2014-01-13 02:31:36 +01:00 |
|
Alessio Morale
|
67d25a27ac
|
OP-1150 UI for thermal calibration: Add an instruction label to describe the current Status
|
2014-01-13 02:03:47 +01:00 |
|