From ed205fba47a0e72103e81e8aaaf4f565d0d6bd00 Mon Sep 17 00:00:00 2001
From: Christian Ehrlicher <ch.ehrlicher@gmx.de>
Date: Fri, 4 Nov 2022 20:20:35 +0100
Subject: [PATCH] RPI: refactor: move more stuff into main_loop

---
 tools/rpi/hoymiles/__main__.py | 66 +++++++++++++++++-----------------
 1 file changed, 33 insertions(+), 33 deletions(-)

diff --git a/tools/rpi/hoymiles/__main__.py b/tools/rpi/hoymiles/__main__.py
index 0b558073..2b3ee5d6 100644
--- a/tools/rpi/hoymiles/__main__.py
+++ b/tools/rpi/hoymiles/__main__.py
@@ -17,17 +17,6 @@ from yaml.loader import SafeLoader
 import paho.mqtt.client
 import hoymiles
 
-def main_loop(do_init):
-    """Main loop"""
-    inverters = [
-            inverter for inverter in ahoy_config.get('inverters', [])
-            if not inverter.get('disabled', False)]
-
-    for inverter in inverters:
-        if hoymiles.HOYMILES_DEBUG_LOGGING:
-            print(f'Poll inverter {inverter["serial"]}')
-        poll_inverter(inverter, do_init)
-
 class InfoCommands(IntEnum):
     InverterDevInform_Simple = 0  # 0x00
     InverterDevInform_All = 1     # 0x01
@@ -48,6 +37,38 @@ class InfoCommands(IntEnum):
     GetSelfCheckState = 30        # 0x1e
     InitDataState = 0xff
 
+def main_loop(ahoy_config):
+    """Main loop"""
+    inverters = [
+            inverter for inverter in ahoy_config.get('inverters', [])
+            if not inverter.get('disabled', False)]
+
+    loop_interval = ahoy_config.get('interval', 1)
+    try:
+        do_init = True
+        while True:
+            t_loop_start = time.time()
+
+            for inverter in inverters:
+                if hoymiles.HOYMILES_DEBUG_LOGGING:
+                    print(f'Poll inverter {inverter["serial"]}')
+                poll_inverter(inverter, do_init)
+            do_init = False
+
+            print('', end='', flush=True)
+
+            if loop_interval > 0:
+                time_to_sleep = loop_interval - (time.time() - t_loop_start)
+                if time_to_sleep > 0:
+                    time.sleep(time_to_sleep)
+
+    except KeyboardInterrupt:
+        sys.exit()
+    except Exception as e:
+        print ('Exception catched: %s' % e)
+        raise
+
+
 def poll_inverter(inverter, do_init, retries=4):
     """
     Send/Receive command_queue, initiate status poll on inverter
@@ -310,25 +331,4 @@ if __name__ == '__main__':
             mqtt_client.subscribe(topic_item[1])
             mqtt_command_topic_subs.append(topic_item)
 
-    loop_interval = ahoy_config.get('interval', 1)
-    try:
-        do_init = True
-        while True:
-            t_loop_start = time.time()
-
-            main_loop(do_init)
-
-            do_init = False
-
-            print('', end='', flush=True)
-
-            time_to_sleep = loop_interval - (time.time() - t_loop_start)
-
-            if loop_interval > 0 and time_to_sleep > 0:
-                time.sleep(time_to_sleep) 
-
-    except KeyboardInterrupt:
-        sys.exit()
-    except Exception as e:
-        print ('Exception catched: %s' % e)
-        raise
+    main_loop(ahoy_config)