Skip to content

Commit 9239f97

Browse files
SwoopXSwoopX
authored
Remove legacy code for various devices (dresden-elektronik#6840)
1 parent a5f3b0e commit 9239f97

7 files changed

+10
-300
lines changed

‎bindings.cpp

Lines changed: 1 addition & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -1836,7 +1836,6 @@ bool DeRestPluginPrivate::sendConfigureReportingRequest(BindingTask &bt)
18361836
modelId == QLatin1String("TS0202") || // Tuya sensor
18371837
modelId == QLatin1String("3AFE14010402000D") || // Konke presence sensor
18381838
modelId == QLatin1String("3AFE28010402000D") || // Konke presence sensor
1839-
modelId == QLatin1String("lumi.airmonitor.acn01") || // Xiaomi Aqara TVOC Air Quality Monitor
18401839
modelId.startsWith(QLatin1String("GZ-PIR02")) || // Sercomm motion sensor
18411840
modelId.startsWith(QLatin1String("SZ-WTD02N_CAR")) || // Sercomm water sensor
18421841
modelId.startsWith(QLatin1String("3300")) || // Centralite contatc sensor
@@ -2280,43 +2279,6 @@ bool DeRestPluginPrivate::sendConfigureReportingRequest(BindingTask &bt)
22802279

22812280
return sendConfigureReportingRequest(bt, {rq});
22822281
}
2283-
else if (bt.binding.clusterId == VENDOR_CLUSTER_ID)
2284-
{
2285-
if (modelId == QLatin1String("de_spect")) // dresden elektronik spectral sensor
2286-
{
2287-
rq.dataType = deCONZ::Zcl8BitUint;
2288-
rq.attributeId = 0x0000; // sensor enabled
2289-
rq.minInterval = 1;
2290-
rq.maxInterval = 120;
2291-
rq.reportableChange8bit = 1;
2292-
2293-
ConfigureReportingRequest rq2;
2294-
rq2 = ConfigureReportingRequest();
2295-
rq2.dataType = deCONZ::Zcl16BitUint;
2296-
rq2.attributeId = 0x0001; // spectral x
2297-
rq2.minInterval = 1;
2298-
rq2.maxInterval = 300;
2299-
rq2.reportableChange16bit = 200;
2300-
2301-
ConfigureReportingRequest rq3;
2302-
rq3 = ConfigureReportingRequest();
2303-
rq3.dataType = deCONZ::Zcl16BitUint;
2304-
rq3.attributeId = 0x0002; // spectral x
2305-
rq3.minInterval = 1;
2306-
rq3.maxInterval = 300;
2307-
rq3.reportableChange16bit = 200;
2308-
2309-
ConfigureReportingRequest rq4;
2310-
rq4 = ConfigureReportingRequest();
2311-
rq4.dataType = deCONZ::Zcl16BitUint;
2312-
rq4.attributeId = 0x0003; // spectral x
2313-
rq4.minInterval = 1;
2314-
rq4.maxInterval = 300;
2315-
rq4.reportableChange16bit = 200;
2316-
2317-
return sendConfigureReportingRequest(bt, {rq, rq2, rq3, rq4});
2318-
}
2319-
}
23202282

23212283
return false;
23222284
}
@@ -2687,8 +2649,6 @@ bool DeRestPluginPrivate::checkSensorBindingsForAttributeReporting(Sensor *senso
26872649
sensor->modelId().startsWith(QLatin1String("3323")) ||
26882650
sensor->modelId().startsWith(QLatin1String("3326-L")) ||
26892651
sensor->modelId().startsWith(QLatin1String("3157100")) ||
2690-
// dresden elektronik
2691-
(sensor->manufacturer() == QLatin1String("dresden elektronik") && sensor->modelId() == QLatin1String("de_spect")) ||
26922652
// GE
26932653
(sensor->manufacturer() == QLatin1String("Jasco Products") && sensor->modelId() == QLatin1String("45856")) ||
26942654
// NYCE
@@ -2711,7 +2671,6 @@ bool DeRestPluginPrivate::checkSensorBindingsForAttributeReporting(Sensor *senso
27112671
// IKEA
27122672
sensor->modelId().startsWith(QLatin1String("TRADFRI")) ||
27132673
sensor->modelId().startsWith(QLatin1String("Remote Control N2")) || // STYRBAR
2714-
sensor->modelId().startsWith(QLatin1String("FYRTUR")) ||
27152674
sensor->modelId().startsWith(QLatin1String("KADRILJ")) ||
27162675
sensor->modelId().startsWith(QLatin1String("SYMFONISK")) ||
27172676
// OSRAM
@@ -2795,7 +2754,6 @@ bool DeRestPluginPrivate::checkSensorBindingsForAttributeReporting(Sensor *senso
27952754
sensor->modelId().startsWith(QLatin1String("FLSZB-1")) || // water leak sensor
27962755
sensor->modelId().startsWith(QLatin1String("MOSZB-1")) || // motion sensor
27972756
sensor->modelId().startsWith(QLatin1String("ZHMS101")) || // Wattle (Develco) magnetic sensor
2798-
sensor->modelId() == QLatin1String("ZHEMI101") || // Wattle (Develco) External Meter Interface
27992757
sensor->modelId().startsWith(QLatin1String("EMIZB-1")) || // EMI Norwegian HAN
28002758
sensor->modelId().startsWith(QLatin1String("SMRZB-3")) || // Smart Relay DIN
28012759
sensor->modelId().startsWith(QLatin1String("SMRZB-1")) || // Smart Cable
@@ -2883,7 +2841,6 @@ bool DeRestPluginPrivate::checkSensorBindingsForAttributeReporting(Sensor *senso
28832841
sensor->modelId().startsWith(QLatin1String("RH3052")) ||
28842842
// Xiaomi
28852843
sensor->modelId().startsWith(QLatin1String("lumi.switch.b1naus01")) ||
2886-
sensor->modelId() == QLatin1String("lumi.airmonitor.acn01") ||
28872844
sensor->modelId() == QLatin1String("lumi.sensor_magnet.agl02") ||
28882845
sensor->modelId() == QLatin1String("lumi.motion.agl04") ||
28892846
sensor->modelId() == QLatin1String("lumi.flood.agl02") ||
@@ -2922,7 +2879,6 @@ bool DeRestPluginPrivate::checkSensorBindingsForAttributeReporting(Sensor *senso
29222879
sensor->modelId() == QLatin1String("CCT593011_AS") ||
29232880
sensor->modelId() == QLatin1String("CCT595011_AS") ||
29242881
// Immax
2925-
sensor->modelId() == QLatin1String("Plug-230V-ZB3.0") ||
29262882
sensor->modelId() == QLatin1String("4in1-Sensor-ZB3.0") ||
29272883
sensor->modelId() == QLatin1String("DoorWindow-Sensor-ZB3.0") ||
29282884
// Casa.IA
@@ -3129,9 +3085,7 @@ bool DeRestPluginPrivate::checkSensorBindingsForAttributeReporting(Sensor *senso
31293085
{
31303086
val = sensor->getZclValue(*i, 0x0035); // battery alarm mask
31313087
}
3132-
else if (sensor->modelId().startsWith(QLatin1String("AQSZB-1")) ||
3133-
sensor->modelId().startsWith(QLatin1String("WISZB-1")) ||
3134-
sensor->modelId().startsWith(QLatin1String("MOSZB-1")) ||
3088+
else if (sensor->modelId().startsWith(QLatin1String("MOSZB-1")) ||
31353089
sensor->modelId().startsWith(QLatin1String("FLSZB-1")) ||
31363090
sensor->modelId().startsWith(QLatin1String("HMSZB-1")) ||
31373091
sensor->modelId() == QLatin1String("MotionSensor51AU") ||
@@ -3201,13 +3155,6 @@ bool DeRestPluginPrivate::checkSensorBindingsForAttributeReporting(Sensor *senso
32013155
}
32023156
}
32033157
}
3204-
else if (*i == VENDOR_CLUSTER_ID)
3205-
{
3206-
if (sensor->modelId() == QLatin1String("de_spect")) // dresden elektronik spectral sensor
3207-
{
3208-
val = sensor->getZclValue(*i, 0x0000, sensor->fingerPrint().endpoint); // sensor enabled per endpoint
3209-
}
3210-
}
32113158
else if (*i == BOSCH_AIR_QUALITY_CLUSTER_ID && sensor->modelId() == QLatin1String("AIR"))
32123159
{
32133160
if (sensor->type() != QLatin1String("ZHAAirQuality"))

‎database.cpp

Lines changed: 1 addition & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -3508,10 +3508,6 @@ static int sqliteLoadAllSensorsCallback(void *user, int ncols, char **colval , c
35083508
{
35093509
clusterId = clusterId ? clusterId : BOSCH_AIR_QUALITY_CLUSTER_ID;
35103510
}
3511-
else if (sensor.fingerPrint().hasInCluster(DEVELCO_AIR_QUALITY_CLUSTER_ID)) // Develco air quality sensor
3512-
{
3513-
clusterId = clusterId ? clusterId : DEVELCO_AIR_QUALITY_CLUSTER_ID;
3514-
}
35153511
item = sensor.addItem(DataTypeString, RStateAirQuality);
35163512
item = sensor.addItem(DataTypeUInt16, RStateAirQualityPpb);
35173513
}
@@ -3745,20 +3741,13 @@ static int sqliteLoadAllSensorsCallback(void *user, int ncols, char **colval , c
37453741
(sensor.modelId() != QLatin1String("TS0121")) &&
37463742
(!sensor.modelId().startsWith(QLatin1String("BQZ10-AU"))) &&
37473743
(!sensor.modelId().startsWith(QLatin1String("ROB_200"))) &&
3748-
(!sensor.modelId().startsWith(QLatin1String("lumi.plug.ma"))) &&
3749-
(sensor.modelId() != QLatin1String("Plug-230V-ZB3.0")) &&
37503744
(sensor.modelId() != QLatin1String("lumi.switch.b1naus01")) &&
37513745
(sensor.modelId() != QLatin1String("lumi.switch.n0agl1")) &&
37523746
(!sensor.modelId().startsWith(QLatin1String("SPW35Z"))))
37533747
{
37543748
item = sensor.addItem(DataTypeInt16, RStatePower);
37553749
item->setValue(0);
37563750
}
3757-
if (sensor.modelId() == QLatin1String("ZHEMI101"))
3758-
{
3759-
sensor.addItem(DataTypeUInt8, RConfigInterfaceMode)->setValue(1);
3760-
sensor.addItem(DataTypeUInt16, RConfigPulseConfiguration)->setValue(1000);
3761-
}
37623751
if (sensor.modelId().startsWith(QLatin1String("EMIZB-1")))
37633752
{
37643753
sensor.addItem(DataTypeUInt8, RConfigInterfaceMode)->setValue(1);
@@ -3787,7 +3776,6 @@ static int sqliteLoadAllSensorsCallback(void *user, int ncols, char **colval , c
37873776
// hasVoltage = false;
37883777
}
37893778
else if (sensor.modelId() == QLatin1String("ZB-ONOFFPlug-D0005") ||
3790-
sensor.modelId() == QLatin1String("Plug-230V-ZB3.0") ||
37913779
sensor.modelId() == QLatin1String("lumi.switch.b1nacn02") ||
37923780
sensor.modelId() == QLatin1String("lumi.switch.b2nacn02") ||
37933781
sensor.modelId() == QLatin1String("lumi.switch.b1naus01") ||
@@ -4102,7 +4090,6 @@ static int sqliteLoadAllSensorsCallback(void *user, int ncols, char **colval , c
41024090
if (!sensor.modelId().startsWith(QLatin1String("lumi.ctrl_")) &&
41034091
!sensor.modelId().startsWith(QLatin1String("lumi.plug")) &&
41044092
sensor.modelId() != QLatin1String("lumi.curtain") &&
4105-
sensor.modelId() != QLatin1String("lumi.sensor_natgas") &&
41064093
!sensor.modelId().startsWith(QLatin1String("lumi.relay.c")) &&
41074094
!sensor.type().endsWith(QLatin1String("Battery")))
41084095
{
@@ -4182,8 +4169,7 @@ static int sqliteLoadAllSensorsCallback(void *user, int ncols, char **colval , c
41824169
item = sensor.addItem(DataTypeBool, RStateLowBattery);
41834170
// don't set value -> null until reported
41844171
}
4185-
else if (sensor.modelId() == QLatin1String("lumi.sensor_natgas") ||
4186-
sensor.modelId() == QLatin1String("Bell"))
4172+
else if (sensor.modelId() == QLatin1String("Bell"))
41874173
{
41884174
// Don't expose battery resource item for this device
41894175
}

0 commit comments

Comments
 (0)