Merge pull request #918 from mr-manuel/dev

Changes 2024.01.12

CHANGELOG.md

@@ -24,6 +24,12 @@
 
 ## v1.0.x
 
+* Changed: Fix issue on first driver startup, when no device setting in dbus exists by @mr-manuel
+* Changed: More detailed error output when an exception happens by @mr-manuel
+
+
+## v1.0.20240102beta
+
 * Added: Bluetooth: Show signal strength of BMS in log by @mr-manuel
 * Added: Configure logging level in `config.ini` by @mr-manuel
 * Added: Create unique identifier, if not provided from BMS by @mr-manuel

etc/dbus-serialbattery/battery.py

@@ -493,8 +493,6 @@ def manage_charge_voltage_linear(self) -> None:
                 if self.soc_reset_requested:
                     # logger.info("set soc_reset_requested to False")
                     self.soc_reset_requested = False
-                    # IDEA: Save "soc_reset_last_reached" in the dbus path com.victronenergy.settings
-                    # to make it restart persistent
                     self.soc_reset_last_reached = current_time
                 if self.control_voltage:
                     # check if battery changed from bulk/absoprtion to float

etc/dbus-serialbattery/bms/ant.py

@@ -8,6 +8,7 @@
 from utils import read_serial_data, logger
 import utils
 from struct import unpack_from
+import sys
 
 
 class ANT(Battery):
@@ -32,8 +33,17 @@ def test_connection(self):
         try:
             result = self.read_status_data()
             result = result and self.refresh_data()
-        except Exception as err:
-            logger.error(f"Unexpected {err=}, {type(err)=}")
+        except Exception:
+            (
+                exception_type,
+                exception_object,
+                exception_traceback,
+            ) = sys.exc_info()
+            file = exception_traceback.tb_frame.f_code.co_filename
+            line = exception_traceback.tb_lineno
+            logger.error(
+                f"Exception occurred: {repr(exception_object)} of type {exception_type} in {file} line #{line}"
+            )
             result = False
 
         return result

etc/dbus-serialbattery/bms/battery_template.py

@@ -9,6 +9,7 @@
 from utils import is_bit_set, read_serial_data, logger
 import utils
 from struct import unpack_from
+import sys
 
 
 class BatteryTemplate(Battery):
@@ -29,8 +30,17 @@ def test_connection(self):
             result = self.read_status_data()
             # get first data to show in startup log, only if result is true
             result = result and self.refresh_data()
-        except Exception as err:
-            logger.error(f"Unexpected {err=}, {type(err)=}")
+        except Exception:
+            (
+                exception_type,
+                exception_object,
+                exception_traceback,
+            ) = sys.exc_info()
+            file = exception_traceback.tb_frame.f_code.co_filename
+            line = exception_traceback.tb_lineno
+            logger.error(
+                f"Exception occurred: {repr(exception_object)} of type {exception_type} in {file} line #{line}"
+            )
             result = False
 
         return result

etc/dbus-serialbattery/bms/daly.py

@@ -6,6 +6,7 @@
 from time import sleep, time
 from datetime import datetime
 from re import sub
+import sys
 
 
 class Daly(Battery):
@@ -66,8 +67,17 @@ def test_connection(self):
                     self.read_soc_data(ser)
                     self.read_battery_code(ser)
 
-        except Exception as err:
-            logger.error(f"Unexpected {err=}, {type(err)=}")
+        except Exception:
+            (
+                exception_type,
+                exception_object,
+                exception_traceback,
+            ) = sys.exc_info()
+            file = exception_traceback.tb_frame.f_code.co_filename
+            line = exception_traceback.tb_lineno
+            logger.error(
+                f"Exception occurred: {repr(exception_object)} of type {exception_type} in {file} line #{line}"
+            )
             result = False
 
         # give the user a feedback that no BMS was found

etc/dbus-serialbattery/bms/ecs.py

@@ -4,6 +4,7 @@
 from utils import logger
 import utils
 import minimalmodbus
+import sys
 
 
 class Ecs(Battery):
@@ -58,8 +59,17 @@ def test_connection(self):
 
         except IOError:
             result = False
-        except Exception as err:
-            logger.error(f"Unexpected {err=}, {type(err)=}")
+        except Exception:
+            (
+                exception_type,
+                exception_object,
+                exception_traceback,
+            ) = sys.exc_info()
+            file = exception_traceback.tb_frame.f_code.co_filename
+            line = exception_traceback.tb_lineno
+            logger.error(
+                f"Exception occurred: {repr(exception_object)} of type {exception_type} in {file} line #{line}"
+            )
             result = False
 
         # give the user a feedback that no BMS was found

etc/dbus-serialbattery/bms/hlpdatabms4s.py

@@ -4,6 +4,7 @@
 import utils
 import serial
 from time import sleep
+import sys
 
 
 class HLPdataBMS4S(Battery):
@@ -20,8 +21,17 @@ def test_connection(self):
         result = False
         try:
             result = self.read_test_data()
-        except Exception as err:
-            logger.error(f"Unexpected {err=}, {type(err)=}")
+        except Exception:
+            (
+                exception_type,
+                exception_object,
+                exception_traceback,
+            ) = sys.exc_info()
+            file = exception_traceback.tb_frame.f_code.co_filename
+            line = exception_traceback.tb_lineno
+            logger.error(
+                f"Exception occurred: {repr(exception_object)} of type {exception_type} in {file} line #{line}"
+            )
             result = False
 
         # give the user a feedback that no BMS was found

etc/dbus-serialbattery/bms/jkbms.py

@@ -4,6 +4,7 @@
 import utils
 from struct import unpack_from
 from re import sub
+import sys
 
 
 class Jkbms(Battery):
@@ -25,8 +26,17 @@ def test_connection(self):
         # Return True if success, False for failure
         try:
             return self.read_status_data()
-        except Exception as err:
-            logger.error(f"Unexpected {err=}, {type(err)=}")
+        except Exception:
+            (
+                exception_type,
+                exception_object,
+                exception_traceback,
+            ) = sys.exc_info()
+            file = exception_traceback.tb_frame.f_code.co_filename
+            line = exception_traceback.tb_lineno
+            logger.error(
+                f"Exception occurred: {repr(exception_object)} of type {exception_type} in {file} line #{line}"
+            )
             return False
 
     def get_settings(self):

etc/dbus-serialbattery/bms/jkbms_ble.py

@@ -6,6 +6,7 @@
 from time import sleep, time
 from bms.jkbms_brn import Jkbms_Brn
 import os
+import sys
 
 # from bleak import BleakScanner, BleakError
 # import asyncio
@@ -69,8 +70,17 @@ def test_connection(self):
             if not result:
                 logger.error("No BMS found at " + self.address)
 
-        except Exception as err:
-            logger.error(f"Unexpected {err=}, {type(err)=}")
+        except Exception:
+            (
+                exception_type,
+                exception_object,
+                exception_traceback,
+            ) = sys.exc_info()
+            file = exception_traceback.tb_frame.f_code.co_filename
+            line = exception_traceback.tb_lineno
+            logger.error(
+                f"Exception occurred: {repr(exception_object)} of type {exception_type} in {file} line #{line}"
+            )
             result = False
 
         return result

etc/dbus-serialbattery/bms/jkbms_brn.py

@@ -460,19 +460,35 @@ async def asy_connect_and_scrape(self):
                         self.trigger_soc_reset = False
                         await self.reset_soc_jk(client)
                     await asyncio.sleep(0.01)
-            except Exception as err:
-                self.run = False
+            except Exception:
+                (
+                    exception_type,
+                    exception_object,
+                    exception_traceback,
+                ) = sys.exc_info()
+                file = exception_traceback.tb_frame.f_code.co_filename
+                line = exception_traceback.tb_lineno
                 logger.info(
-                    f"--> asy_connect_and_scrape(): error while connecting to bt: {err}"
+                    f"--> asy_connect_and_scrape(): error while connecting to bt: {repr(exception_object)} "
+                    + f"of type {exception_type} in {file} line #{line}"
                 )
+                self.run = False
             finally:
                 self.run = False
                 if client.is_connected:
                     try:
                         await client.disconnect()
-                    except Exception as err:
+                    except Exception:
+                        (
+                            exception_type,
+                            exception_object,
+                            exception_traceback,
+                        ) = sys.exc_info()
+                        file = exception_traceback.tb_frame.f_code.co_filename
+                        line = exception_traceback.tb_lineno
                         logger.info(
-                            f"--> asy_connect_and_scrape(): error while disconnecting: {err}"
+                            f"--> asy_connect_and_scrape(): error while disconnecting: {repr(exception_object)} "
+                            + f"of type {exception_type} in {file} line #{line}"
                         )
 
         logger.info("--> asy_connect_and_scrape(): Exit")

etc/dbus-serialbattery/bms/lifepower.py

@@ -5,6 +5,7 @@
 import utils
 from struct import unpack_from
 import re
+import sys
 
 
 class Lifepower(Battery):
@@ -28,8 +29,17 @@ def test_connection(self):
         result = False
         try:
             result = self.read_status_data()
-        except Exception as err:
-            logger.error(f"Unexpected {err=}, {type(err)=}")
+        except Exception:
+            (
+                exception_type,
+                exception_object,
+                exception_traceback,
+            ) = sys.exc_info()
+            file = exception_traceback.tb_frame.f_code.co_filename
+            line = exception_traceback.tb_lineno
+            logger.error(
+                f"Exception occurred: {repr(exception_object)} of type {exception_type} in {file} line #{line}"
+            )
             result = False
 
         return result

etc/dbus-serialbattery/bms/lltjbd.py

@@ -4,6 +4,7 @@
 import utils
 from struct import unpack_from, pack
 import struct
+import sys
 
 # Protocol registers
 REG_ENTER_FACTORY = 0x00
@@ -268,8 +269,17 @@ def test_connection(self):
                 and self.get_settings()
                 and self.refresh_data()
             )
-        except Exception as err:
-            logger.error(f"Unexpected {err=}, {type(err)=}")
+        except Exception:
+            (
+                exception_type,
+                exception_object,
+                exception_traceback,
+            ) = sys.exc_info()
+            file = exception_traceback.tb_frame.f_code.co_filename
+            line = exception_traceback.tb_lineno
+            logger.error(
+                f"Exception occurred: {repr(exception_object)} of type {exception_type} in {file} line #{line}"
+            )
             result = False
 
         return result
@@ -622,7 +632,7 @@ def validate_packet(data):
                 ">>> ERROR: Invalid response packet. Expected begin packet character 0xDD"
             )
         if status != 0x0:
-            logger.warn(">>> WARN: BMS rejected request. Status " + status)
+            logger.warn(">>> WARN: BMS rejected request. Status " + str(status))
             return False
         if len(data) != payload_length + 7:
             logger.error(

etc/dbus-serialbattery/bms/mnb.py

@@ -8,6 +8,7 @@
 from battery import Protection, Battery, Cell
 from utils import logger
 from bms.mnb_utils_max17853 import data_cycle, init_max
+import sys
 
 # from struct import *
 # from bms.mnb_test_max17853 import *  # use test for testing
@@ -97,8 +98,17 @@ def test_connection(self):
         result = False
         try:
             result = self.read_status_data()
-        except Exception as err:
-            logger.error(f"Unexpected {err=}, {type(err)=}")
+        except Exception:
+            (
+                exception_type,
+                exception_object,
+                exception_traceback,
+            ) = sys.exc_info()
+            file = exception_traceback.tb_frame.f_code.co_filename
+            line = exception_traceback.tb_lineno
+            logger.error(
+                f"Exception occurred: {repr(exception_object)} of type {exception_type} in {file} line #{line}"
+            )
             result = False
 
         return result

etc/dbus-serialbattery/bms/renogy.py

@@ -4,6 +4,7 @@
 import utils
 from struct import unpack
 import struct
+import sys
 
 
 class Renogy(Battery):
@@ -49,8 +50,17 @@ def test_connection(self):
             result = self.read_gen_data()
             # get first data to show in startup log
             result = result and self.refresh_data()
-        except Exception as err:
-            logger.error(f"Unexpected {err=}, {type(err)=}")
+        except Exception:
+            (
+                exception_type,
+                exception_object,
+                exception_traceback,
+            ) = sys.exc_info()
+            file = exception_traceback.tb_frame.f_code.co_filename
+            line = exception_traceback.tb_lineno
+            logger.error(
+                f"Exception occurred: {repr(exception_object)} of type {exception_type} in {file} line #{line}"
+            )
             result = False
 
         return result