ScStw/shared-libraries
ScStw/shared-libraries
Archived
2
0
Fork 0
Code Issues 5 Pull requests Projects Releases Packages Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse source
This commit is contained in:
Dorian Zedler 2020-06-14 17:57:03 +02:00
commit eb1328642d
Signed by: dorian
GPG key ID: 989DE36109AFA354
13 changed files with 5 additions and 35 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Qt-Secret/src/.gitignore vendored Normal file
View file

@ -0,0 +1 @@
/build/

1
Qt-Secret/src/build/debug/.gitignore vendored
View file

@ -1 +0,0 @@
/libQt-Secret.so.1.2.0

1
Qt-Secret/src/build/debug/libQt-Secret.so
View file

@ -1 +0,0 @@
libQt-Secret.so.1.2.0

1
Qt-Secret/src/build/debug/libQt-Secret.so.1
View file

@ -1 +0,0 @@
libQt-Secret.so.1.2.0

1
Qt-Secret/src/build/debug/libQt-Secret.so.1.2
View file

@ -1 +0,0 @@
libQt-Secret.so.1.2.0

1
Qt-Secret/src/build/release/libQt-Secret.so
View file

@ -1 +0,0 @@
libQt-Secret.so.1.2.0

1
Qt-Secret/src/build/release/libQt-Secret.so.1
View file

@ -1 +0,0 @@
libQt-Secret.so.1.2.0

1
Qt-Secret/src/build/release/libQt-Secret.so.1.2
View file

@ -1 +0,0 @@
libQt-Secret.so.1.2.0

BIN
Qt-Secret/src/build/release/libQt-Secret.so.1.2.0
View file

Binary file not shown.

10
ScStwLibraries/headers/scstwclient.h
View file

@ -131,15 +131,7 @@ public slots:
*/
QVariantMap sendCommand(int header, QJsonValue data = "", int timeout = 3000);
/*! updater functions */
/*!
* \brief Function to check wether the firmware of the base station is up-to-date
* \see getFirmwareVersion()
* \see updateFirmware()
* \return true or false
*/
bool isFirmwareUpToDate();
/*! helper functions */
/*!
* \brief Function to write a setting on the base station

1
ScStwLibraries/resources/ScStwBasestation.sb64
View file

File diff suppressed because one or more lines are too long

1
ScStwLibraries/resources/ScStwLibrariesShared.qrc
View file

@ -1,6 +1,5 @@
<RCC>
<qresource prefix="/">
<file>ScStwBasestation.sb64</file>
<file>sound/AtYourMarksSound.wav</file>
<file>sound/IFSC frequenzy and duration conform false start sound.wav</file>
<file>sound/ReadySound.wav</file>

20
ScStwLibraries/sources/scstwclient.cpp
View file

@ -106,7 +106,7 @@ bool ScStwClient::init() {
this->firmwareVersion = initResponse["data"].toMap()["firmwareVersion"].toString();
this->timeOffset = initResponse["data"].toMap()["time"].toDouble() - this->date->currentMSecsSinceEpoch();
qDebug() << "[INFO][BaseStation] Init done! firmware: version: " << this->firmwareVersion << " up-to-date: " << this->isFirmwareUpToDate() << " time offset: " << this->timeOffset;
qDebug() << "[INFO][BaseStation] Init done! firmware: " << this->firmwareVersion << " time offset: " << this->timeOffset;
this->setState(CONNECTED);
return true;
@ -188,6 +188,8 @@ QVariantMap ScStwClient::sendCommand(int header, QJsonValue data, int timeout, b
//wait for an answer to finish (programm gets stuck in here)
loop->exec();
bool replyFound = false;
// find reply and delete the request from waiting list
@ -386,22 +388,6 @@ void ScStwClient::handleSignal(QVariantMap data) {
emit this->gotSignal(signalKey, data["data"]);
}
// -------------------------
// --- updater functions ---
// -------------------------
bool ScStwClient::isFirmwareUpToDate() {
QString file = ":/ScStwBasestation.sb64";
QFile f(file);
if (!f.open(QFile::ReadOnly)) return false;
QString fileContents = f.readAll();
QString newFirmwareVersion = fileContents.split("<VER>")[1].split("</VER>")[0];
QString currentFirmwareVersion = this->firmwareVersion;
return ScStw::firmwareCompare(newFirmwareVersion, currentFirmwareVersion) <= 0;
}
// ------------------------
// --- helper functions ---
// ------------------------