@@ -352,47 +352,41 @@ bool CRtl433::ParseLine(const std::vector<std::string> &headers, const char *lin
352
352
{
353
353
int iForecast = 0 ;
354
354
SendTempHumBaroSensor (sensoridx, batterylevel, tempC, humidity, pressure, iForecast, model);
355
- return true ;
356
355
}
357
- if (haveTemp && haveHumidity)
356
+ else if (haveTemp && haveHumidity)
358
357
{
359
358
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 ;
366
359
}
367
- if (haveTemp)
360
+ else
368
361
{
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
+ }
371
370
}
372
- if (haveHumidity )
371
+ if (haveWind_Strength || haveWind_Gust || haveWind_Dir )
373
372
{
374
- SendHumiditySensor (sensoridx, batterylevel, humidity, model);
375
- return true ;
373
+ SendWind (sensoridx, batterylevel, wind_dir, wind_strength, wind_gust, tempC, 0 , haveTemp, false , model);
376
374
}
377
375
if (haveRain)
378
376
{
379
377
SendRainSensor (sensoridx, batterylevel, rain, model);
380
- return true ;
381
378
}
382
379
if (haveDepth_CM)
383
380
{
384
381
SendDistanceSensor (sensoridx, unit, batterylevel, depth_cm, model);
385
- return true ;
386
382
}
387
383
if (haveDepth)
388
384
{
389
385
SendDistanceSensor (sensoridx, unit, batterylevel, depth, model);
390
- return true ;
391
386
}
392
387
if (haveMoisture)
393
388
{
394
389
SendMoistureSensor (sensoridx, batterylevel, moisture, model);
395
- return true ;
396
390
}
397
391
398
392
return false ; // not handled (Yet!)
0 commit comments