Merge branch 'fbx_keep_the_signal_start_position_as_in_dbc_file' of https://github.com/SabrineBH/canmatrix into fbx_keep_the_signal_start_position_as_in_dbc_file

Author: SabrineBH

.github/workflows/ci.yml

@@ -19,7 +19,7 @@ jobs:
         # os: [ubuntu-latest]
         experimental: [false]
         # python-version: ["2.7","3.4","3.5","3.6","3.7","3.8","3.9","3.10","3.11","3.12"]
-        python-version: ["3.7","3.8","3.9","3.10","3.11","3.12"]
+        python-version: ["3.8","3.9","3.10","3.11","3.12", "3.13"]
       fail-fast: false
     steps:
     - uses: actions/checkout@v4

appveyor.yml

@@ -7,7 +7,6 @@ skip_branch_with_pr: true
 
 environment:
   matrix:
-    - TOXENV: py37
     - TOXENV: py38
     - TOXENV: py39
     - TOXENV: py310

src/canmatrix/formats/arxml.py

@@ -1134,7 +1134,8 @@ def get_signals(signal_array, frame, ea, multiplex_id, float_factory, bit_offset
                     isignal_ub = canmatrix.Signal(ub_name,
                                                   start_bit=int(ub_start_bit.text, 0),
                                                   size = 1,
-                                                  is_signed = False) 
+                                                  is_signed = False,
+                                                  unit = "Unitless") 
                     frame.add_signal(isignal_ub)
 
                 group_id = group_id + 1
@@ -1389,7 +1390,8 @@ def get_signals(signal_array, frame, ea, multiplex_id, float_factory, bit_offset
                 new_signal_ub = canmatrix.Signal(ub_name,
                                                  start_bit = int(ub_start_bit.text, 0),
                                                  size = 1,
-                                                 is_signed = False)
+                                                 is_signed = False,
+                                                 unit = "Unitless")
                 frame.add_signal(new_signal_ub)
 
 
@@ -1631,19 +1633,21 @@ def get_frame(frame_triggering, ea, multiplex_translation, float_factory, header
             if freshness_tx_length is not None and int(freshness_tx_length, 0) > 0:
                 freshness_name = f"{ea.get_element_name(frame_elem)}_Freshness"
                 signal_freshness = canmatrix.Signal(freshness_name,
-                                                    start_bit = int(ipdu_length, 0)*8 + int(freshness_tx_length, 0) - 8,
+                                                    start_bit = int(ipdu_length, 0) * 8 + int(freshness_tx_length, 0) - 16,
                                                     size = int(freshness_tx_length, 0),
                                                     is_signed = False,
-                                                    is_little_endian = False) 
+                                                    is_little_endian = False,
+                                                    unit = "Unitless") 
                 new_frame.add_signal(signal_freshness)
 
             if auth_tx_length is not None and int(auth_tx_length, 0) > 0:
                 authinfo_name = f"{ea.get_element_name(frame_elem)}_AuthInfo"
                 signal_authinfo = canmatrix.Signal(authinfo_name,
-                                                start_bit = int(ipdu_length, 0)*8 + int(freshness_tx_length, 0) + int(auth_tx_length, 0) - 8,
+                                                start_bit = int(ipdu_length, 0) * 8 + int(freshness_tx_length, 0),
                                                 size = int(auth_tx_length, 0),
                                                 is_signed = False,
-                                                is_little_endian = False)
+                                                is_little_endian = False,
+                                                unit = "Unitless")
                 new_frame.add_signal(signal_authinfo)
 
         comment = ea.get_element_desc(frame_elem)

src/canmatrix/formats/dbc.py

@@ -223,6 +223,8 @@ def dump(in_db, f, **options):
         # remove "-" from frame names
         if compatibility:
             frame.name = re.sub("[^A-Za-z0-9]", whitespace_replacement, frame.name)
+            if frame.name[0].isdigit():
+                frame.name = "_" + frame.name
 
         duplicate_signal_totals = collections.Counter(normalized_names.values())
         duplicate_signal_counter = collections.Counter()  # type: typing.Counter[str]
@@ -459,7 +461,7 @@ def dump(in_db, f, **options):
         if frame.is_complex_multiplexed:
             for signal in frame.signals:
                 if signal.muxer_for_signal is not None:
-                    f.write(("SG_MUL_VAL_ %d %s %s " % (frame.arbitration_id.to_compound_integer(), signal.name, signal.muxer_for_signal)).encode(dbc_export_encoding, ignore_encoding_errors))
+                    f.write(("SG_MUL_VAL_ %d %s %s " % (frame.arbitration_id.to_compound_integer(), output_names[frame][signal], signal.muxer_for_signal)).encode(dbc_export_encoding, ignore_encoding_errors))
                     f.write((", ".join(["%d-%d" % (a, b) for a, b in signal.mux_val_grp])).encode(dbc_export_encoding, ignore_encoding_errors))
 
                     f.write(";\n".encode(dbc_export_encoding, ignore_encoding_errors))