From c358c448b6eda1d4f6f2381986527c7c2f886e09 Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Wed, 23 Dec 2020 16:34:44 +0100 Subject: [PATCH 1/2] Don't allow disconnecting when we're connected by command line --- nymea-app/ui/MainMenu.qml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/nymea-app/ui/MainMenu.qml b/nymea-app/ui/MainMenu.qml index fba2901a..a4322fe9 100644 --- a/nymea-app/ui/MainMenu.qml +++ b/nymea-app/ui/MainMenu.qml @@ -61,6 +61,8 @@ Drawer { ProgressButton { longpressEnabled: false imageSource: "../images/close.svg" + // When we're connected via command line arg, don't allow disconnecting + visible: autoConnectHost.length === 0 onClicked: { root.currentEngine.jsonRpcClient.disconnectFromHost(); root.close(); From 5b83b5b6c902f5d85ad1aea7dd4b3794e54ecc2e Mon Sep 17 00:00:00 2001 From: Michael Zanetti Date: Wed, 23 Dec 2020 16:52:38 +0100 Subject: [PATCH 2/2] Fix max brightness for screen display brightness --- .../platformintegration/generic/screenhelper.cpp | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/nymea-app/platformintegration/generic/screenhelper.cpp b/nymea-app/platformintegration/generic/screenhelper.cpp index 9d535ba5..383160c8 100644 --- a/nymea-app/platformintegration/generic/screenhelper.cpp +++ b/nymea-app/platformintegration/generic/screenhelper.cpp @@ -59,7 +59,7 @@ ScreenHelper::ScreenHelper(QObject *parent) : QObject(parent) continue; } bool ok; - m_maxBrightness = maxBrightnessFile.readAll().toInt(&ok); + m_maxBrightness = maxBrightnessFile.readLine().trimmed().toInt(&ok); if (!ok) { qWarning() << "Error reading max brightness value from" << maxBrightnessFile.fileName(); m_maxBrightness = -1; @@ -75,9 +75,10 @@ ScreenHelper::ScreenHelper(QObject *parent) : QObject(parent) } qDebug() << "Backlight control enabled on" << m_powerFile.fileName(); - QByteArray currentBrightness = m_brightnessFile.readLine(); - m_currentBrightness = currentBrightness.trimmed().toInt() * 100 / m_maxBrightness; - qDebug() << "Current brightness is: Absolute:" << currentBrightness << "Percentage:" << m_currentBrightness; + bool ok; + int currentBrightness = m_brightnessFile.readLine().trimmed().toInt(&ok); + m_currentBrightness = currentBrightness * 100 / m_maxBrightness; + qDebug().nospace() << "Brigness: Absolute: " << currentBrightness << "/" << m_maxBrightness << " Percentage:" << m_currentBrightness; screenOn(); @@ -128,7 +129,7 @@ int ScreenHelper::screenBrightness() const void ScreenHelper::setScreenBrightness(int percent) { m_currentBrightness = percent; - m_brightnessFile.write(QString("%1\n").arg(percent * 255 / 100).toUtf8()); + m_brightnessFile.write(QString("%1\n").arg(percent * m_maxBrightness / 100).toUtf8()); m_brightnessFile.flush(); }