skip inforead for NumericConverter16Template without a TelegramNr

zivillian · Aug 25, 2024 · 90a9f42 · 90a9f42
1 parent 69cde0e
commit 90a9f42
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 9 deletions.
diff --git a/src/ism7mqtt/ISM7/Xml/BM2DateConverterTemplate.cs b/src/ism7mqtt/ISM7/Xml/BM2DateConverterTemplate.cs
@@ -36,13 +36,14 @@ public override JsonValue GetValue()
 
         public override IEnumerable<InfoWrite> GetWrite(string value)
         {
+            if (!TelegramNr.HasValue) yield break;
             var date = DateOnly.Parse(value);
             var bytes = date.Day - 1;
             bytes |= (date.Month - 1) << 5;
             bytes |= (date.Year - 2000) << 9;
             var low = (byte)(bytes & 0xff);
             var high = (byte)(bytes >> 8);
-            yield return new InfoWrite{InfoNumber = TelegramNr, DBLow = $"0x{low:X2}", DBHigh = $"0x{high:X2}"};
+            yield return new InfoWrite{InfoNumber = TelegramNr.Value, DBLow = $"0x{low:X2}", DBHigh = $"0x{high:X2}"};
         }
 
         public override ConverterTemplateBase Clone()

diff --git a/src/ism7mqtt/ISM7/Xml/BM2TimeConverterTemplate.cs b/src/ism7mqtt/ISM7/Xml/BM2TimeConverterTemplate.cs
@@ -27,10 +27,11 @@ public override JsonValue GetValue()
 
         public override IEnumerable<InfoWrite> GetWrite(string value)
         {
+            if (!TelegramNr.HasValue) yield break;
             var time = TimeSpan.Parse(value);
             var high = time.Hours;
             var low = time.Minutes;
-            yield return new InfoWrite{InfoNumber = TelegramNr, DBLow = $"0x{low:X2}", DBHigh = $"0x{high:X2}"};
+            yield return new InfoWrite{InfoNumber = TelegramNr.Value, DBLow = $"0x{low:X2}", DBHigh = $"0x{high:X2}"};
         }
 
         public override ConverterTemplateBase Clone()

diff --git a/src/ism7mqtt/ISM7/Xml/NumericConverter16Template.cs b/src/ism7mqtt/ISM7/Xml/NumericConverter16Template.cs
@@ -57,6 +57,7 @@ public override JsonValue GetValue()
 
         public override IEnumerable<InfoWrite> GetWrite(string value)
         {
+            if (!TelegramNr.HasValue) yield break;
             ushort data;
             switch (Type)
             {
@@ -94,7 +95,7 @@ public override IEnumerable<InfoWrite> GetWrite(string value)
                 default:
                     throw new NotImplementedException($"type '{Type}' for CTID '{CTID}' is not yet implemented");
             }
-            yield return new InfoWrite{InfoNumber = TelegramNr, DBLow = $"0x{(data & 0xff):X2}", DBHigh = $"0x{(data >> 8):X2}"};
+            yield return new InfoWrite{InfoNumber = TelegramNr.Value, DBLow = $"0x{(data & 0xff):X2}", DBHigh = $"0x{(data >> 8):X2}"};
         }
 
         public override ConverterTemplateBase Clone()

diff --git a/src/ism7mqtt/ISM7/Xml/SingleTelegramConverterTemplateBase.cs b/src/ism7mqtt/ISM7/Xml/SingleTelegramConverterTemplateBase.cs
@@ -7,16 +7,20 @@ namespace ism7mqtt.ISM7.Xml
     public abstract class SingleTelegramConverterTemplateBase : ConverterTemplateBase
     {
         [XmlElement("TelegramNr")]
-        public ushort TelegramNr { get; set; }
+        public ushort? TelegramNr { get; set; }
 
-        public override IEnumerable<InfoRead> InfoReads => new[]
+        public override IEnumerable<InfoRead> InfoReads
         {
-            new InfoRead
+            get
             {
-                InfoNumber = TelegramNr,
-                ServiceNumber = ServiceReadNumber ?? -1
+                if (!TelegramNr.HasValue) yield break;
+                yield return new InfoRead
+                {
+                    InfoNumber = TelegramNr.Value,
+                    ServiceNumber = ServiceReadNumber ?? -1
+                };
             }
-        };
+        }
 
         public override void AddTelegram(ushort telegram, byte low, byte high)
         {