0.6.4

- fixed PGN transmitter
- changed build and publishing system to uv

Author: pullthebox

.python-version

@@ -0,0 +1 @@
+3.13

README.md

@@ -28,22 +28,21 @@ A CAN bus J1939 controller simulator.
 ![PCAN-View demo screenshot](https://raw.githubusercontent.com/cfsok/akrocansim/main/docs/images/demo_1_PCAN-View.png)
 
 ## Installation
-Python 3.11 (64-bit) or higher is required.
+1. Install uv, see https://docs.astral.sh/uv/getting-started/installation/#installing-uv
+2. `uv tool install akrocansim`
 
+## Execution
 ```
-pip install akrocansim
+akrocansim
 ```
 
+
 ## Prerequisites
 - A hardware CAN interface supported by python-can,
 see https://python-can.readthedocs.io/en/v4.3.1/interfaces.html.
 - A version of J1939 Digital Annex (J1939DA) from SAE International, see https://www.sae.org/standards/?search=j1939DA.
 - A way to convert `.xls` to `.xlsx` if your copy of the J1939DA is in `.xls` format.
 
-## Usage
-```
-python -m akrocansim
-```
 
 Upon initial run, a folder named `akrocansim` is created in your home folder hosting a starting configuration file.
 

pyproject.toml

@@ -1,31 +1,35 @@
-[build-system]
-requires = ["flit_core >=3.2,<4"]
-build-backend = "flit_core.buildapi"
-
 [project]
 name = "akrocansim"
 dynamic = ["version", "description"]
-authors = [{name = "Socrates Vlassis", email = "[email protected]"}]
+authors = [{name = "pullthebox", email = "[email protected]"}]
 readme = "README.md"
 license = {file = "LICENSE"}
 classifiers = [
-    "Programming Language :: Python :: 3",
-    "Programming Language :: Python :: 3.11",
-    "Programming Language :: Python :: 3.12",
+    "Programming Language :: Python :: 3.13",
     "License :: OSI Approved :: MIT License",
     "Development Status :: 4 - Beta",
     "Topic :: Software Development :: Embedded Systems",
     "Topic :: Software Development :: Embedded Systems :: Controller Area Network (CAN)",
     "Topic :: Software Development :: Embedded Systems :: Controller Area Network (CAN) :: J1939"
 ]
 keywords = ["J1939", "CAN bus"]
-requires-python = ">=3.11"
+requires-python = ">=3.13"
 dependencies = [
-    "dearpygui~=1.10.1",
-    "python-can~=4.3.1",
-    "openpyxl~=3.1.2",
-    "semver~=3.0.2"
+    "dearpygui==2.0.0",
+    "python-can==4.5.0",
+    "openpyxl==3.1.5",
+    "semver==3.0.4",
 ]
 
+[project.scripts]
+akrocansim = "akrocansim:main"
+
 [project.urls]
 Home = "https://github.com/cfsok/akrocansim"
+
+[build-system]
+requires = ["hatchling"]
+build-backend = "hatchling.build"
+
+[tool.hatch.version]
+path = "src/akrocansim/__init__.py"

requirements.txt

@@ -1,4 +1,9 @@
 """akrocansim is a CAN bus J1939 controller simulator"""
 
-__version__ = '0.6.1'
+__version__ = '0.6.4'
 __app_name__ = 'akro CAN simulator'
+
+from . import gui
+
+def main() -> None:
+    gui.AkrocansimGui()

src/akrocansim/__init__.py

@@ -3,13 +3,10 @@
 import can
 
 
-_TX_MODE = 0
-_TX_MODE__STOP = 0  # global, local
-_TX_MODE__TX_CONT = 1  # global, local
-_TX_MODE__PER_PGN = 2  # global only
-_TX_MODE__TX_ONCE = 3  # local only
-_TX_RATE_SEC = 1
-_DATA = 2
+_INDIVIDUAL_TX_MODE__TX_CONT = 0
+_INDIVIDUAL_TX_MODE__TX_ONCE = 1
+_TX_RATE_SEC = 2
+_DATA = 3
 
 
 class Transmitter:
@@ -18,9 +15,12 @@ def __init__(self, J1939: dict):
         self.bus: can.BusABC = None
         self.PGNs_pending_tx = {}
 
-        self.global_tx_mode = _TX_MODE__STOP  # _TX_MODE__STOP, _TX_MODE__TX_CONT, _TX_MODE__PER_PGN
+        self.global_tx_mode__stop = True
+        self.global_tx_mode__cont = False
+        self.global_tx_mode__per_pgn = False
         self.tx_CAN_IDs = {}  # {(CAN_ID: int, is_extended: bool): {
-                              #     _TX_MODE: _TX_MODE__STOP, _TX_MODE__TX_CONT, _TX_MODE__TX_ONCE
+                              #     _INDIVIDUAL_TX_MODE__TX_CONT: bool,
+                              #     _INDIVIDUAL_TX_MODE__TX_ONCE: bool,
                               #     _TX_RATE_SEC: #,
                               #     _DATA: list
                               # }
@@ -32,7 +32,8 @@ def register_tx_PGN(self, *, pgn, priority, source_address, tx_rate_ms):
         self.J1939_CAN_IDs[pgn] = (can_id, True)
         tx_rate_sec = tx_rate_ms / 1000
         self.tx_CAN_IDs[(can_id, True)] = {
-            _TX_MODE: _TX_MODE__STOP,
+            _INDIVIDUAL_TX_MODE__TX_CONT: False,
+            _INDIVIDUAL_TX_MODE__TX_ONCE: False,
             _TX_RATE_SEC: tx_rate_sec,
             _DATA: [0 for _ in range(self._J1939[pgn]['PGN Data Length'])]
         }
@@ -43,42 +44,49 @@ def send_periodic(self, can_id, is_extended):
 
         while True:
             time.sleep(signal_spec[_TX_RATE_SEC])
-            if self.global_tx_mode == _TX_MODE__TX_CONT or signal_spec[_TX_MODE] == _TX_MODE__TX_CONT:
+            if self.global_tx_mode__cont or (self.global_tx_mode__per_pgn and signal_spec[_INDIVIDUAL_TX_MODE__TX_CONT]):
+                # transmit can message with 'can_id' this cycle
                 pass
-            elif self.global_tx_mode in [_TX_MODE__STOP, _TX_MODE__PER_PGN] \
-                    and signal_spec[_TX_MODE] == _TX_MODE__TX_ONCE:
-                signal_spec[_TX_MODE] = _TX_MODE__STOP
+            elif signal_spec[_INDIVIDUAL_TX_MODE__TX_ONCE]:
+                # transmit can message with 'can_id' this cycle and stop
+                signal_spec[_INDIVIDUAL_TX_MODE__TX_ONCE] = False
             else:
+                # do not transmit can message with 'can_id' this cycle
                 continue
 
             if self.bus is not None:
                 try:
-                    self.bus.send(can.Message(arbitration_id=can_id, is_extended_id=is_extended,
-                                              data=signal_spec[_DATA]))
+                    self.bus.send(can.Message(arbitration_id=can_id, is_extended_id=is_extended, data=signal_spec[_DATA]))
                 except can.CanOperationError:
                     pass
 
     def set_tx_mode_stop(self, pgn=None):
-        if pgn is None:
-            self.global_tx_mode = _TX_MODE__STOP
-        else:
-            self.tx_CAN_IDs[self.J1939_CAN_IDs[pgn]][_TX_MODE] = _TX_MODE__STOP
+        if pgn is None:  # global
+            self.global_tx_mode__stop = True
+            self.global_tx_mode__cont = False
+            self.global_tx_mode__per_pgn = False
+        else:  # individual
+            self.tx_CAN_IDs[self.J1939_CAN_IDs[pgn]][_INDIVIDUAL_TX_MODE__TX_CONT] = False
 
     def set_tx_mode_continuous(self, pgn=None):
-        if pgn is None:
-            self.global_tx_mode = _TX_MODE__TX_CONT
-        else:
-            self.tx_CAN_IDs[self.J1939_CAN_IDs[pgn]][_TX_MODE] = _TX_MODE__TX_CONT
+        if pgn is None:  # global
+            self.global_tx_mode__stop = False
+            self.global_tx_mode__cont = True
+            self.global_tx_mode__per_pgn = False
+        else:  # individual
+            self.tx_CAN_IDs[self.J1939_CAN_IDs[pgn]][_INDIVIDUAL_TX_MODE__TX_CONT] = True
 
     def set_tx_mode_per_PGN(self):
-        self.global_tx_mode = _TX_MODE__PER_PGN
+        self.global_tx_mode__stop = False
+        self.global_tx_mode__cont = False
+        self.global_tx_mode__per_pgn = True
 
     def set_tx_once(self, pgn=None):
-        if pgn is None:
+        if pgn is None:  # global
             for signal_spec in self.tx_CAN_IDs.values():
-                signal_spec[_TX_MODE] = _TX_MODE__TX_ONCE
-        else:
-            self.tx_CAN_IDs[self.J1939_CAN_IDs[pgn]][_TX_MODE] = _TX_MODE__TX_ONCE
+                signal_spec[_INDIVIDUAL_TX_MODE__TX_ONCE] = True
+        else:  # individual
+            self.tx_CAN_IDs[self.J1939_CAN_IDs[pgn]][_INDIVIDUAL_TX_MODE__TX_ONCE] = True
 
     def modify_pgn_tx_rate(self, pgn, tx_rate_ms):
         tx_rate_sec = tx_rate_ms / 1000