Merge branch 'master' into feature/physical-value-rounding

Author: c4deszes

CHANGELOG.md

@@ -7,12 +7,19 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.26.0] - 2025-01-27
+
 ### Changed
 
+- Empty signal encoders are now allowed
+- Signals can now be associated with multiple frames, accessible under `signal.frames`
 - Physical values are now rounded to the nearest integer, rather than down
 
 ### Migration guide for 0.26.0
 
+- Newly written should be using `signal.frames` to determine the owners of a signal, for
+  compatibility reasons `signal.frame` is still set, but only when a signal is associated with one
+  frame
 - Physical values might be rounded the wrong way depending on the user's intention. This type of
 rounding should generally work better in values ranging from `0-X`, for example `49.9` is no longer
 rounded down to `49`. If this is undesired the user can in most cases offset the input by `0.5` and

ldfparser/grammars/ldf.lark

@@ -110,7 +110,7 @@ signal_group: ldf_identifier ":" ldf_integer "{" (ldf_identifier "," ldf_integer
 
 // LIN 2.1 Specification, section 9.2.6.1
 signal_encoding_types: "Signal_encoding_types" "{" (signal_encoding_type+) "}" 
-signal_encoding_type: ldf_identifier "{" (signal_encoding_logical_value | signal_encoding_physical_value | signal_encoding_bcd_value | signal_encoding_ascii_value)+ "}"
+signal_encoding_type: ldf_identifier "{" (signal_encoding_logical_value | signal_encoding_physical_value | signal_encoding_bcd_value | signal_encoding_ascii_value)* "}"
 signal_encoding_logical_value: "logical_value" "," ldf_integer ("," signal_encoding_text_value)? ";"
 signal_encoding_physical_value: "physical_value" "," ldf_integer "," ldf_integer "," ldf_float "," ldf_float ("," signal_encoding_text_value)? ";"
 signal_encoding_bcd_value: "bcd_value" ";"

ldfparser/parser.py

@@ -129,7 +129,11 @@ def _populate_ldf_frames(json: dict, ldf: LDF):
         ldf._unconditional_frames[frame['name']] = frame_obj
 
         for (_, signal) in signals.items():
-            signal.frame = frame_obj
+            if len(signal.frames) == 0:
+                signal.frame = frame_obj    # signal has only appeared in one frame
+            elif len(signal.frames) >= 1:
+                signal.frame = None         # signal is in multiple frames
+            signal.frames.append(frame_obj)
 
 def _populate_ldf_event_triggered_frames(json: dict, ldf: LDF):
     if "event_triggered_frames" not in json:

ldfparser/signal.py

@@ -31,7 +31,9 @@ def __init__(self, name: str, width: int, init_value: Union[int, List[int]]):
         self.publisher: 'LinNode' = None
         self.subscribers: List['LinNode'] = []
         self.encoding_type: 'LinSignalEncodingType' = None
-        self.frame: 'LinUnconditionalFrame' = None
+        self.frame: 'LinUnconditionalFrame' = None      # for compatibility reasons this is set
+                                                        # when the signal is added to only one frame
+        self.frames: List['LinUnconditionalFrame'] = []
 
     def __eq__(self, o: object) -> bool:
         if isinstance(o, LinSignal):

setup.cfg

@@ -1,2 +1,2 @@
 [metadata]
-version = 0.25.0
+version = 0.26.0