diff --git a/libnymea-app-core/connection/nymeaconnection.cpp b/libnymea-app-core/connection/nymeaconnection.cpp index a1db8ce5..8142ec09 100644 --- a/libnymea-app-core/connection/nymeaconnection.cpp +++ b/libnymea-app-core/connection/nymeaconnection.cpp @@ -137,7 +137,7 @@ Connection *NymeaConnection::currentConnection() const void NymeaConnection::sendData(const QByteArray &data) { if (connected()) { - qDebug() << "sending data:" << data; +// qDebug() << "sending data:" << data; m_currentTransport->sendData(data); } else { qWarning() << "Connection: Not connected. Cannot send."; diff --git a/nymea-app/ui/experiences/heating/Main.qml b/nymea-app/ui/experiences/heating/Main.qml index 3be533c8..200dd5d2 100644 --- a/nymea-app/ui/experiences/heating/Main.qml +++ b/nymea-app/ui/experiences/heating/Main.qml @@ -72,8 +72,8 @@ Item { function setTargetTemp(targetTemp) { // We don't want to spam with set value calls so we're going to queue them up and only send one at a time + d.queuedTargetTemp = targetTemp; if (d.pendingCallId != -1) { - d.queuedTargetTemp = targetTemp; d.setTempPending = true; return; } @@ -123,6 +123,7 @@ Item { width: parent.width - app.margins * 2 text: qsTr("There is no drexel und weiss heating system set up yet.") imageSource: "qrc:/ui/images/radiator.svg" + buttonVisible: false buttonText: qsTr("Set up now") visible: duwWpFilterModel.count === 0 && !engine.deviceManager.fetchingData } @@ -238,8 +239,8 @@ Item { duration: root.ventilationLevelState !== null && root.ventilationLevelState.value > 0 ? 2000 / root.ventilationLevelState.value : 0 - from: 360 - to: 0 + from: 0 + to: 360 loops: Animation.Infinite onDurationChanged: { running = false; @@ -373,15 +374,19 @@ Item { MouseArea { anchors.fill: parent + preventStealing: true property real startAnglePress property real startAngleDial property real startTemp + property real lastValue + onPressed: { startAnglePress = calculateAngle(mouseX, mouseY) startAngleDial = innerRadius.rotation startTemp = root.targetTemperatureState.value + lastValue = startTemp print("angle:", calculateAngle(mouseX, mouseY)) } @@ -395,7 +400,13 @@ Item { innerRadius.rotation = startAngleDial + angleDiff - print("new degree value", newTemp) + if (lastValue.toFixed(1) === newTemp.toFixed(1)) { + return; + } + lastValue = newTemp + + print("degree value changed", newTemp, lastValue) + PlatformHelper.vibrate(PlatformHelper.HapticsFeedbackSelection) root.setTargetTemp(newTemp); } diff --git a/nymea-app/ui/images/ventilation.svg b/nymea-app/ui/images/ventilation.svg index d6740d1c..ee42d644 100644 --- a/nymea-app/ui/images/ventilation.svg +++ b/nymea-app/ui/images/ventilation.svg @@ -6,24 +6,23 @@ .st0{fill:#808080;}