From 865d00d3d03b52941d90c678ad4d5c30fa74e301 Mon Sep 17 00:00:00 2001
From: Thomas Basler <thomas@familie-basler.net>
Date: Sat, 18 Jun 2022 12:26:37 +0200
Subject: [PATCH] Code cleanup

---
 lib/Hoymiles/src/HoymilesRadio.cpp | 20 ++++++++------------
 lib/Hoymiles/src/HoymilesRadio.h   |  3 +--
 2 files changed, 9 insertions(+), 14 deletions(-)

diff --git a/lib/Hoymiles/src/HoymilesRadio.cpp b/lib/Hoymiles/src/HoymilesRadio.cpp
index 56255ed..53a8d79 100644
--- a/lib/Hoymiles/src/HoymilesRadio.cpp
+++ b/lib/Hoymiles/src/HoymilesRadio.cpp
@@ -32,7 +32,7 @@ void HoymilesRadio::loop()
 {
     EVERY_N_MILLIS(4)
     {
-        switchRxCh(1);
+        switchRxCh();
     }
 
     if (_packetReceived) {
@@ -167,18 +167,14 @@ uint8_t HoymilesRadio::getTxNxtChannel()
     return _txChLst[_txChIdx];
 }
 
-bool HoymilesRadio::switchRxCh(uint8_t addLoop)
+void HoymilesRadio::switchRxCh()
 {
-    _rxLoopCnt += addLoop;
-    if (_rxLoopCnt != 0) {
-        _rxLoopCnt--;
-        // portDISABLE_INTERRUPTS();
-        _radio->stopListening();
-        _radio->setChannel(getRxNxtChannel());
-        _radio->startListening();
-        // portENABLE_INTERRUPTS();
-    }
-    return (0 == _rxLoopCnt); // receive finished
+
+    // portDISABLE_INTERRUPTS();
+    _radio->stopListening();
+    _radio->setChannel(getRxNxtChannel());
+    _radio->startListening();
+    // portENABLE_INTERRUPTS();
 }
 
 serial_u HoymilesRadio::convertSerialToRadioId(serial_u serial)
diff --git a/lib/Hoymiles/src/HoymilesRadio.h b/lib/Hoymiles/src/HoymilesRadio.h
index e18e744..18e5a0e 100644
--- a/lib/Hoymiles/src/HoymilesRadio.h
+++ b/lib/Hoymiles/src/HoymilesRadio.h
@@ -34,7 +34,7 @@ private:
     static void convertSerialToPacketId(uint8_t buffer[], serial_u serial);
     uint8_t getRxNxtChannel();
     uint8_t getTxNxtChannel();
-    bool switchRxCh(uint8_t addLoop = 0);
+    void switchRxCh();
     void openReadingPipe();
     void openWritingPipe(serial_u serial);
     bool checkFragmentCrc(fragment_t* fragment);
@@ -44,7 +44,6 @@ private:
     std::unique_ptr<RF24> _radio;
     uint8_t _rxChLst[4] = { 3, 23, 61, 75 };
     uint8_t _rxChIdx;
-    uint16_t _rxLoopCnt;
 
     uint8_t _txChLst[1] = { 40 };
     uint8_t _txChIdx;