diff --git a/CHANGELOG.md b/CHANGELOG.md index 8de3dac8..ab19d959 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -11,6 +11,7 @@ * Added: Config file by @ppuetsch * Added: Create empty `config.ini` for easier user usage by @mr-manuel * Added: Cronjob to restart Bluetooth service every 12 hours by @mr-manuel +* Added: Daly BMS read capacity https://github.com/Louisvdw/dbus-serialbattery/pull/594 by transistorgit * Added: Driver uninstall script by @mr-manuel * Added: Fix for Venus OS >= v3.00~14 showing unused items https://github.com/Louisvdw/dbus-serialbattery/issues/469 by @mr-manuel * Added: HighInternalTemperature alarm (MOSFET) for JKBMS by @mr-manuel @@ -41,6 +42,7 @@ * Changed TimeToSoc default value `TIME_TO_SOC_VALUE_TYPE` from `Both seconds and time string " [d h m s]"` to `1 Seconds` by @mr-manuel * Changed TimeToSoc description by @mr-manuel * Changed value positions, added groups and much clearer descriptions by @mr-manuel +* Changed: Disabled ANT BMS by default https://github.com/Louisvdw/dbus-serialbattery/issues/479 by @mr-manuel * Changed: Fix for https://github.com/Louisvdw/dbus-serialbattery/issues/239 by @mr-manuel * Changed: Fix for https://github.com/Louisvdw/dbus-serialbattery/issues/311 by @mr-manuel * Changed: Fix for https://github.com/Louisvdw/dbus-serialbattery/issues/351 by @mr-manuel diff --git a/etc/dbus-serialbattery/README.md b/etc/dbus-serialbattery/README.md index 127c1df8..de6c727e 100644 --- a/etc/dbus-serialbattery/README.md +++ b/etc/dbus-serialbattery/README.md @@ -1,2 +1,5 @@ # dbus-serialbattery -See [README on GitHub](https://github.com/Louisvdw/dbus-serialbattery/blob/master/README.md) \ No newline at end of file + +* See [README](https://github.com/Louisvdw/dbus-serialbattery/blob/master/README.md) on GitHub + +* See [Documentation](https://louisvdw.github.io/dbus-serialbattery/) on GitHub Pages diff --git a/etc/dbus-serialbattery/bms/ant.py b/etc/dbus-serialbattery/bms/ant.py index fde6d612..124f036f 100644 --- a/etc/dbus-serialbattery/bms/ant.py +++ b/etc/dbus-serialbattery/bms/ant.py @@ -1,4 +1,8 @@ # -*- coding: utf-8 -*- + +# disable ANT BMS by default as it causes other issues but can be enabled manually +# https://github.com/Louisvdw/dbus-serialbattery/issues/479 + from battery import Battery from utils import read_serial_data, logger import utils diff --git a/etc/dbus-serialbattery/bms/daly.py b/etc/dbus-serialbattery/bms/daly.py index 725ec4e8..759a7556 100644 --- a/etc/dbus-serialbattery/bms/daly.py +++ b/etc/dbus-serialbattery/bms/daly.py @@ -372,10 +372,7 @@ def read_capacity(self, ser): logger.warning("read_capacity") return False - ( - capacity, - cell_volt - ) = unpack_from(">LL", capa_data) + (capacity, cell_volt) = unpack_from(">LL", capa_data) self.capacity = capacity / 1000 return True diff --git a/etc/dbus-serialbattery/bms/sinowealth.py b/etc/dbus-serialbattery/bms/sinowealth.py index 263523fe..7a9d9fdb 100755 --- a/etc/dbus-serialbattery/bms/sinowealth.py +++ b/etc/dbus-serialbattery/bms/sinowealth.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- -# remove Sinowealth by default as it causes other issues but can be enabled manually +# disable Sinowealth by default as it causes other issues but can be enabled manually # https://github.com/Louisvdw/dbus-serialbattery/commit/7aab4c850a5c8d9c205efefc155fe62bb527da8e from battery import Battery, Cell diff --git a/etc/dbus-serialbattery/dbus-serialbattery.py b/etc/dbus-serialbattery/dbus-serialbattery.py index 34e80d2f..30c6eb52 100644 --- a/etc/dbus-serialbattery/dbus-serialbattery.py +++ b/etc/dbus-serialbattery/dbus-serialbattery.py @@ -22,7 +22,6 @@ from battery import Battery # import battery classes -from bms.ant import Ant from bms.daly import Daly from bms.ecs import Ecs from bms.hlpdatabms4s import HLPdataBMS4S @@ -32,11 +31,11 @@ from bms.renogy import Renogy from bms.seplos import Seplos +# from bms.ant import Ant # from bms.mnb import MNB # from bms.sinowealth import Sinowealth supported_bms_types = [ - {"bms": Ant, "baud": 19200}, {"bms": Daly, "baud": 9600, "address": b"\x40"}, {"bms": Daly, "baud": 9600, "address": b"\x80"}, {"bms": Ecs, "baud": 19200}, @@ -47,6 +46,7 @@ {"bms": Renogy, "baud": 9600, "address": b"\x30"}, {"bms": Renogy, "baud": 9600, "address": b"\xF7"}, {"bms": Seplos, "baud": 19200}, + # {"bms": Ant, "baud": 19200}, # {"bms": MNB, "baud": 9600}, # {"bms": Sinowealth}, ] diff --git a/etc/dbus-serialbattery/utils.py b/etc/dbus-serialbattery/utils.py index 8729e288..d81c33ab 100644 --- a/etc/dbus-serialbattery/utils.py +++ b/etc/dbus-serialbattery/utils.py @@ -36,7 +36,7 @@ def _get_list_from_config( # Constants - Need to dynamically get them in future DRIVER_VERSION = "1.0" -DRIVER_SUBVERSION = ".0-jkbms_ble (20230428)" +DRIVER_SUBVERSION = ".0-jkbms_ble (20230429)" zero_char = chr(48) degree_sign = "\N{DEGREE SIGN}"