Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
66a6ea6297
7 changed files with 3 additions and 4 deletions
|
@ -141,7 +141,7 @@ public slots:
|
|||
* \brief Function to pair all extensions that are currently connected via USB to the base station
|
||||
* \return whether the pairing was successfull
|
||||
*/
|
||||
bool pairConnectedUsbExtensions();
|
||||
int pairConnectedUsbExtensions();
|
||||
|
||||
/*!
|
||||
* \brief Function to write a setting on the base station
|
||||
|
|
|
@ -409,10 +409,9 @@ bool ScStwClient::isFirmwareUpToDate() {
|
|||
// --- helper functions ---
|
||||
// ------------------------
|
||||
|
||||
bool ScStwClient::pairConnectedUsbExtensions() {
|
||||
int ScStwClient::pairConnectedUsbExtensions() {
|
||||
QVariantMap ret = this->sendCommand(5002, "", 10000);
|
||||
qDebug() << ret;
|
||||
return ScStw::StatusCode(ret["status"].toInt()) == ScStw::Success;
|
||||
return ret["status"].toInt();
|
||||
}
|
||||
|
||||
ScStw::StatusCode ScStwClient::writeRemoteSetting(ScStw::BaseStationSetting key, QString value) {
|
||||
|
|
Binary file not shown.
BIN
docs/favicon.png
BIN
docs/favicon.png
Binary file not shown.
Before Width: | Height: | Size: 37 KiB After Width: | Height: | Size: 44 KiB |
BIN
favicon.png
Normal file
BIN
favicon.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 44 KiB |
BIN
favicon.xcf
Normal file
BIN
favicon.xcf
Normal file
Binary file not shown.
BIN
faviconNoOutline.png
Normal file
BIN
faviconNoOutline.png
Normal file
Binary file not shown.
After Width: | Height: | Size: 27 KiB |
Reference in a new issue