Merged code base with CanBus improvements

ctuesley · ctuesley · commit 4e109af342dd · 2019-07-10T01:00:42.000+10:00
diff --git a/ArrowPoint-CANbus-Test/ArrowPointCANBusTest.csproj b/ArrowPoint-CANbus-Test/ArrowPointCANBusTest.csproj
@@ -67,9 +67,11 @@
     <Content Include="Test-Data\Configuration\CanConfig.xml">
       <SubType>Designer</SubType>
     </Content>
+    <Content Include="Test-Data\Configuration\dbc standard.txt" />
   </ItemGroup>
   <ItemGroup>
     <None Include="packages.config" />
+    <None Include="Test-Data\Configuration\WaveSculter.dbc" />
   </ItemGroup>
   <Import Project="$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets" Condition="Exists('$(VSToolsPath)\TeamTest\Microsoft.TestTools.targets')" />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
diff --git a/ArrowPoint-CANbus-Test/Test-Data/Configuration/dbc standard.txt b/ArrowPoint-CANbus-Test/Test-Data/Configuration/dbc standard.txt
@@ -0,0 +1,114 @@
+﻿# Scope
+This document doesn't claim to specifiy the complete [Vector DBC standard](http://vector.com/vi_candb_en.html)  
+
+# Format description
+`<...>`: Required field  
+`[...]`: Optional field  
+`  |  `: Or (eg. <A|B>)  
+
+# Supported Keywords
+## VERSION
+Version identifier of the DBC file.  
+Format: `VERSION "<VersionIdentifier>"`  
+
+## BS_
+Bus configuration.  
+Format:: `BS_: <Speed>`  
+Speed in kBit/s  
+
+## BU_
+List of all CAN-Nodes, seperated by whitespaces.  
+
+## BO_
+Message definition.  
+Format: `BO_ <CAN-ID> <MessageName>: <MessageLength> <SendingNode>`  
+MessageLength in bytes.  
+
+## SG_
+Signal definition.  
+Format: `SG_ <SignalName> [M|m<MultiplexerIdentifier>] : <StartBit>|<Length>@<Endianness><Signed> (<Factor>,<Offset>) [<Min>|<Max>] "[Unit]" [ReceivingNodes]`  
+Length in bits.  
+Signed: + = unsigned; - = signed  
+Endianness: 1 = little-endian, Intel; 0 = big-endian, Motorola  
+M: If M than this signals contains a multiplexer identifier.  
+MultiplexerIdentifier: Signal definition is only used if the value of the multiplexer signal equals to this value.  
+
+## CM_
+Description field.  
+Format: `CM_ [<BU_|BO_|SG_> [CAN-ID] [SignalName]] "<DescriptionText>";`  
+
+## BA_DEF_
+Attribute definition.  
+Format: `BA_DEF_ [BU_|BO_|SG_] "<AttributeName>" <DataType> [Config];`  
+
+DataType | Description         | Config format
+---------|---------------------|----------------
+INT      | integer             | `<min> <max>`
+FLOAT    | floating point      | `<min> <max>`
+STRING   | string              | 
+ENUM     | enumeration         | `"<Value0>","<Value1>"...`
+
+## BA_DEF_DEF_
+Attribute default value  
+Format: `BA_DEF_DEF_ "<AttributeName>" ["]<DefaultValue>["];`
+
+## BA_
+Attribute  
+Format: `BA_ "<AttributeName>" [BU_|BO_|SG_] [Node|CAN-ID] [SignalName] <AttributeValue>;`
+
+## VAL_
+Value definitions for signals.  
+Format: `VAL_ <CAN-ID> <SignalsName> <ValTableName|ValTableDefinition>;`
+
+## VAL_TABLE_
+Value table definition for signals.  
+Format: `VAL_TABLE_ <ValueTableName> <ValueTableDefinition>;`  
+ValueTableDefinition: List of `IntValue "StringValue"` Pairs, seperated by whitespaces
+
+# Attributes
+In this sections are standard attributes used by [CANpy](https://github.com/stefanhoelzl/CANpy) defined. The attributes can be overwritten within a DBC file.
+## Message Attributes
+
+### GenMsgSendType
+Defines the send type of a message.  
+Supported types:  
+* cyclic  
+* triggered  
+* cyclicIfActive  
+* cyclicAndTriggered  
+* cyclicIfActiveAndTriggered  
+* none  
+Definition: `BA_DEF BO_ "GenMsgSendType" ENUM "cyclic","triggered","cyclicIfActive","cyclicAndTriggered","cyclicIfActiveAndTriggered","none"`  
+Default: none
+Definition: `BA_DEF_DEF "GenMsgSendType" "none"`
+
+### GenMsgCycleTime
+Defines the cycle time of a message in ms.  
+Definition: `BA_DEF BO_ "GenMsgCycleTime" INT 0 0`  
+Default: 0  
+Definition: `BA_DEF_DEF "GenMsgCycleTime" 0`  
+
+### GenMsgStartDelayTime
+Defines the allowed delay after startup this message must occure the first time in ms.  
+Definition: `BA_DEF BO_ "GenMsgStartDelayTime" INT 0 0`  
+Default: 0 (=GenMsgCycleTime)  
+Definition: `BA_DEF_DEF "GenMsgStartDelayTime" 0`  
+
+### GenMsgDelayTime
+Defines the allowed delay for a message in ms.  
+Definition: `BA_DEF BO_ "GenMsgDelayTime" INT 0 0`  
+Default: 0  
+Definition: `BA_DEF_DEF "GenMsgDelayTime" 0`  
+
+## Signal Attributes
+### GenSigStartValue
+Defines the value as long as no value is set/received for this signal.  
+Definition: `BA_DEF SG_ "GenSigStartValue" INT 0 0`  
+Default: 0  
+Definition: `BA_DEF_DEF "GenSigStartValue" 0`  
+
+# Sources
+http://pisnoop.s3.amazonaws.com/snoop_help_dbc.htm  
+http://www.racelogic.co.uk/_downloads/vbox/Application_Notes/CAN%20Format%20for%20VBOXII%20and%20PRO%20v4.pdf  
+https://hackage.haskell.org/package/ecu-0.0.8/src/src/j1939_utf8.dbc  
+http://www.ingenieurbuerobecker.de/downloads/CANtool_Manual.pdf  
diff --git a/ArrowPoint-CANbus-Tools/Canbus/CanOverEthernet.cs b/ArrowPoint-CANbus-Tools/Canbus/CanOverEthernet.cs
@@ -25,10 +25,12 @@ public class CanOverEthernet : ICanTrafficInterface
         private const int DEFAULT_PORT = 4876;
 
         private Thread UdpReceiverThread;
-        private UdpClient udpConnection;
+        private UdpClient udpReceiverConnection;
+        private UdpClient udpSenderConnection;
         private Boolean isConnected;
-        private IPAddress ipAddress;
-        private IPEndPoint ipEndPoint;
+        private IPAddress ipAddressMulticast;
+        private IPEndPoint ipEndPointMulticast;
+        private IPEndPoint localEndPoint;
 
         public string Ip;
         public int Port;
@@ -61,16 +63,30 @@ internal void Close()
         public Boolean Connect()
         {
 
-            // Sender
-            ipAddress = IPAddress.Parse(this.Ip);
-            ipEndPoint = new IPEndPoint(this.ipAddress, this.Port);
+            // Both the sender the receiver
+            ipAddressMulticast = IPAddress.Parse(this.Ip);
+            ipEndPointMulticast = new IPEndPoint(this.ipAddressMulticast, this.Port);
+            localEndPoint = new IPEndPoint(IPAddress.Any, this.Port);
 
-            // Receiver
+            // Setup sender and receiver
             try
             {
-                this.udpConnection = new UdpClient(this.Port);
-                this.udpConnection.Client.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true);
-                this.udpConnection.JoinMulticastGroup(ipAddress, 50);
+                udpSenderConnection = new UdpClient()
+                {
+                    ExclusiveAddressUse = false
+                };
+                udpSenderConnection.Client.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true);
+                udpSenderConnection.Client.Bind(localEndPoint);
+                udpSenderConnection.JoinMulticastGroup(ipAddressMulticast);
+                udpSenderConnection.Client.MulticastLoopback = true;
+
+                this.udpReceiverConnection = new UdpClient()
+                {
+                    ExclusiveAddressUse = false
+                };
+                udpReceiverConnection.Client.SetSocketOption(SocketOptionLevel.Socket, SocketOptionName.ReuseAddress, true);
+                udpReceiverConnection.Client.Bind(localEndPoint);
+                udpReceiverConnection.JoinMulticastGroup(ipAddressMulticast, 50);                
             }
             catch
             {
@@ -88,7 +104,8 @@ public Boolean Disconnect()
         {
             if (!isConnected) return false;
 
-            udpConnection.Close();
+            udpReceiverConnection.Close();
+            udpSenderConnection.Close();
             StopReceiver();
 
             isConnected = false;
@@ -101,7 +118,7 @@ public int SendMessage(CanPacket canPacket)
             if (!isConnected) return -1;
 
             var data = canPacket.RawBytes;
-            return udpConnection.Send(data, data.Length, ipEndPoint);
+            return udpSenderConnection.Send(data, data.Length, ipEndPointMulticast);
         }
 
         public Boolean IsConnected()
@@ -137,15 +154,15 @@ private void UdpReceiverLoop()
                 try
                 {
                     var ipEndPoint = new IPEndPoint(IPAddress.Any, this.Port);
-                    byte[] data = udpConnection.Receive(ref ipEndPoint);
+                    byte[] data = udpReceiverConnection.Receive(ref ipEndPoint);
                     IPAddress sourceAddress = ipEndPoint.Address;
                     int port = ipEndPoint.Port;
 
                     if (CheckIfTritiumDatagram(data)) {
                         SplitCanPackets(data, sourceAddress, port);                        
                     }
                 }
-                catch {
+                catch (Exception ex) {
                     Disconnect();
                 }
             }
@@ -155,7 +172,8 @@ private bool CheckIfTritiumDatagram(byte[] data) {
             string dataString = MyExtensions.ByteArrayToText(data);         
 
             // Some tritium Can Bridges uses Tritiub rather that Tritium
-            return dataString.Contains("Tritiu");
+            // The latest release seems to just use Tri
+            return dataString.Contains("Tri");
         }
 
         private void SplitCanPackets(byte[] data, IPAddress sourceIPAddress, int sourcePort) {
diff --git a/ArrowPoint-CANbus-Tools/Canbus/CanPacket.cs b/ArrowPoint-CANbus-Tools/Canbus/CanPacket.cs
@@ -10,7 +10,7 @@ namespace ArrowPointCANBusTool.Canbus
 {
     public class CanPacket
     {
-        private string SamplePacket { get; set; } = "005472697469756d006508a8c0007f5d0000040400080000000000000000";                                                                                                
+        private string SamplePacket { get; set; } = "00547269fdd6000d006508a8c0007f5d0000040400080000000000000000";                                                                                                
 
         public Boolean IsLittleEndian { get; set; } = true;
         public int PacketIndex { get; set; } = 0;
@@ -163,7 +163,8 @@ public uint CanIdBase10 {
             {
                 try
                 {
-                    return uint.Parse(CanIdAsHex.TrimStart('0', 'x'), System.Globalization.NumberStyles.HexNumber);
+                    string trimmedValue = MyExtensions.Trim0x(CanIdAsHex);
+                    return uint.Parse(trimmedValue, System.Globalization.NumberStyles.HexNumber);
                 }
                 catch
                 {
diff --git a/ArrowPoint-CANbus-Tools/Canbus/MyExtensions.cs b/ArrowPoint-CANbus-Tools/Canbus/MyExtensions.cs
@@ -27,6 +27,13 @@ public static String AlignLeft(String value, int stringPadSize, Boolean commaSpa
             return textString.Substring(0, stringPadSize);
         }
 
+        public static String Trim0x(String value)
+        {
+            if (value.Trim().Substring(0, 2).Equals("0x"))
+                return value.Trim().Substring(2);
+            return value;
+        }
+
         public static byte[] StringToByteArray(string hex)
         {
             int NumberChars = hex.Length;
diff --git a/ArrowPoint-CANbus-Tools/Forms/NetworkMessageForm.cs b/ArrowPoint-CANbus-Tools/Forms/NetworkMessageForm.cs
@@ -1,4 +1,5 @@
-﻿using System;
+﻿using ArrowPointCANBusTool.Canbus;
+using System;
 using System.Collections.Generic;
 using System.ComponentModel;
 using System.Data;
@@ -21,7 +22,7 @@ public Configuration.Message Message
             {
                 if (message == null) message = new Configuration.Message();
                 message.name = MessageNameTextBox.Text;
-                message.id = "0x" + CanIdTextBox.Text.TrimStart('0','x');
+                message.id = "0x" + MyExtensions.Trim0x(CanIdTextBox.Text);
                 return message;
             }
         }
diff --git a/ArrowPoint-CANbus-Tools/Forms/SendPacketForm.cs b/ArrowPoint-CANbus-Tools/Forms/SendPacketForm.cs
@@ -19,7 +19,7 @@ public partial class SendPacketForm : Form
         private Timer timer;
         private Boolean looping;
 
-        private string samplePacket = "005472697469756d006508a8c0007f5d0000040400080000000000000000";
+        private string samplePacket = "00547269fdd6000d006508a8c0007f5d0000040400080000000000000000";
 
         public SendPacketForm()
         {
@@ -127,8 +127,8 @@ private void TbId_Leave(object sender, EventArgs e)
                 MessageBox.Show("ID is not hex");
             }
 
-            this.canPacket.CanIdBase10 = uint.Parse(this.tbId.Text, System.Globalization.NumberStyles.HexNumber);
-            UpdateInputFields();            
+            this.canPacket.CanIdBase10 = uint.Parse(MyExtensions.Trim0x(this.tbId.Text), System.Globalization.NumberStyles.HexNumber);
+            UpdateInputFields();
         }
 
         private void TbIdBase10_Leave(object sender, EventArgs e)
@@ -233,7 +233,7 @@ private void TimerTick(object sender, EventArgs e)
 
         private Boolean IsHexString(String text)
         {
-            return System.Text.RegularExpressions.Regex.IsMatch(text, @"\A\b[0-9a-fA-F]+\b\Z");
+            return System.Text.RegularExpressions.Regex.IsMatch(MyExtensions.Trim0x(text), @"\A\b[0-9a-fA-F]+\b\Z");
         }
 
         private bool UpdateByte(int index, string byteString)
diff --git a/ArrowPoint-CANbus-Tools/Services/ConfigService.cs b/ArrowPoint-CANbus-Tools/Services/ConfigService.cs
@@ -58,6 +58,67 @@ public void SaveConfig(string filename)
         }
 
 
+        public void LoadDBCFile(string filename)
+        {
+            string[] lines = System.IO.File.ReadAllLines(filename);
+
+            const int VERSION = 0;
+            const int BS = 1;
+            const int BU = 2;
+            const int BO = 3;
+            const int SG = 4;
+            const int CM = 5;
+            const int BA_DEF = 6;
+            const int BA_DEF_DEF = 7;
+            const int BA = 8;
+            const int VAL = 9;
+            const int VAL_TABLE = 10;
+
+            int parseState = -1;
+
+            Configuration = new NetworkDefinition();
+
+            foreach (string line in lines)
+            {
+
+                int marker = line.IndexOf(' ');
+                if (marker < 3) marker = 3;
+                string checktag = line.Trim().Substring(0, marker);
+
+                switch (checktag)
+                {
+                    case "VERSION": parseState = VERSION; break;
+                    case "BS_": parseState = BS; break;
+                    case "BU_": parseState = BU; break;
+                    case "BO_": parseState = BO; break;
+                    case "SG_": parseState = SG; break;
+                    case "CM_": parseState = CM; break;
+                    case "BA_DEF_": parseState = BA_DEF; break;
+                    case "BA_DEF_DEF_": parseState = BA_DEF_DEF; break;
+                    case "BA_": parseState = BA; break;
+                    case "VAL_": parseState = VAL; break;
+                    case "VAL_TABLE_": parseState = VAL_TABLE; break;
+                }
+
+                switch (parseState)
+                {
+                    case VERSION: Configuration.Document.version = line.Substring(9); break;
+                    case BS: Configuration.Bus[0].baudrate = line.Substring(4); break;
+                    case BU: break;
+                    case BO: break;
+                    case SG: break;
+                    case CM: break;
+                    case BA_DEF: break;
+                    case BA_DEF_DEF: break;
+                    case BA: break;
+                    case VAL: break;
+                    case VAL_TABLE: break;
+                }
+            }
+        }
+
+
+
         public List<CanPacket> UnknownCanIds(Bus bus)
         {
             List<CanPacket> unknownPackets = null;
@@ -148,7 +209,7 @@ public Configuration.Message AddMessage(string messageName, string canId, Config
             Configuration.Message message = new Configuration.Message
             {
                 name = messageName,
-                id = "0x" + canId.TrimStart('0','x')
+                id = "0x" + MyExtensions.Trim0x(canId)
             };
 
             NodeRef nodeRef = new NodeRef

Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ namespace ArrowPointCANBusTool.Canbus`
`10`	`10`	`{`
`11`	`11`	`public class CanPacket`
`12`	`12`	`{`
`13`		`- private string SamplePacket { get; set; } = "005472697469756d006508a8c0007f5d0000040400080000000000000000";`
	`13`	`+ private string SamplePacket { get; set; } = "00547269fdd6000d006508a8c0007f5d0000040400080000000000000000";`
`14`	`14`
`15`	`15`	`public Boolean IsLittleEndian { get; set; } = true;`
`16`	`16`	`public int PacketIndex { get; set; } = 0;`
`@@ -163,7 +163,8 @@ public uint CanIdBase10 {`
`163`	`163`	`{`
`164`	`164`	`try`
`165`	`165`	`{`
`166`		`- return uint.Parse(CanIdAsHex.TrimStart('0', 'x'), System.Globalization.NumberStyles.HexNumber);`
	`166`	`+ string trimmedValue = MyExtensions.Trim0x(CanIdAsHex);`
	`167`	`+ return uint.Parse(trimmedValue, System.Globalization.NumberStyles.HexNumber);`
`167`	`168`	`}`
`168`	`169`	`catch`
`169`	`170`	`{`
Original file line number	Diff line number	Diff line change
`@@ -27,6 +27,13 @@ public static String AlignLeft(String value, int stringPadSize, Boolean commaSpa`
`27`	`27`	`return textString.Substring(0, stringPadSize);`
`28`	`28`	`}`
`29`	`29`
	`30`	`+ public static String Trim0x(String value)`
	`31`	`+ {`
	`32`	`+ if (value.Trim().Substring(0, 2).Equals("0x"))`
	`33`	`+ return value.Trim().Substring(2);`
	`34`	`+ return value;`
	`35`	`+ }`
	`36`	`+`
`30`	`37`	`public static byte[] StringToByteArray(string hex)`
`31`	`38`	`{`
`32`	`39`	`int NumberChars = hex.Length;`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,5 @@`
`1`		`-using System;`
	`1`	`+using ArrowPointCANBusTool.Canbus;`
	`2`	`+using System;`
`2`	`3`	`using System.Collections.Generic;`
`3`	`4`	`using System.ComponentModel;`
`4`	`5`	`using System.Data;`
`@@ -21,7 +22,7 @@ public Configuration.Message Message`
`21`	`22`	`{`
`22`	`23`	`if (message == null) message = new Configuration.Message();`
`23`	`24`	`message.name = MessageNameTextBox.Text;`
`24`		`- message.id = "0x" + CanIdTextBox.Text.TrimStart('0','x');`
	`25`	`+ message.id = "0x" + MyExtensions.Trim0x(CanIdTextBox.Text);`
`25`	`26`	`return message;`
`26`	`27`	`}`
`27`	`28`	`}`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ public partial class SendPacketForm : Form`
`19`	`19`	`private Timer timer;`
`20`	`20`	`private Boolean looping;`
`21`	`21`
`22`		`- private string samplePacket = "005472697469756d006508a8c0007f5d0000040400080000000000000000";`
	`22`	`+ private string samplePacket = "00547269fdd6000d006508a8c0007f5d0000040400080000000000000000";`
`23`	`23`
`24`	`24`	`public SendPacketForm()`
`25`	`25`	`{`
`@@ -127,8 +127,8 @@ private void TbId_Leave(object sender, EventArgs e)`
`127`	`127`	`MessageBox.Show("ID is not hex");`
`128`	`128`	`}`
`129`	`129`
`130`		`- this.canPacket.CanIdBase10 = uint.Parse(this.tbId.Text, System.Globalization.NumberStyles.HexNumber);`
`131`		`- UpdateInputFields();`
	`130`	`+ this.canPacket.CanIdBase10 = uint.Parse(MyExtensions.Trim0x(this.tbId.Text), System.Globalization.NumberStyles.HexNumber);`
	`131`	`+ UpdateInputFields();`
`132`	`132`	`}`
`133`	`133`
`134`	`134`	`private void TbIdBase10_Leave(object sender, EventArgs e)`
`@@ -233,7 +233,7 @@ private void TimerTick(object sender, EventArgs e)`
`233`	`233`
`234`	`234`	`private Boolean IsHexString(String text)`
`235`	`235`	`{`
`236`		`- return System.Text.RegularExpressions.Regex.IsMatch(text, @"\A\b[0-9a-fA-F]+\b\Z");`
	`236`	`+ return System.Text.RegularExpressions.Regex.IsMatch(MyExtensions.Trim0x(text), @"\A\b[0-9a-fA-F]+\b\Z");`
`237`	`237`	`}`
`238`	`238`
`239`	`239`	`private bool UpdateByte(int index, string byteString)`