cantools 44.2.0__tar.gz → 44.2.1__tar.gz

{cantools-44.2.0 → cantools-44.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cantools
-Version: 44.2.0
+Version: 44.2.1
 Summary: CAN BUS tools.
 Author-email: Erik Moqvist <erik.moqvist@gmail.com>
 License: MIT

{cantools-44.2.0 → cantools-44.2.1}/src/cantools/database/can/formats/dbc/dbc_writer.py

@@ -156,6 +156,14 @@ ATTRIBUTE_DEFINITION_GENSIGSTARTVALUE = DbcAttributeDefinition[float](
     minimum=0,
     maximum=100000000000)
 
+ATTRIBUTE_DEFINITION_SPN = DbcAttributeDefinition(
+    name='SPN',
+    default_value=0,
+    kind='SG_',
+    type_name='INT',
+    minimum=0,
+    maximum=524287)
+
 
 class LongNamesConverter:
     def __init__(self, long_names: list[str]) -> None:
@@ -549,6 +557,12 @@ def _need_startval_def(database: InternalDatabase) -> bool:
                for s in m.signals)
 
 
+def _need_spn_def(database: InternalDatabase) -> bool:
+    return any(s.spn is not None
+               for m in database.messages
+               for s in m.signals)
+
+
 def _need_cycletime_def(database: InternalDatabase) -> bool:
     # If the user has added cycle times to a database which didn't start with them,
     # we need to add the global attribute definition so the output DBC is valid
@@ -580,6 +594,8 @@ def _dump_attribute_definitions(database: InternalDatabase) -> list[str]:
         definitions['GenMsgCycleTime'] = ATTRIBUTE_DEFINITION_GENMSGCYCLETIME
     if 'GenSigStartValue' not in definitions and _need_startval_def(database):
         definitions['GenSigStartValue'] = ATTRIBUTE_DEFINITION_GENSIGSTARTVALUE
+    if 'SPN' not in definitions and _need_spn_def(database):
+        definitions['SPN'] = ATTRIBUTE_DEFINITION_SPN
 
     # create 'Baudrate' attribute definition
     if len(database.buses) == 1 and database.buses[0].baudrate is not None:
@@ -793,6 +809,17 @@ def _dump_attributes(database: InternalDatabase, sort_signals: type_sort_signals
                     value=float(signal.raw_initial),
                     definition=ATTRIBUTE_DEFINITION_GENSIGSTARTVALUE)
 
+            # synchronize the attribute for the J1939 suspect parameter
+            # number with the SPN specified by the signal object
+            spn_def = database.dbc.attribute_definitions.get('SPN')
+            if signal.spn is None:
+                sig_attributes.pop('SPN', None)
+            elif spn_def is not None and ('SPN' in sig_attributes
+                                          or signal.spn != spn_def.default_value):
+                sig_attributes['SPN'] = DbcAttribute(
+                    value=signal.spn,
+                    definition=dbc_assert_type(spn_def, DbcAttributeDefinition))
+
             # output all signal attributes
             for attribute in sig_attributes.values():
                 attributes.append(('signal', attribute, None, message, signal, None))

{cantools-44.2.0 → cantools-44.2.1}/src/cantools.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: cantools
-Version: 44.2.0
+Version: 44.2.1
 Summary: CAN BUS tools.
 Author-email: Erik Moqvist <erik.moqvist@gmail.com>
 License: MIT

cantools-44.2.1/src/cantools.egg-info/scm_version.json

@@ -0,0 +1,8 @@
+{
+  "tag": "44.2.1",
+  "distance": 0,
+  "node": "g29bc44be34029f319dc9f31473860f11da51e59a",
+  "dirty": false,
+  "branch": "HEAD",
+  "node_date": "2026-10-07"
+}

{cantools-44.2.0 → cantools-44.2.1}/tests/test_database.py

@@ -154,6 +154,26 @@ class CanToolsDatabaseTest(unittest.TestCase):
             actual_db.get_message_by_name('m').get_signal_by_name('s').raw_initial,
             sig.raw_initial)
 
+    def test_dbc_dump_spn(self):
+        sig = Signal(name='s', start=0, length=8, spn=190)
+        msg = Message(frame_id=0x42, name='m', length=8, signals=[sig])
+        expected_db = cantools.database.Database(messages=[msg])
+
+        actual_db = cantools.database.Database()
+        actual_db.add_dbc_string(expected_db.as_dbc_string())
+
+        self.assertEqual(
+            actual_db.get_message_by_name('m').get_signal_by_name('s').spn,
+            sig.spn)
+
+        # changed SPNs of a loaded database are dumped as well
+        db = cantools.database.load_file('tests/files/dbc/j1939.dbc')
+        db.messages[0].signals[0].spn = 1234
+        db.messages[1].signals[0].spn = 4321
+        db = cantools.database.load_string(db.as_dbc_string(), 'dbc')
+        self.assertEqual(db.messages[0].signals[0].spn, 1234)
+        self.assertEqual(db.messages[1].signals[0].spn, 4321)
+
     def test_motohawk(self):
         filename = 'tests/files/dbc/motohawk.dbc'
 

cantools-44.2.0/src/cantools.egg-info/scm_version.json

@@ -1,8 +0,0 @@
-{
-  "tag": "44.2.0",
-  "distance": 0,
-  "node": "g10cf2e3bce84268f93e36c7d0ca79b54db63efa5",
-  "dirty": false,
-  "branch": "HEAD",
-  "node_date": "2026-10-06"
-}