Skip to content

Commit

Permalink
Update rest_lights.cpp
Browse files Browse the repository at this point in the history 
Support setting `state.bri` for `lumi.curtain.hagl04`(Xiaomi Aqara curtain motor B1) by writing _Present Value_ in the _Analogue Output_ cluster.  See #1654.
  • Loading branch information
@ebaauw
ebaauw committed Mar 6, 2020
1 parent 241bad6 commit dbc214a
Showing 1 changed file with 90 additions and 50 deletions.
140 changes: 90 additions & 50 deletions rest_lights.cpp
View file
Original file line number Diff line number Diff line change
Expand Up @@ -574,11 +574,7 @@ int DeRestPluginPrivate::setLightState(const ApiRequest &req, ApiResponse &rsp)
}

// FIXME temporary workaround to support window_covering
bool isWindowCoveringDevice = false;
if (taskRef.lightNode->type() == QLatin1String("Window covering device"))
{
isWindowCoveringDevice = true;
}
bool isWindowCoveringDevice = taskRef.lightNode->type() == QLatin1String("Window covering device");

// on/off
if (hasOn)
Expand All @@ -598,6 +594,7 @@ int DeRestPluginPrivate::setLightState(const ApiRequest &req, ApiResponse &rsp)
TaskItem task;
copyTaskReq(taskRef, task);
//FIXME workaround window_convering
// FIXME handle lumi.curtain.hagl04
if (isWindowCoveringDevice
&& addTaskWindowCovering(task, isOn ? 0x01 /*down*/ : 0x00 /*up*/, 0, 0))
{
Expand Down Expand Up @@ -682,60 +679,103 @@ int DeRestPluginPrivate::setLightState(const ApiRequest &req, ApiResponse &rsp)
//FIXME workaround window_covering
if (isWindowCoveringDevice)
{
if ((map["bri"].type() == QVariant::String) && map["bri"].toString() == "stop")
{
TaskItem task;
copyTaskReq(taskRef, task);
if (addTaskWindowCovering(task, 0x02 /*stop motion*/, 0, 0))
{
QVariantMap rspItem;
QVariantMap rspItemState;
rspItemState[QString("/groups/%1/action/bri").arg(id)] = map["bri"];
rspItem["success"] = rspItemState;
rsp.list.append(rspItem);
taskToLocalData(task);
}
else
{
rsp.list.append(errorToMap(ERR_INTERNAL_ERROR, QString("/lights/%1").arg(id), QString("Internal error, %1").arg(ERR_BRIDGE_BUSY)));
}
}
else if (ok && (map["bri"].type() == QVariant::Double) && (bri < 256))
{
TaskItem task;
copyTaskReq(taskRef, task);
uint8_t moveToPct = 0x00;
moveToPct = bri * 100 / 254; // Percent 0 - 100 (0x00 - 0x64)
if ((map["bri"].type() == QVariant::String) && map["bri"].toString() == "stop")
{
TaskItem task;
copyTaskReq(taskRef, task);
if (addTaskWindowCovering(task, 0x02 /*stop motion*/, 0, 0))
{
QVariantMap rspItem;
QVariantMap rspItemState;
rspItemState[QString("/groups/%1/action/bri").arg(id)] = map["bri"];
rspItem["success"] = rspItemState;
rsp.list.append(rspItem);
taskToLocalData(task);
}
else
{
rsp.list.append(errorToMap(ERR_INTERNAL_ERROR, QString("/lights/%1").arg(id), QString("Internal error, %1").arg(ERR_BRIDGE_BUSY)));
}
}
else if (ok && (map["bri"].type() == QVariant::Double) && (bri < 256))
{
bool ok = false;
TaskItem task;
copyTaskReq(taskRef, task);
uint8_t moveToPct = 0x00;
moveToPct = bri * 100 / 254; // Percent 0 - 100 (0x00 - 0x64)
if (taskRef.lightNode->modelId().startsWith(QLatin1String("lumi.curtain")) )
{
moveToPct = 100 - moveToPct;
}
//Legrand invert bri and don't support other value than 0
if (taskRef.lightNode->modelId() == QLatin1String("Shutter switch with neutral"))
{
if (bri == 0)
{
moveToPct = 254;
// Legrand invert bri and don't support other value than 0
moveToPct = (bri == 0) ? 254 : 0;
}
if (taskRef.lightNode->modelId().startsWith(QLatin1String("lumi.curtain"))) // FIXME - used for testing.
// if (taskRef.lightNode->modelId().startsWith(QLatin1String("lumi.curtain.hagl04")))
{
float value = moveToPct;
TaskItem task;
copyTaskReq(taskRef, task);

// FIXME: The following low-level code is needed because ZclAttribute is broken for ZclSingleFloat.

task.taskType = TaskWriteAttribute;

task.req.setClusterId(ANALOG_OUTPUT_CLUSTER_ID);
task.req.setProfileId(HA_PROFILE_ID);
task.zclFrame.setSequenceNumber(zclSeq++);
task.zclFrame.setCommandId(deCONZ::ZclWriteAttributesId);
task.zclFrame.setFrameControl(deCONZ::ZclFCProfileCommand |
deCONZ::ZclFCDirectionClientToServer |
deCONZ::ZclFCDisableDefaultResponse);

DBG_Printf(DBG_INFO, "write attribute of 0x%016llX ep: 0x%02X cluster: 0x%04X: 0x%04X\n", taskRef.lightNode->address().ext(), taskRef.lightNode->haEndpoint().endpoint(), ANALOG_OUTPUT_CLUSTER_ID, 0x0055);

{ // payload
QDataStream stream(&task.zclFrame.payload(), QIODevice::WriteOnly);
stream.setByteOrder(QDataStream::LittleEndian);
stream.setFloatingPointPrecision(QDataStream::SinglePrecision);

stream << (quint16) 0x0055;
stream << (quint8) deCONZ::ZclSingleFloat;
stream << value;
}
else
{
moveToPct = 0;

{ // ZCL frame
QDataStream stream(&task.req.asdu(), QIODevice::WriteOnly);
stream.setByteOrder(QDataStream::LittleEndian);
task.zclFrame.writeToStream(stream);
}

ok = addTask(task);

// FIXME: Use following code once ZclAttribute has been fixed.

// deCONZ::ZclAttribute attr(0x0055, deCONZ::ZclSingleFloat, "value", deCONZ::ZclReadWrite, true);
// attr.setValue(QVariant(value));
// ok = writeAttribute(taskRef.lightNode, taskRef.lightNode->haEndpoint().endpoint(), ANALOG_OUTPUT_CLUSTER_ID, attr);
}
if (addTaskWindowCovering(task, 0x05 /*move to Lift Percent*/, 0, moveToPct))
{
QVariantMap rspItem;
QVariantMap rspItemState;
rspItemState[QString("/lights/%1/state/bri").arg(id)] = map["bri"];
rspItem["success"] = rspItemState;
rsp.list.append(rspItem);
taskToLocalData(task);
}
else
{
rsp.list.append(errorToMap(ERR_INTERNAL_ERROR, QString("/lights/%1").arg(id), QString("Internal error, %1").arg(ERR_BRIDGE_BUSY)));
}
}
else
{
ok = addTaskWindowCovering(task, 0x05 /*move to Lift Percent*/, 0, moveToPct);
}
if (ok)
{
QVariantMap rspItem;
QVariantMap rspItemState;
rspItemState[QString("/lights/%1/state/bri").arg(id)] = map["bri"];
rspItem["success"] = rspItemState;
rsp.list.append(rspItem);
taskToLocalData(task);
}
else
{
rsp.list.append(errorToMap(ERR_INTERNAL_ERROR, QString("/lights/%1").arg(id), QString("Internal error, %1").arg(ERR_BRIDGE_BUSY)));
}
}
} // FIXME end workaround window_covering
else if (!isOn && !hasOn)
{
Expand Down

0 comments on commit dbc214a

Please sign in to comment.