add haptics, tune more
This commit is contained in:
Michael Zanetti
parent
44290e4146
commit
9d8b27e9c0
@ -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.";
|
||||
|
||||
@ -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);
|
||||
}
|
||||
|
||||
|
||||
@ -6,24 +6,23 @@
|
||||
.st0{fill:#808080;}
|
||||
</style>
|
||||
<title>settings</title>
|
||||
<path class="st0" d="M56.4,79.1c-1.5,0-3-0.3-4.4-0.9c-3.2-1.4-4.8-4.4-4.4-8.2c0.4-2.6,1.5-5.1,3.2-7.2c1.3-1.9,2.3-3.4,2.2-5.5
|
||||
c-1.5,0.8-3.2,1.2-4.9,1.2c-1.5,3.1-3.7,5.8-6.4,7.9c-2.6,2-11.7,7.8-20.7-0.5c-3.7-3.4-5.1-9.7-3.1-14.1c1.4-3.2,4.4-4.8,8.2-4.4
|
||||
c2.6,0.4,5.1,1.5,7.2,3.2c1.9,1.3,3.4,2.3,5.4,2.2c-0.8-1.5-1.2-3.2-1.2-4.9c-3.1-1.5-5.8-3.7-7.9-6.4c-2-2.6-7.8-11.7,0.5-20.7
|
||||
c3.4-3.7,9.7-5.1,14.1-3.1c3.2,1.4,4.8,4.4,4.4,8.2c-0.4,2.6-1.5,5.1-3.2,7.2c-1.3,1.9-2.3,3.4-2.2,5.5c1.9-1,4.1-1.4,6.3-1.1
|
||||
c1,0.1,1.6,1,1.5,2c-0.1,1-1,1.6-2,1.5l0,0c-1.5-0.2-3.1,0.1-4.4,0.9c-0.5,0.3-0.9,0.6-1.3,1c-0.7,0.7-1.8,0.6-2.5-0.1
|
||||
c-0.2-0.2-0.3-0.4-0.4-0.6c-0.2-0.6-0.4-1.2-0.5-1.8c-0.9-4.1,0.9-6.8,2.6-9.2c1.2-1.7,2.3-3.4,2.6-5.6c0.2-2.3-0.5-3.8-2.3-4.6
|
||||
c-3-1.3-7.7-0.3-10.1,2.3c-6.2,6.8-2.2,13.5-0.3,16.2c1.9,2.6,4.6,4.6,7.6,5.8c0.8,0.3,1.2,1.1,1.1,1.9c-0.2,1.5,0.1,3.1,0.9,4.4
|
||||
c0.3,0.5,0.6,0.9,1,1.3c0.7,0.7,0.6,1.8-0.1,2.5c-0.2,0.2-0.4,0.3-0.6,0.4c-0.6,0.2-1.2,0.4-1.8,0.5c-4.1,0.9-6.8-0.9-9.2-2.6
|
||||
c-1.7-1.2-3.4-2.3-5.6-2.6c-2.3-0.2-3.8,0.5-4.6,2.3c-1.3,3-0.3,7.7,2.3,10.1c6.8,6.2,13.6,2.2,16.2,0.3c2.6-1.9,4.6-4.6,5.8-7.6
|
||||
c0.3-0.8,1.1-1.2,1.9-1.1c1.5,0.2,3.1-0.1,4.4-0.9c0.5-0.3,0.9-0.6,1.3-1c0.7-0.7,1.8-0.6,2.5,0.1c0.2,0.2,0.3,0.4,0.4,0.6
|
||||
c0.2,0.6,0.4,1.2,0.5,1.8c0.9,4.1-0.9,6.8-2.6,9.1c-1.2,1.7-2.3,3.4-2.6,5.6c-0.2,2.3,0.5,3.8,2.3,4.6c3,1.3,7.7,0.3,10.1-2.3
|
||||
c6.2-6.8,2.2-13.6,0.3-16.2c-1.9-2.6-4.6-4.6-7.6-5.8c-0.8-0.3-1.2-1.1-1.1-1.9c0.2-1.5-0.1-3.1-0.9-4.4c-0.3-0.5-0.6-0.9-1-1.3
|
||||
c-0.7-0.7-0.6-1.8,0.1-2.5c0.2-0.2,0.4-0.3,0.6-0.4c0.6-0.2,1.2-0.4,1.8-0.5c4.1-0.9,6.8,0.9,9.1,2.6c1.7,1.2,3.4,2.3,5.6,2.6
|
||||
c2.3,0.2,3.8-0.5,4.6-2.3c1.3-3,0.3-7.7-2.3-10.1c-6.8-6.2-13.6-2.2-16.2-0.3c-1,0.8-1.9,1.7-2.8,2.6c-0.6,0.7-1.7,0.8-2.5,0.2
|
||||
c-0.7-0.6-0.8-1.7-0.2-2.5c1-1.1,2.1-2.2,3.3-3.1c2.6-2,11.7-7.8,20.7,0.5c3.7,3.4,5.1,9.7,3.1,14.1c-1.4,3.2-4.4,4.8-8.2,4.4
|
||||
c-2.6-0.4-5.1-1.5-7.2-3.2c-1.9-1.3-3.4-2.3-5.5-2.2c0.8,1.5,1.2,3.2,1.2,4.9c3.1,1.5,5.8,3.7,7.9,6.4c2,2.6,7.8,11.7-0.5,20.7
|
||||
C63.5,77.7,60,79.1,56.4,79.1z"/>
|
||||
<path class="st0" d="M48,89.8C24.9,89.8,6.2,71.1,6.2,48C6.2,24.9,24.9,6.2,48,6.2c23.1,0,41.8,18.7,41.8,41.8
|
||||
C89.8,71.1,71.1,89.8,48,89.8z M48,9.7C26.8,9.7,9.7,26.8,9.7,48S26.8,86.3,48,86.3S86.3,69.2,86.3,48c0,0,0,0,0,0
|
||||
C86.3,26.8,69.2,9.7,48,9.7z"/>
|
||||
<path class="st0" d="M30.1,75c-8.3-9-2.5-18.1-0.5-20.7c2.1-2.7,4.8-4.9,7.9-6.4c0-1.7,0.4-3.4,1.2-4.9c-2.1-0.1-3.6,0.9-5.5,2.2
|
||||
c-2.1,1.7-4.6,2.8-7.2,3.2c-3.8,0.4-6.8-1.2-8.2-4.4c-2-4.4-0.6-10.7,3.1-14.1c9-8.3,18.1-2.5,20.7-0.5c1.2,0.9,2.3,2,3.3,3.1
|
||||
c0.6,0.8,0.5,1.9-0.2,2.5c-0.8,0.6-1.9,0.5-2.5-0.2c-0.9-0.9-1.8-1.8-2.8-2.6c-2.6-1.9-9.4-5.9-16.2,0.3c-2.6,2.4-3.6,7.1-2.3,10.1
|
||||
c0.8,1.8,2.3,2.5,4.6,2.3c2.2-0.3,3.9-1.4,5.6-2.6c2.3-1.7,5-3.5,9.1-2.6c0.6,0.1,1.2,0.3,1.8,0.5c0.2,0.1,0.4,0.2,0.6,0.4
|
||||
c0.7,0.7,0.8,1.8,0.1,2.5c-0.4,0.4-0.7,0.8-1,1.3c-0.8,1.3-1.1,2.9-0.9,4.4c0.1,0.8-0.3,1.6-1.1,1.9c-3,1.2-5.7,3.2-7.6,5.8
|
||||
c-1.9,2.6-5.9,9.4,0.3,16.2c2.4,2.6,7.1,3.6,10.1,2.3c1.8-0.8,2.5-2.3,2.3-4.6c-0.3-2.2-1.4-3.9-2.6-5.6c-1.7-2.3-3.5-5-2.6-9.1
|
||||
c0.1-0.6,0.3-1.2,0.5-1.8c0.1-0.2,0.2-0.4,0.4-0.6c0.7-0.7,1.8-0.8,2.5-0.1c0.4,0.4,0.8,0.7,1.3,1c1.3,0.8,2.9,1.1,4.4,0.9
|
||||
c0.8-0.1,1.6,0.3,1.9,1.1c1.2,3,3.2,5.7,5.8,7.6c2.6,1.9,9.4,5.9,16.2-0.3c2.6-2.4,3.6-7.1,2.3-10.1c-0.8-1.8-2.3-2.5-4.6-2.3
|
||||
c-2.2,0.3-3.9,1.4-5.6,2.6c-2.4,1.7-5.1,3.5-9.2,2.6c-0.6-0.1-1.2-0.3-1.8-0.5c-0.2-0.1-0.4-0.2-0.6-0.4c-0.7-0.7-0.8-1.8-0.1-2.5
|
||||
c0.4-0.4,0.7-0.8,1-1.3c0.8-1.3,1.1-2.9,0.9-4.4c-0.1-0.8,0.3-1.6,1.1-1.9c3-1.2,5.7-3.2,7.6-5.8c1.9-2.7,5.9-9.4-0.3-16.2
|
||||
c-2.4-2.6-7.1-3.6-10.1-2.3c-1.8,0.8-2.5,2.3-2.3,4.6c0.3,2.2,1.4,3.9,2.6,5.6c1.7,2.4,3.5,5.1,2.6,9.2c-0.1,0.6-0.3,1.2-0.5,1.8
|
||||
c-0.1,0.2-0.2,0.4-0.4,0.6c-0.7,0.7-1.8,0.8-2.5,0.1c-0.4-0.4-0.8-0.7-1.3-1c-1.3-0.8-2.9-1.1-4.4-0.9l0,0c-1,0.1-1.9-0.5-2-1.5
|
||||
s0.5-1.9,1.5-2c2.2-0.3,4.4,0.1,6.3,1.1c0.1-2.1-0.9-3.6-2.2-5.5c-1.7-2.1-2.8-4.6-3.2-7.2c-0.4-3.8,1.2-6.8,4.4-8.2
|
||||
c4.4-2,10.7-0.6,14.1,3.1c8.3,9,2.5,18.1,0.5,20.7c-2.1,2.7-4.8,4.9-7.9,6.4c0,1.7-0.4,3.4-1.2,4.9c2,0.1,3.5-0.9,5.4-2.2
|
||||
c2.1-1.7,4.6-2.8,7.2-3.2c3.8-0.4,6.8,1.2,8.2,4.4c2,4.4,0.6,10.7-3.1,14.1c-9,8.3-18.1,2.5-20.7,0.5c-2.7-2.1-4.9-4.8-6.4-7.9
|
||||
c-1.7,0-3.4-0.4-4.9-1.2c-0.1,2.1,0.9,3.6,2.2,5.5c1.7,2.1,2.8,4.6,3.2,7.2c0.4,3.8-1.2,6.8-4.4,8.2c-1.4,0.6-2.9,0.9-4.4,0.9
|
||||
C36,79.1,32.5,77.7,30.1,75z"/>
|
||||
<path class="st0" d="M6.2,48C6.2,24.9,24.9,6.2,48,6.2S89.8,24.9,89.8,48S71.1,89.8,48,89.8S6.2,71.1,6.2,48z M9.7,48L9.7,48
|
||||
c0,21.2,17.1,38.3,38.3,38.3S86.3,69.2,86.3,48S69.2,9.7,48,9.7S9.7,26.8,9.7,48z"/>
|
||||
</svg>
|
||||
|
||||
|
Before Width: | Height: | Size: 2.6 KiB After Width: | Height: | Size: 2.6 KiB |
Reference in New Issue
Block a user