Make CAN bus speed configurable

Fixes #92
mr-manuel · Oct 17, 2024 · 00e1fbc · 00e1fbc
1 parent 8ccaed3
commit 00e1fbc
Show file tree

Hide file tree

Showing 4 changed files with 12 additions and 3 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -64,6 +64,7 @@
 
 ## v1.5.x
 * Added: Daly BMS - Connect multiple BMS to the same RS485 port by @CaptKrisp
+* Added: Possibility to change the CAN bus speed by @mr-manuel
 * Changed: Rewritten code for external current sensor and fixed https://github.com/mr-manuel/venus-os_dbus-serialbattery/issues/60 by @mr-manuel
 
 ## v1.4.20240928

diff --git a/etc/dbus-serialbattery/config.default.ini b/etc/dbus-serialbattery/config.default.ini
@@ -133,6 +133,8 @@ BLUETOOTH_USE_USB = False
 ; Example for multiple CAN ports:
 ; CAN_PORT = can0, can8, can9
 CAN_PORT =
+; Specify the CAN speed in kbps
+CAN_SPEED = 250
 
 
 ; --------- Modbus (multiple BMS on one serial adapter) ---------

diff --git a/etc/dbus-serialbattery/dbus-serialbattery.py b/etc/dbus-serialbattery/dbus-serialbattery.py
@@ -270,8 +270,8 @@ def get_port() -> str:
 
  # only try CAN BMS on CAN port
  supported_bms_types = [
- {"bms": Daly_Can, "baud": 250000},
- {"bms": Jkbms_Can, "baud": 250000},
+ {"bms": Daly_Can, "baud": utils.CAN_SPEED},
+ {"bms": Jkbms_Can, "baud": utils.CAN_SPEED},
  ]
 
  expected_bms_types = [

diff --git a/etc/dbus-serialbattery/utils.py b/etc/dbus-serialbattery/utils.py
@@ -14,7 +14,7 @@
 
 
 # CONSTANTS
-DRIVER_VERSION: str = "1.5.20241006dev"
+DRIVER_VERSION: str = "1.5.20241016dev"
 """
 current version of the driver
 """
@@ -147,6 +147,12 @@ def _get_list_from_config(
  )
  SOC_RESET_VOLTAGE = MAX_CELL_VOLTAGE
 
+# --------- CAN BMS ---------
+CAN_SPEED: int = int(config["DEFAULT"]["CAN_SPEED"]) * 1000
+"""
+Speed of the CAN bus in bps
+"""
+
 # --------- Modbus (multiple BMS on one serial adapter) ---------
 MODBUS_ADDRESSES: list = _get_list_from_config(
  "DEFAULT", "MODBUS_ADDRESSES", lambda v: str(v)