From 1834d05854541c80edcdb8ee447957c9fec2ee71 Mon Sep 17 00:00:00 2001
From: suaveolent <suaveolent@users.noreply.github.com>
Date: Tue, 6 Feb 2024 16:44:15 +0100
Subject: [PATCH] refactgoring, update readme

---
 README.md                 |  3 ++-
 hoymiles_wifi/__main__.py |  2 +-
 hoymiles_wifi/utils.py    | 39 ++++++++++++++++++---------------------
 3 files changed, 21 insertions(+), 23 deletions(-)

diff --git a/README.md b/README.md
index e83c00d..8f876ff 100644
--- a/README.md
+++ b/README.md
@@ -35,7 +35,8 @@ commands:
     restart,
     turn-on,
     turn-off,
-    
+    get-information-data,
+    get-version-info
 ```
 
 ### Python code
diff --git a/hoymiles_wifi/__main__.py b/hoymiles_wifi/__main__.py
index 2fcffa6..5cc5509 100644
--- a/hoymiles_wifi/__main__.py
+++ b/hoymiles_wifi/__main__.py
@@ -7,6 +7,7 @@ from hoymiles_wifi.utils import (
     generate_dtu_version_string
 )
 
+
 # Inverter commands
 def get_real_data_new(inverter):
     return inverter.get_real_data_new()
@@ -156,7 +157,6 @@ def main():
             "restart",
             "turn-on",
             "turn-off",
-            "get-dtu-serial-number",
             "get-information-data",
             "get-version-info"
         ],
diff --git a/hoymiles_wifi/utils.py b/hoymiles_wifi/utils.py
index 9f4233a..d54a870 100644
--- a/hoymiles_wifi/utils.py
+++ b/hoymiles_wifi/utils.py
@@ -5,40 +5,37 @@ from hoymiles_wifi.protobuf import (
     SetConfig_pb2,
 )
 
-def format_number(num):
-    return "{:02d}".format(num)
+def format_number(number):
+    return "{:02d}".format(number)
 
-def generate_version_string(i):
-    value_of = i
-    version_string = format_number(value_of // 2048) + "." + format_number((value_of // 64) % 32) + "." + format_number(value_of % 64)
+def generate_version_string(version_number: int):
+    version_string = format_number(version_number // 2048) + "." + format_number((version_number // 64) % 32) + "." + format_number(version_number % 64)
     return version_string
 
-def generate_sw_version_string(i):
-    value_of = i
-    value_of2 = value_of // 10000
-    value_of3 = (value_of - (value_of2 * 10000)) // 100
-    value_of4 = (value_of - (value_of2 * 10000)) - (value_of3 * 100)
+def generate_sw_version_string(version_number: int):
 
-    version_string = format_number(value_of2) + "." + format_number(value_of3) + "." + format_number(value_of4)
+    version_number2 = version_number // 10000
+    version_number3 = (version_number - (version_number2 * 10000)) // 100
+    version_number4 = (version_number - (version_number2 * 10000)) - (version_number3 * 100)
+
+    version_string = format_number(version_number2) + "." + format_number(version_number3) + "." + format_number(version_number4)
     return version_string
 
 
-def generate_dtu_version_string(i):
-    def format_number(num):
-        return "{:02d}".format(num)
+def generate_dtu_version_string(version_number: int, type: str = None):
 
-    string_buffer = ""
-    i2 = i % 256
-    i3 = (i // 256) % 16
+    version_string = ""
+    version_number2 = version_number % 256
+    version_number3 = (version_number // 256) % 16
 
     if "SRF" == str:
-        string_buffer += f"{format_number(i // 1048576)}.{format_number((i % 65536) // 4096)}.{format_number(i3)}.{format_number(i2)}"
+        version_string += f"{format_number(version_number // 1048576)}.{format_number((version_number % 65536) // 4096)}.{format_number(version_number3)}.{format_number(version_number2)}"
     elif "HRF" == str:
-        string_buffer += f"{format_number(i // 65536)}.{format_number((i % 65536) // 4096)}.{format_number(i3)}.{format_number(i2)}"
+        version_string += f"{format_number(version_number // 65536)}.{format_number((version_number % 65536) // 4096)}.{format_number(version_number3)}.{format_number(version_number2)}"
     else:
-        string_buffer += f"{format_number(i // 4096)}.{format_number(i3)}.{format_number(i2)}"
+        version_string += f"{format_number(version_number // 4096)}.{format_number(version_number3)}.{format_number(version_number2)}"
 
-    return string_buffer
+    return version_string
 
 def initialize_set_config(get_config_req: GetConfig_pb2.GetConfigReqDTO):
     set_config_res = SetConfig_pb2.SetConfigResDTO()