add Zs6, Zs13, Zusatzlicht, Kennlicht

Author: laugengebaeck

yaramo/additional_signal.py

@@ -130,6 +130,17 @@ def __init__(self, symbols: List["AdditionalSignalSymbolZs3v"], type: Additional
     def __str__(self):
         return "AdditionalSignalZs3v(kind=Zs3v" + ", symbols=" + str(self.symbols) + ", type=" + str(self.type) + ")"
 
+class AdditionalSignalZs6(AdditionalSignal):
+    def __init__(self, symbols: List["AdditionalSignalSymbolZs6"], **kwargs) -> None:
+        super().__init__(**kwargs)
+        self.symbols = symbols
+
+    def __str__(self):
+        return "AdditionalSignalZs6(kind=Zs6" + ", symbols=" + str(self.symbols) + ")"
+
+    class AdditionalSignalSymbolZs6(Enum):
+        Zs6 = 0
+
 class AdditionalSignalZs7(AdditionalSignal):
     def __init__(self, symbols: List["AdditionalSignalSymbolZs7"], **kwargs) -> None:
         super().__init__(**kwargs)
@@ -139,4 +150,15 @@ def __str__(self):
         return "AdditionalSignalZs7(kind=Zs7" + ", symbols=" + str(self.symbols) + ")"
 
     class AdditionalSignalSymbolZs7(Enum):
-        Zs7 = 0
+        Zs7 = 0
+
+class AdditionalSignalZs13(AdditionalSignal):
+    def __init__(self, symbols: List["AdditionalSignalSymbolZs13"], **kwargs) -> None:
+        super().__init__(**kwargs)
+        self.symbols = symbols
+
+    def __str__(self):
+        return "AdditionalSignalZs13(kind=Zs13" + ", symbols=" + str(self.symbols) + ")"
+
+    class AdditionalSignalSymbolZs13(Enum):
+        Zs13 = 0

yaramo/signal.py

@@ -81,8 +81,12 @@ class SignalState(Enum):
     ZS2V = auto()
     ZS3 = auto()
     ZS3V = auto()
+    ZS6 = auto()
     ZS7 = auto()
+    ZS13 = auto()
     ZLO = auto()
+    ZLU = auto()
+    KL = auto()
     LF7 = auto()
     RA10 = auto()
     RA12 = auto()
@@ -116,6 +120,10 @@ def get_state_by_string(cls, state_string: str):
             return SignalState.MS_GE_D
         if state_string == "verkuerzter Abstand des Bremswegs, weißes Zusatzlicht über Signallicht":
             return SignalState.ZLO
+        if state_string == "Vorsignalwiederholer, weißes Zusatzlicht unter Signallicht":
+            return SignalState.ZLU
+        if state_string == "ein weißes Licht anstelle der sonst vorgesehenen Signalbilder":
+            return SignalState.KL
         logging.warning(
             f"The Signal State with the string {state_string} does not exist. Returning None instead"
         )