Corvus Corax
2f2cff3dc6
uncrustification
2013-12-07 15:25:15 +01:00
Corvus Corax
e8150399f6
Merge branch 'corvuscorax/onboardlogging' into next OP-56 OPReview-586 OPReview-587 OPReview-585
2013-12-07 15:21:10 +01:00
Fredrik Arvidsson
a68c4da62d
Disable dragging of icons in the configuration plugin.
2013-12-06 18:46:58 +01:00
Philippe Renon
4f9231e247
OP-1122 OP-1125 fixed regression in flight side uavtalk introduced in a recent commit
2013-12-04 20:54:07 +01:00
Fredrik Arvidsson
07c7faa144
Merge remote-tracking branch 'origin/shared/OP-1109_qtquick2' into next
...
Conflicts:
artwork/PFD/pfd.svg
2013-12-03 22:47:12 +01:00
Fredrik Arvidsson
fbea95e817
OP-1063 Fixed text
2013-12-03 22:03:32 +01:00
Fredrik Arvidsson
336510c3e6
OP-771 Added some descriptive text.
...
OP-1059 Fixed typos.
2013-12-03 20:48:40 +01:00
Philippe Renon
035c8afcba
OP-963 minor UI tweak to the status bar icon tray margins
2013-12-02 23:51:01 +01:00
Philippe Renon
b627b71d0e
uncrustification
2013-12-02 23:49:03 +01:00
Philippe Renon
37dab0e4fc
Merge remote-tracking branch 'origin/next' into filnet/telemetry
...
Conflicts:
ground/openpilotgcs/src/plugins/coreplugin/connectionmanager.cpp
ground/openpilotgcs/src/plugins/coreplugin/mainwindow.cpp
ground/openpilotgcs/src/plugins/coreplugin/telemetrymonitorwidget.cpp
ground/openpilotgcs/src/plugins/coreplugin/workspacesettings.cpp
ground/openpilotgcs/src/plugins/uavtalk/telemetrymonitor.cpp
2013-12-02 22:54:00 +01:00
Philippe Renon
56c404e778
OP-1132 added new openssl-install that downloads and install the required SSL libraries for Windows
...
the missing SSLEAY32.DLL and LIBEAY32.DLL are copied to GCS bin dir
OpenSSL version 1.0.1e was downloaded from http://slproweb.com/products/Win32OpenSSL.html
2013-12-01 23:17:48 +01:00
Philippe Renon
ab89d6a491
OP-1122 OP-1125 fixed defect raised in OPReview-593 : two occurences of connection->respObj clearing were removed when they should not have been removed
2013-12-01 21:44:14 +01:00
Fredrik Arvidsson
2d3683d511
OP-1119 Added option to base log flight time on the time when log started, not when the board was booted.
2013-12-01 21:22:58 +01:00
Philippe Renon
f2115e270f
OP-1122 OP-1133 UAVTalk.cpp - fixed stupid compilation error...
2013-12-01 19:42:41 +01:00
Philippe Renon
398a3ab0e6
OP-112 OP-1120 waypoint editor now sends and requests Waypoints and PathActions in a transacted and asynchronous manner. Board does not send Waypoints and PathActions periodically anymore.
2013-12-01 19:38:23 +01:00
Philippe Renon
0dc334adea
OP-1122 OP-1133 exposed send/request all instances of multi instance uav objects and made related uavtalk fixes
2013-12-01 19:25:44 +01:00
Fredrik Arvidsson
2fce485e26
Merge remote-tracking branch 'origin/patrickh/OP-1118_QComboBox_Focus_issue' into next
2013-12-01 10:39:41 +01:00
Corvus Corax
9c6abef89b
fixed enabled and disabled messages for logging in all cases
2013-12-01 00:03:24 +01:00
Fredrik Arvidsson
f37f6540a9
Merge remote-tracking branch 'origin/corvuscorax/onboardlogging' into thread/OP-1119_Flight_Side_Logs_Plugin
2013-11-30 23:37:52 +01:00
Fredrik Arvidsson
38f7d9b28e
OP-1119 Minor fixes
2013-11-30 16:54:18 +01:00
Fredrik Arvidsson
74ad0fd40a
OP-1119 Added cancel functionality on download. Added soem more gui update logic.
2013-11-30 13:02:52 +01:00
Fredrik Arvidsson
a3c555f8bb
OP-1119 Fixed support for saving multiple flights when saving logs to .opl format.
2013-11-30 11:44:55 +01:00
Philippe Renon
a6d0f09d21
OP-1122 OP-1125 minor change to uavobject::toStringBrief() method
2013-11-29 19:40:10 +01:00
Philippe Renon
cb902900de
OP-1122 OP-1125 uavtalk - fixed minor typos
2013-11-29 09:23:27 +01:00
Philippe Renon
1a25e87fde
OP-1122 removed debug spurious debug logging when using waypoint editor + fixed compilation warnings
2013-11-29 09:14:29 +01:00
Philippe Renon
390c88b92a
OP-1122 OP-1125 uavtalk - object request messages are now acked only by object messages and acked object messages are acked only by ack messages
2013-11-29 02:51:46 +01:00
Philippe Renon
15c4392ed5
OP-1122 OP-1125 uavtalk - more OPReview-593 related cleanups
2013-11-29 01:21:45 +01:00
Philippe Renon
50a0a4f512
OP-1122 OP-1125 uavtalk - minor OPReview-593 related cleanups
2013-11-28 23:42:08 +01:00
Philippe Renon
2f0974fda9
OP-1122 OP-1125 uavtalk - fixed a number of issues concerning acked multi instance messages :
...
- all messages now systematically include an instance ID (fixes parsing of messages containing unknown object)
- added missing NACK of object request on fight side
- added more logging and warnings
- misc fixes and cleanups
this commit affects both the firmware and GCS (need to flash new version of firmware)
2013-11-28 01:14:29 +01:00
m_thread
d14044431e
OP-1119 WIP export of logs to .opl file
2013-11-27 16:07:34 +01:00
m_thread
81443570ab
OP-1119 Moved class LogFile from Logging plugin to libs/utils
2013-11-27 16:07:15 +01:00
m_thread
bc9bbebfdf
OP-1119 Starting to implement the export functionality. Aiming to do it so it is compatible with the standard .opl file format and replayable in the logging plugin.
2013-11-26 23:45:38 +01:00
m_thread
144b2c587d
OP-1119 Added real-time updates of the flights combobox. Added some cleanup code.
2013-11-26 22:52:24 +01:00
m_thread
7bb127445d
OP-1119 Added some progress indication with cursors and disabling of controls during operation.
2013-11-26 17:00:01 +01:00
m_thread
5738a87141
OP-1119 Added code to format log flash on flight controller
2013-11-26 16:22:44 +01:00
m_thread
8054cd5296
OP-1119 Code cleanup and more uncrustification
2013-11-26 16:06:12 +01:00
m_thread
a11d98aa0d
OP-1119 Uncrustify
2013-11-26 15:42:49 +01:00
m_thread
3f3245b749
OP-1119 Added some mem management improvements
2013-11-26 15:25:27 +01:00
Fredrik Arvidsson
79c13b55c5
Merge remote-tracking branch 'origin/corvuscorax/onboardlogging' into thread/OP-1119_Flight_Side_Logs_Plugin
...
Conflicts:
flight/modules/Logging/Logging.c
flight/pios/common/pios_debuglog.c
2013-11-26 07:24:07 +01:00
Corvus Corax
25fd3d5740
Just uncrustification
2013-11-26 00:43:02 +01:00
Fredrik Arvidsson
2fc34910e0
OP-1119 Fix in pios function for debuglogging uavo.
2013-11-26 00:36:59 +01:00
Corvus Corax
be9faabe92
Merge branch 'next' into corvuscorax/onboardlogging
2013-11-26 00:34:01 +01:00
m_thread
daf589d9ce
OP-1119 Added Functions.js to host functions needed in qml.
...
Added de-serialization of UAVDataObjects in table.
Started to clean up memory management tasks in code.
2013-11-25 17:58:29 +01:00
m_thread
00d710a324
OP-1119 Downloading from firmware now works. Added columns for log data and some table formatting quirks.
2013-11-25 14:59:23 +01:00
m_thread
0a085ce106
OP-1119 Added logging event for disabling logging.
2013-11-25 14:58:08 +01:00
m_thread
06924d335a
Merge remote-tracking branch 'origin/next' into thread/OP-1119_Flight_Side_Logs_Plugin
2013-11-25 09:29:45 +01:00
Kevin Finisterre
0d5e91ee26
I fixed the first screen, now the vtail and aileron models show when slected. For some reason I am unable to move beyond the first wizard screen.
2013-11-25 01:06:07 -05:00
Alessio Morale
bacc4d3d79
Merge branch 'master' into next
...
Conflicts:
flight/targets/boards/oplinkmini/firmware/pios_board.c
ground/openpilotgcs/copydata.pro
2013-11-25 01:12:10 +01:00
Kevin Finisterre
92c19f2d74
Changed the element id's in one of the SVG files that I incorrectly edited. This prevents the error:
...
Could not resolve property : SVGID_1_
Error comes from qsvghandler.cpp or qsvgstyle.cpp in the QT libraries Qt5.2.0//5.2.0-beta1/Src/qtsvg/src/svg/
The fixedwing-shapes.svg and flyingwing-shapes.svg files need modified to prevent the errors caused by qsvgtinydocument.cpp in the QT libraries.
Couldn't find node aileron. Skipping rendering.
Couldn't find node vtail. Skipping rendering.
These errors come from the case statement that was added to updateImageAnd Description() for FixedWingPage
+ switch (type) {
+ case SetupWizard::FIXED_WING_AILERON:
+ elementId = "aileron";
+ break;
+ case SetupWizard::FIXED_WING_VTAIL:
+ elementId = "vtail";
+ break;
+ default:
+ elementId = "";
+ break;
+ }
A similar error needs to be resolved in connectiondiagram.cpp
+ switch (m_configSource->getVehicleSubType()) {
+ case VehicleConfigurationSource::FIXED_WING_AILERON:
+ elementsToShow << "aileron";
+ break;
+ case VehicleConfigurationSource::FIXED_WING_VTAIL:
+ elementsToShow << "vtail";
+ break;
+ default:
+ break;
+ }
Likewise outputcalibrationpage.cpp will need to reverence the elements inside the SVG file properly.
+ m_vehicleElementIds << "fixed-aileron" << "aileron";
+ m_vehicleHighlightElementIndexes << 0 << 1;
...
+ m_vehicleElementIds << "fixed-vtail" << "vtail";
+ m_vehicleHighlightElementIndexes << 0 << 1;
Until these elements are fixed in the SVG files the wizard will not render properly and allow the user to click *next*.
2013-11-24 17:29:38 -05:00
Fredrik Arvidsson
d41f99aca8
OP-1119 Bug fixin
2013-11-24 21:47:57 +01:00