Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

FIX, Better Tuya reconization #4616

Merged
merged 7 commits into from
Mar 27, 2021
Merged

FIX, Better Tuya reconization #4616

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
68cbbb8
Merge pull request #15 from dresden-elektronik/master
Smanar Feb 17, 2021
5d7e81f
Merge pull request #17 from dresden-elektronik/master
Smanar Feb 26, 2021
51586b4
Merge pull request #19 from dresden-elektronik/master
Smanar Mar 5, 2021
657f71f
Merge pull request #25 from dresden-elektronik/master
Smanar Mar 17, 2021
31eb4b6
Update resource.cpp
Smanar Mar 19, 2021
fcb27d2
make battery sensor
Smanar Mar 20, 2021
a2a88c0
Update resource.cpp
Smanar Mar 21, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion database.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3709,7 +3709,7 @@ static int sqliteLoadAllSensorsCallback(void *user, int ncols, char **colval , c
{
clusterId = POWER_CONFIGURATION_CLUSTER_ID;
}
if (sensor.manufacturer() == QLatin1String("_TYST11_xu1rkty3"))
else if (sensor.fingerPrint().hasInCluster(TUYA_CLUSTER_ID))
{
clusterId = TUYA_CLUSTER_ID;
}
Expand Down
6 changes: 5 additions & 1 deletion de_web_plugin.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5562,6 +5562,10 @@ void DeRestPluginPrivate::addSensorNode(const deCONZ::Node *node, const deCONZ::
{
fpThermostatSensor.inClusters.push_back(TUYA_CLUSTER_ID);
}
if (manufacturer == QLatin1String("_TZE200_xuzcvlku"))
{
fpBatterySensor.inClusters.push_back(TUYA_CLUSTER_ID);
}
}
break;

Expand Down Expand Up @@ -6769,7 +6773,7 @@ void DeRestPluginPrivate::addSensorNode(const deCONZ::Node *node, const SensorFi
{
clusterId = POWER_CONFIGURATION_CLUSTER_ID;
}
if (sensorNode.manufacturer() == QLatin1String("_TYST11_xu1rkty3"))
else if (sensorNode.fingerPrint().hasInCluster(TUYA_CLUSTER_ID))
{
clusterId = TUYA_CLUSTER_ID;
}
Expand Down
14 changes: 8 additions & 6 deletions resource.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -551,13 +551,15 @@ const QString R_GetProductId(Resource *resource)
}

const auto *manufacturerName = resource->item(RAttrManufacturerName);
const auto *modelId = resource->item(RAttrManufacturerName);
const auto *modelId = resource->item(RAttrModelId);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch


if (!manufacturerName || !modelId)
// Need manufacturerName
if (!manufacturerName)
{
return rInvalidString;
}


//Tuya don't need modelId
if (isTuyaManufacturerName(manufacturerName->toString()))
{
// for Tuya devices match against manufacturer name
Expand All @@ -576,14 +578,14 @@ const QString R_GetProductId(Resource *resource)
// manufacturer name is the most unique identifier for Tuya
if (DBG_IsEnabled(DBG_INFO_L2))
{
DBG_Printf(DBG_INFO_L2, "No Tuya productId entry found for manufacturername: %s, modelId: %s\n",
qPrintable(manufacturerName->toString()), qPrintable(modelId->toString()));
DBG_Printf(DBG_INFO_L2, "No Tuya productId entry found for manufacturername: %s\n", qPrintable(manufacturerName->toString()));
}

return manufacturerName->toString();
}
}
else

if (modelId)
{
return modelId->toString();
}
Expand Down