Fix repeat detection not working anymore

marcselis · Jan 26, 2023 · 9db7cd2 · 9db7cd2
1 parent 9a45c04
commit 9db7cd2
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 18 deletions.
diff --git a/addon/Easywave2MQTT/CHANGELOG.md b/addon/Easywave2MQTT/CHANGELOG.md
@@ -8,3 +8,4 @@
 | 0.4 beta | Simplified addon building & startup: <br/>- addon binaries & config file are directly editable in app subfolder, making it easier for non-developers to alter the configuration and to deploy the addon in Home Assistant.<br/>- options are directly read from data subfolder (if available).<br/>Lowered logging level for a few `MessagingService` messages that were logged twice, but in a different way. |
 | 0.5 beta | Allow addon to start when no serial ports are found, or when a non-existing port was specified |
 | 0.5.2 beta | Fix crash when serialport is throwing IOException for a timeout, instead of a TimeoutException |
+| 0.5.3 beta | Fix bug in detection mechanism for button repeats |
diff --git a/addon/Easywave2MQTT/app/Easywave2Mqtt.dll b/addon/Easywave2MQTT/app/Easywave2Mqtt.dll
diff --git a/addon/Easywave2MQTT/config.yaml b/addon/Easywave2MQTT/config.yaml
@@ -1,6 +1,6 @@
 name: "Easywave2MQTT"
 description: "Support Easywave devices in Home Assistant using MQTT"
-version: "0.5.2"
+version: "0.5.3"
 url: "https://github.com/marcselis/Easywave2MQTT"
 slug: "easywave2mqtt"
 init: false

diff --git a/src/Easywave2Mqtt/Easywave/EldatRx09Transceiver.cs b/src/Easywave2Mqtt/Easywave/EldatRx09Transceiver.cs
@@ -149,27 +149,22 @@ protected override async Task ExecuteAsync(CancellationToken stoppingToken)
  {
  while (!stoppingToken.IsCancellationRequested && _port!.IsOpen)
  {
- if (_port.BytesToRead > 0)
+ try
  {
- try
- {
- var line = _port.ReadLine();
- LogReceivedLine(line);
- EasywaveTelegram telegram = Parse(line);
- if (!telegram.Equals(EasywaveTelegram.Empty))
- {
- //Only wait if timeout has occurred, otherwise the double- & triple-press detection mechanism doesn't work.
- await _bus.PublishAsync(telegram).ConfigureAwait(false);
- }
- }
- catch (TimeoutException)
- {
- }
- catch (IOException ex) when (ex.HResult == TimeoutResult)
+ var line = _port.ReadLine();
+ LogReceivedLine(line);
+ EasywaveTelegram telegram = Parse(line);
+ if (!telegram.Equals(EasywaveTelegram.Empty))
  {
+ //Only wait if timeout has occurred, otherwise the double- & triple-press detection mechanism doesn't work.
+ await _bus.PublishAsync(telegram).ConfigureAwait(false);
  }
  }
- else
+ catch (TimeoutException)
+ {
+ await Task.Delay(PauseTime, stoppingToken).ConfigureAwait(false);
+ }
+ catch (IOException ex) when (ex.HResult == TimeoutResult)
  {
  await Task.Delay(PauseTime, stoppingToken).ConfigureAwait(false);
  }