Skip to content

Commit e44511b

Browse files
committed
RTL433, solve issue #3283
1 parent 8be606e commit e44511b

File tree

1 file changed

+12
-18
lines changed

1 file changed

+12
-18
lines changed

hardware/Rtl433.cpp

Lines changed: 12 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -352,47 +352,41 @@ bool CRtl433::ParseLine(const std::vector<std::string> &headers, const char *lin
352352
{
353353
int iForecast = 0;
354354
SendTempHumBaroSensor(sensoridx, batterylevel, tempC, humidity, pressure, iForecast, model);
355-
return true;
356355
}
357-
if (haveTemp && haveHumidity)
356+
else if (haveTemp && haveHumidity)
358357
{
359358
SendTempHumSensor(sensoridx, batterylevel, tempC, humidity, model);
360-
return true;
361-
}
362-
if (haveWind_Strength || haveWind_Gust || haveWind_Dir)
363-
{
364-
SendWind(sensoridx, batterylevel, wind_dir, wind_strength, wind_gust, tempC, 0, haveTemp, false, model);
365-
return true;
366359
}
367-
if (haveTemp)
360+
else
368361
{
369-
SendTempSensor(sensoridx, batterylevel, tempC, model);
370-
return true;
362+
if (haveTemp)
363+
{
364+
SendTempSensor(sensoridx, batterylevel, tempC, model);
365+
}
366+
if (haveHumidity)
367+
{
368+
SendHumiditySensor(sensoridx, batterylevel, humidity, model);
369+
}
371370
}
372-
if (haveHumidity)
371+
if (haveWind_Strength || haveWind_Gust || haveWind_Dir)
373372
{
374-
SendHumiditySensor(sensoridx, batterylevel, humidity, model);
375-
return true;
373+
SendWind(sensoridx, batterylevel, wind_dir, wind_strength, wind_gust, tempC, 0, haveTemp, false, model);
376374
}
377375
if (haveRain)
378376
{
379377
SendRainSensor(sensoridx, batterylevel, rain, model);
380-
return true;
381378
}
382379
if (haveDepth_CM)
383380
{
384381
SendDistanceSensor(sensoridx, unit, batterylevel, depth_cm, model);
385-
return true;
386382
}
387383
if (haveDepth)
388384
{
389385
SendDistanceSensor(sensoridx, unit, batterylevel, depth, model);
390-
return true;
391386
}
392387
if (haveMoisture)
393388
{
394389
SendMoistureSensor(sensoridx, batterylevel, moisture, model);
395-
return true;
396390
}
397391

398392
return false; //not handled (Yet!)

0 commit comments

Comments
 (0)