diff --git a/ground/src/libs/extensionsystem/plugindetailsview.ui b/ground/src/libs/extensionsystem/plugindetailsview.ui index 10d6e987f..0e7a02d1e 100644 --- a/ground/src/libs/extensionsystem/plugindetailsview.ui +++ b/ground/src/libs/extensionsystem/plugindetailsview.ui @@ -1,224 +1,224 @@ - - - ExtensionSystem::Internal::PluginDetailsView - - - - 0 - 0 - 674 - 505 - - - - - 2 - - - - - Name: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - Version: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - Compatibility Version: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - Vendor: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - Url: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - true - - - - - - - Location: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - false - - - - - - - - - Description: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - true - - - true - - - - - - - Copyright: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - - - - - - License: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Qt::Vertical - - - - 17 - 13 - - - - - - - - - - true - - - true - - - - - - - - - Dependencies: - - - Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter - - - - - - - Qt::Vertical - - - - 20 - 40 - - - - - - - - - - - - - - + + + ExtensionSystem::Internal::PluginDetailsView + + + + 0 + 0 + 674 + 505 + + + + + 2 + + + + + Name: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + Version: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + Compatibility Version: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + Developer: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + Url: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + true + + + + + + + Location: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + false + + + + + + + + + Description: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + true + + + true + + + + + + + Copyright: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + + + + + + License: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Qt::Vertical + + + + 17 + 13 + + + + + + + + + + true + + + true + + + + + + + + + Dependencies: + + + Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + + + diff --git a/ground/src/libs/extensionsystem/pluginview.ui b/ground/src/libs/extensionsystem/pluginview.ui index a995bbe8e..1ba739541 100644 --- a/ground/src/libs/extensionsystem/pluginview.ui +++ b/ground/src/libs/extensionsystem/pluginview.ui @@ -1,71 +1,71 @@ - - - ExtensionSystem::Internal::PluginView - - - - 0 - 0 - 773 - 304 - - - - - 2 - - - - - true - - - 0 - - - false - - - true - - - false - - - true - - - 5 - - - - State - - - - - Name - - - - - Version - - - - - Vendor - - - - - Location - - - - - - - - - + + + ExtensionSystem::Internal::PluginView + + + + 0 + 0 + 773 + 304 + + + + + 2 + + + + + true + + + 0 + + + false + + + true + + + false + + + true + + + 5 + + + + State + + + + + Name + + + + + Version + + + + + Developer + + + + + Location + + + + + + + + + diff --git a/ground/src/libs/qymodem/src/qymodem_tx.cpp b/ground/src/libs/qymodem/src/qymodem_tx.cpp index d8383d662..80f9f3ad0 100644 --- a/ground/src/libs/qymodem/src/qymodem_tx.cpp +++ b/ground/src/libs/qymodem/src/qymodem_tx.cpp @@ -79,7 +79,7 @@ int QymodemTx::SendInitialise(unsigned timeout) int c; for(;;) { - const unsigned timeoutStep = 1000; + const unsigned timeoutStep = 100; c = InChar(timeoutStep); if(c=='G') { diff --git a/ground/src/libs/qymodem/src/qymodemsend.cpp b/ground/src/libs/qymodem/src/qymodemsend.cpp index 53803b794..54c9ff9aa 100644 --- a/ground/src/libs/qymodem/src/qymodemsend.cpp +++ b/ground/src/libs/qymodem/src/qymodemsend.cpp @@ -160,7 +160,7 @@ int QymodemSend::SendFile(QString filename) emit Error("File not found",QymodemSend::ErrorFileNotFound); return QymodemSend::ErrorFileNotFound; } - if(!Port.open(QIODevice::ReadWrite)) + if(!Port.open(_DEVICE_SET_)) { emit Error("Could not open port",QymodemSend::ErrorCoulNotOpenPort); return QymodemSend::ErrorCoulNotOpenPort; @@ -194,7 +194,7 @@ void QymodemSend::run() emit Error("File not found",QymodemSend::ErrorFileNotFound); return; } - if(!Port.open(QIODevice::ReadWrite)) + if(!Port.open(_DEVICE_SET_)) { emit Error("Could not open port",QymodemSend::ErrorCoulNotOpenPort); return; diff --git a/ground/src/libs/qymodem/src/qymodemsend.h b/ground/src/libs/qymodem/src/qymodemsend.h index 7e2bb3a8c..237d1ed20 100644 --- a/ground/src/libs/qymodem/src/qymodemsend.h +++ b/ground/src/libs/qymodem/src/qymodemsend.h @@ -20,6 +20,11 @@ #include #include +#ifdef Q_OS_WIN +#define _DEVICE_SET_ QIODevice::ReadWrite|QIODevice::Unbuffered +#else +#define _DEVICE_SET_ QIODevice::ReadWrite +#endif class QymodemSend:public QymodemTx {