improved dimmer switch behaviour
This commit is contained in:
parent
12503a677d
commit
79286bb6a0
@ -28,7 +28,7 @@ void DimmerSwitch::setPower(const bool power)
|
|||||||
|
|
||||||
m_power = power;
|
m_power = power;
|
||||||
if(power){
|
if(power){
|
||||||
m_dimmerTimer->start(150);
|
m_dimmerTimer->start(250);
|
||||||
m_longPressedTimer->start(2000);
|
m_longPressedTimer->start(2000);
|
||||||
|
|
||||||
if (m_doublePressedTimer->isActive()) {
|
if (m_doublePressedTimer->isActive()) {
|
||||||
@ -63,20 +63,23 @@ int DimmerSwitch::getDimValue()
|
|||||||
|
|
||||||
void DimmerSwitch::onDimmerTimeout()
|
void DimmerSwitch::onDimmerTimeout()
|
||||||
{
|
{
|
||||||
if (m_countingUp) {
|
if(!m_longPressedTimer->isActive()) {
|
||||||
m_dimValue += 3;
|
if (m_countingUp) {
|
||||||
if(m_dimValue >= 100) {
|
m_dimValue += 5;
|
||||||
m_dimValue = 100;
|
if(m_dimValue >= 100) {
|
||||||
m_countingUp = false;
|
m_dimValue = 100;
|
||||||
}
|
m_countingUp = false;
|
||||||
} else {
|
}
|
||||||
m_dimValue -= 3;
|
} else {
|
||||||
if(m_dimValue <= 0) {
|
m_dimValue -= 5;
|
||||||
m_dimValue = 0;
|
if(m_dimValue <= 0) {
|
||||||
m_countingUp = true;
|
m_dimValue = 0;
|
||||||
|
m_countingUp = true;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
emit dimValueChanged(m_dimValue);
|
||||||
}
|
}
|
||||||
emit dimValueChanged(m_dimValue);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
void DimmerSwitch::onLongPressedTimeout()
|
void DimmerSwitch::onLongPressedTimeout()
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user