YD CSV, .can support removed due to data size bug

Author: negrusti

FileFormats.cs

@@ -19,18 +19,21 @@ public enum FileFormat
             CanDump2,
             YDWG,
             YDBinary,
+            YDCsv,
             PCANView
         }
 
         public static FileFormat DetectFileFormat(string filePath)
         {
             try
             {
+                /*
                 if (IsBinaryYDFormat(filePath))
                 {
                     Debug.WriteLine("Binary CAN format detected");
                     return FileFormat.YDBinary;
                 }
+                */
 
                 var lines = File.ReadLines(filePath).Take(10).ToList(); // Read the first few lines
 
@@ -47,6 +50,12 @@ public static FileFormat DetectFileFormat(string filePath)
                             return FileFormat.TwoCanCsv;
                         }
 
+                        if (line.StartsWith("Time,CAN,Dir,Bit,ID(hex),DLC"))
+                        {
+                            Debug.WriteLine("Yacht Devices CSV format detected");
+                            return FileFormat.YDCsv;
+                        }
+
                         // Actisense: Look for timestamp and structured data
                         if (DateTime.TryParse(line.Split(',')[0], out _))
                         {
@@ -490,6 +499,9 @@ public static List<Nmea2000Record> LoadYDBinary(string filePath)
                             source = (int)(messageId & 0xFF);
                         }
 
+                        if (pgn == 126996)
+                            Debug.WriteLine($"Data Length: {dataLength}");
+                        
                         // Format data bytes as a space-separated hex string
                         string dataHex = string.Join(" ", data.Take(dataLength).Select(b => $"0x{b:X2}"));
 
@@ -515,5 +527,75 @@ public static List<Nmea2000Record> LoadYDBinary(string filePath)
 
             return records;
         }
+
+        public static List<Nmea2000Record> LoadYDCsv(string filePath)
+        {
+            var records = new List<Nmea2000Record>();
+
+            using (var reader = new StreamReader(filePath))
+            {
+                string? headerLine = reader.ReadLine(); // Read the header
+                if (headerLine == null) throw new Exception("File is empty.");
+
+                // Validate header format
+                var headers = headerLine.Split(',').Select(h => h.Trim()).ToArray();
+                if (!headers.SequenceEqual(new[] { "Time", "CAN", "Dir", "Bit", "ID(hex)", "DLC", "D0", "D1", "D2", "D3", "D4", "D5", "D6", "D7" }))
+                {
+                    throw new Exception("Invalid CSV format. Expected columns: Time, CAN, Dir, Bit, ID(hex), DLC, D0-D7.");
+                }
+
+                // Read and parse the rest of the file
+                while (!reader.EndOfStream)
+                {
+                    var line = reader.ReadLine();
+                    if (string.IsNullOrWhiteSpace(line)) continue;
+
+                    var values = line.Split(',').Select(v => v.Trim()).ToArray();
+                    if (values.Length < 7) continue; // Ensure there are enough columns
+
+                    // Extract fields
+                    string timestamp = values[0];
+                    string canInterface = values[1];
+                    string direction = values[2];
+                    int bitType = int.Parse(values[3]); // 11-bit or 29-bit identifier
+                    uint canId = uint.Parse(values[4], System.Globalization.NumberStyles.HexNumber);
+                    int dlc = int.Parse(values[5]);
+
+                    // Ensure DLC is within valid range (1-8)
+                    if (dlc < 1 || dlc > 8) continue;
+
+                    // Extract data bytes
+                    string data = string.Join(" ", values.Skip(6).Take(dlc).Select(d => $"0x{d.ToUpper()}"));
+
+                    // Decode CAN ID
+                    int priority = -1, source = -1, destination = -1;
+                    uint pgn = canId; // Default if no 29-bit conversion is needed
+
+                    if (bitType == 29)
+                    {
+                        priority = (int)((canId >> 26) & 0x07);
+                        pgn = (canId >> 8) & 0x1FFFF; // PGN is in bits 9-26
+                        destination = (int)((canId >> 8) & 0xFF);
+                        source = (int)(canId & 0xFF);
+                    }
+
+                    // Create the record
+                    var record = new Nmea2000Record
+                    {
+                        Timestamp = timestamp,
+                        Priority = priority >= 0 ? priority.ToString() : "-",
+                        PGN = pgn.ToString(),
+                        Source = source >= 0 ? source.ToString() : "-",
+                        Destination = destination >= 0 ? destination.ToString() : "-",
+                        Data = data
+                    };
+                    records.Add(record);
+                }
+            }
+
+            return records;
+        }
+
+
     }
 }

MainWindow.xaml.cs

@@ -50,6 +50,7 @@ public class Nmea2000Record
         private class FastPacketMessage
         {
             public int TotalBytes { get; set; }
+            public int ReceivedByteCount { get; set; }
             public Dictionary<int, string[]> Frames { get; set; } = new Dictionary<int, string[]>();
             public string? Timestamp { get; set; }
             public string Source { get; set; }
@@ -84,7 +85,7 @@ private async void OpenMenuItem_ClickAsync(object sender, RoutedEventArgs e)
             // Open file picker dialog
             OpenFileDialog openFileDialog = new OpenFileDialog
             {
-                Filter = "(*.csv, *.can, *.log, *.txt, *.dump)|*.csv;*.can;*.log;*.txt;*.dump|All Files (*.*)|*.*",
+                Filter = "(*.csv, *.log, *.txt, *.dump)|*.csv;*.log;*.txt;*.dump|All Files (*.*)|*.*",
                 Title = "Open File"
             };
 
@@ -117,8 +118,8 @@ private async void OpenMenuItem_ClickAsync(object sender, RoutedEventArgs e)
                     case FileFormats.FileFormat.PCANView:
                         _Data = await Task.Run(() => FileFormats.LoadPCANView(filePath));
                         break;
-                    case FileFormats.FileFormat.YDBinary:
-                        _Data = await Task.Run(() => FileFormats.LoadYDBinary(filePath));
+                    case FileFormats.FileFormat.YDCsv:
+                        _Data = await Task.Run(() => FileFormats.LoadYDCsv(filePath));
                         break;
                     default:
                         MessageBox.Show("Unsupported or unknown file format.", "Error", MessageBoxButton.OK, MessageBoxImage.Error);
@@ -155,6 +156,13 @@ private void ApplyFilters()
             var includeAddress = ParseList(IncludeAddressTextBox.Text);
             var excludePGNs = ParseList(ExcludePGNTextBox.Text);
 
+            // Reset to original data when all filters are cleared
+            if (includePGNs.Count == 0 && includeAddress.Count == 0 && excludePGNs.Count == 0)
+            {
+                DataGrid.ItemsSource = _assembledData;  // Restore original data
+                return;
+            }
+
             // Apply filters to the original data
             var filteredData = _assembledData.Where(record =>
             {
@@ -334,16 +342,18 @@ private List<Nmea2000Record> AssembleFrames(List<Nmea2000Record> records)
                 }
 
                 message.Frames[sequenceNumber] = framePayload;
+                message.ReceivedByteCount += framePayload.Length;
                 //Debug.WriteLine($"Added frame {sequenceNumber} to {messageKey}: {string.Join(" ", framePayload)}");
             }
             else
             {
                 Debug.WriteLine($"Duplicate frame {sequenceNumber} for {messageKey}. Ignoring.");
             }
 
+            //Debug.WriteLine($"Message {messageKey}, TotalBytes = {message.TotalBytes}");
+
             // Calculate the total number of bytes received so far
             int receivedBytes = message.Frames.Values.Sum(f => f.Length);
-            //Debug.WriteLine($"Message {messageKey}: ReceivedBytes = {receivedBytes}, TotalBytes = {message.TotalBytes}");
 
             // Check if the message is complete
             if (message.TotalBytes > 0 && receivedBytes >= message.TotalBytes)
@@ -429,7 +439,6 @@ private void ClearData()
             DataGrid.ItemsSource = null;
             JsonViewerTextBox.Text = null;
 
-            // Optionally, clear filters if needed
             IncludePGNTextBox.Text = string.Empty;
             ExcludePGNTextBox.Text = string.Empty;
             IncludeAddressTextBox.Text = string.Empty;

local.json

@@ -1,5 +1,17 @@
 {
 	"PGNs": [
+		{
+			"PGN": 65096,
+			"Id": "WheelSpeedDistance",
+			"Description": "Wheel-based Speed and Distance",
+			"Type": "Single"
+		},
+		{
+			"PGN": 65130,
+			"Id": "EngineFuelLube",
+			"Description": "Engine Fuel/Lube Systems",
+			"Type": "Single"
+		},
 		{
 			"PGN": 126975,
 			"Id": "Unknown126975",