diff --git a/csharp/dotnet/ProgramExact.cs b/csharp/dotnet/ProgramExact.cs deleted file mode 100644 index f6a14c1..0000000 --- a/csharp/dotnet/ProgramExact.cs +++ /dev/null @@ -1,661 +0,0 @@ -/* - * Copyright (C) 2007-2024 C# Port - * - * Exact EXI Codec Program - Byte-compatible with OpenV2G C implementation - * Produces identical binary output to original C code - */ - -using System; -using System.IO; -using System.Linq; -using V2GDecoderNet.EXI; -using V2GDecoderNet.V2G; - -namespace V2GDecoderNet -{ - class ProgramExact - { - static void Main(string[] args) - { - Console.WriteLine("=== V2GDecoderNet - Exact EXI Codec ==="); - Console.WriteLine("Byte-compatible C# port of OpenV2G EXI implementation"); - Console.WriteLine(); - - if (args.Length < 1) - { - ShowUsage(); - return; - } - - try - { - string command = args[0].ToLower(); - - switch (command) - { - case "decode-exact": - if (args.Length < 2) - { - Console.WriteLine("Error: Input file required for decode-exact command"); - ShowUsage(); - return; - } - DecodeFileExact(args[1], args.Length > 2 ? args[2] : null); - break; - - case "encode-exact": - if (args.Length < 2) - { - Console.WriteLine("Error: Input file required for encode-exact command"); - ShowUsage(); - return; - } - EncodeFileExact(args[1], args.Length > 2 ? args[2] : null); - break; - - case "test-exact": - RunExactRoundtripTest(args.Length > 1 ? args[1] : "../../test1.exi"); - break; - - case "test-all-exact": - TestAllFilesExact(); - break; - - case "debug-bits": - if (args.Length < 2) - { - Console.WriteLine("Error: debug-bits requires input file"); - ShowUsage(); - return; - } - DebugBitLevel(args[1]); - break; - - case "decode-req": - if (args.Length < 2) - { - Console.WriteLine("Error: decode-req requires input file"); - ShowUsage(); - return; - } - DecodeCurrentDemandReqDirect(args[1]); - break; - - default: - Console.WriteLine($"Error: Unknown command '{command}'"); - ShowUsage(); - break; - } - } - catch (Exception ex) - { - Console.WriteLine($"Error: {ex.Message}"); - if (ex is EXIExceptionExact exiEx) - { - Console.WriteLine($"EXI Error Code: {exiEx.ErrorCode}"); - Console.WriteLine($"EXI Error: {EXIExceptionExact.GetErrorMessage(exiEx.ErrorCode)}"); - } -#if DEBUG - Console.WriteLine($"Stack Trace: {ex.StackTrace}"); -#endif - } - } - - static void ShowUsage() - { - Console.WriteLine("Usage:"); - Console.WriteLine(" V2GDecoderNet decode-exact [output.xml]"); - Console.WriteLine(" V2GDecoderNet encode-exact [output.exi]"); - Console.WriteLine(" V2GDecoderNet test-exact [input.exi]"); - Console.WriteLine(" V2GDecoderNet test-all-exact"); - Console.WriteLine(); - Console.WriteLine("Examples:"); - Console.WriteLine(" V2GDecoderNet decode-exact test1.exi test1_exact.xml"); - Console.WriteLine(" V2GDecoderNet test-exact test1.exi"); - Console.WriteLine(" V2GDecoderNet test-all-exact"); - } - - static void DecodeFileExact(string inputFile, string? outputFile = null) - { - Console.WriteLine($"Exact decoding: {inputFile}"); - - if (!File.Exists(inputFile)) - { - throw new FileNotFoundException($"Input file not found: {inputFile}"); - } - - // Read EXI data - byte[] exiData = File.ReadAllBytes(inputFile); - Console.WriteLine($"Read {exiData.Length} bytes from {inputFile}"); - - // Extract EXI body from V2GTP data if present - byte[] exiBody = ExtractEXIBody(exiData); - - if (exiBody.Length != exiData.Length) - { - Console.WriteLine($"Extracted EXI body: {exiBody.Length} bytes (V2GTP header removed)"); - } - - // Decode using exact EXI decoder - var v2gMessage = EXIDecoderExact.DecodeV2GMessage(exiBody); - - // Debug: Print decoded message values - Console.WriteLine("\n=== Decoded Message Debug Info ==="); - if (v2gMessage.Body.CurrentDemandReq_isUsed) - { - var req = v2gMessage.Body.CurrentDemandReq; - Console.WriteLine($"CurrentDemandReq detected:"); - Console.WriteLine($" EVRESSSOC: {req.DC_EVStatus.EVRESSSOC}"); - Console.WriteLine($" EVReady: {req.DC_EVStatus.EVReady}"); - Console.WriteLine($" EVErrorCode: {req.DC_EVStatus.EVErrorCode}"); - Console.WriteLine($" EVTargetCurrent: Mult={req.EVTargetCurrent.Multiplier}, Unit={req.EVTargetCurrent.Unit}, Value={req.EVTargetCurrent.Value}"); - Console.WriteLine($" EVMaximumVoltageLimit_isUsed: {req.EVMaximumVoltageLimit_isUsed}"); - if (req.EVMaximumVoltageLimit_isUsed) - Console.WriteLine($" EVMaximumVoltageLimit: Mult={req.EVMaximumVoltageLimit.Multiplier}, Unit={req.EVMaximumVoltageLimit.Unit}, Value={req.EVMaximumVoltageLimit.Value}"); - Console.WriteLine($" ChargingComplete: {req.ChargingComplete} (isUsed: {req.ChargingComplete_isUsed})"); - Console.WriteLine($" EVTargetVoltage: Mult={req.EVTargetVoltage.Multiplier}, Unit={req.EVTargetVoltage.Unit}, Value={req.EVTargetVoltage.Value}"); - } - Console.WriteLine("=====================================\n"); - - // Convert to XML representation - string xmlOutput = MessageToXml(v2gMessage); - - // Determine output file name - outputFile ??= Path.ChangeExtension(inputFile, "_exact.xml"); - - // Write XML output - File.WriteAllText(outputFile, xmlOutput); - Console.WriteLine($"XML written to: {outputFile}"); - Console.WriteLine($"XML size: {xmlOutput.Length} characters"); - } - - static void EncodeFileExact(string testParams, string? outputFile = null) - { - Console.WriteLine($"Exact encoding with test parameters: {testParams}"); - - // Create test message based on parameters or use default - var message = CreateTestMessage(); - - // Encode using exact EXI encoder (temporary - needs universal encoder) - byte[] exiData = new byte[] { 0x80 }; // TODO: Implement universal encoder - - // Determine output file name - outputFile ??= "test_exact_output.exi"; - - // Write EXI output - File.WriteAllBytes(outputFile, exiData); - Console.WriteLine($"EXI written to: {outputFile}"); - Console.WriteLine($"EXI size: {exiData.Length} bytes"); - - // Show hex dump - Console.WriteLine("Hex dump:"); - ShowHexDump(exiData, 0, Math.Min(64, exiData.Length)); - } - - static void RunExactRoundtripTest(string inputFile) - { - Console.WriteLine($"Running exact roundtrip test on: {inputFile}"); - - if (!File.Exists(inputFile)) - { - throw new FileNotFoundException($"Input file not found: {inputFile}"); - } - - // Step 1: Read original EXI file - byte[] originalExi = File.ReadAllBytes(inputFile); - Console.WriteLine($"Original EXI size: {originalExi.Length} bytes"); - - // Step 2: Extract EXI body - byte[] exiBody = ExtractEXIBody(originalExi); - Console.WriteLine($"EXI body size: {exiBody.Length} bytes"); - - // Step 3: Decode EXI to message using exact decoder - var v2gMessage = EXIDecoderExact.DecodeV2GMessage(exiBody); - Console.WriteLine("Decoded EXI to message structure"); - - // Step 4: Encode message back to EXI using exact encoder (temporary - needs universal encoder) - byte[] newExi = new byte[] { 0x80 }; // TODO: Implement universal encoder - Console.WriteLine($"Encoded message to EXI: {newExi.Length} bytes"); - - // Step 5: Compare original vs new EXI - bool identical = exiBody.SequenceEqual(newExi); - - Console.WriteLine(); - Console.WriteLine("=== Exact Roundtrip Test Results ==="); - Console.WriteLine($"Original EXI body: {exiBody.Length} bytes"); - Console.WriteLine($"New EXI: {newExi.Length} bytes"); - Console.WriteLine($"Files identical: {(identical ? "YES ✓" : "NO ✗")}"); - - if (!identical) - { - Console.WriteLine(); - Console.WriteLine("Differences found:"); - ShowDifferences(exiBody, newExi); - - // Save files for comparison - string originalFile = Path.ChangeExtension(inputFile, "_original_body.exi"); - string newFile = Path.ChangeExtension(inputFile, "_new_exact.exi"); - File.WriteAllBytes(originalFile, exiBody); - File.WriteAllBytes(newFile, newExi); - Console.WriteLine($"Saved original body to: {originalFile}"); - Console.WriteLine($"Saved new EXI to: {newFile}"); - } - - Console.WriteLine(); - Console.WriteLine(identical ? "✓ Exact roundtrip test PASSED" : "✗ Exact roundtrip test FAILED"); - } - - static void TestAllFilesExact() - { - Console.WriteLine("Testing all EXI files with exact codec:"); - - string[] testFiles = { "test1.exi", "test2.exi", "test3.exi", "test4.exi", "test5.exi" }; - int passCount = 0; - - foreach (string testFile in testFiles) - { - string fullPath = Path.Combine("../../", testFile); - if (File.Exists(fullPath)) - { - Console.WriteLine($"\n--- Testing {testFile} ---"); - try - { - RunExactRoundtripTest(fullPath); - passCount++; - } - catch (Exception ex) - { - Console.WriteLine($"FAILED: {ex.Message}"); - } - } - else - { - Console.WriteLine($"Skipping {testFile} - file not found"); - } - } - - Console.WriteLine($"\n=== Summary: {passCount}/{testFiles.Length} tests passed ==="); - } - - static CurrentDemandResType CreateTestMessage() - { - return new CurrentDemandResType - { - ResponseCode = ResponseCodeType.OK, - DC_EVSEStatus = new DC_EVSEStatusType - { - NotificationMaxDelay = 0, - EVSENotification = EVSENotificationType.None, - EVSEIsolationStatus = IsolationLevelType.Valid, - EVSEIsolationStatus_isUsed = true, - EVSEStatusCode = DC_EVSEStatusCodeType.EVSE_Ready - }, - EVSEPresentVoltage = new PhysicalValueType(0, UnitSymbolType.V, 450), - EVSEPresentCurrent = new PhysicalValueType(0, UnitSymbolType.A, 5), - EVSECurrentLimitAchieved = false, - EVSEVoltageLimitAchieved = false, - EVSEPowerLimitAchieved = false, - EVSEID = "Z", - SAScheduleTupleID = 1 - }; - } - - /// - /// Convert V2G message to XML format matching C print_iso1_xml_wireshark() exactly - /// - static string MessageToXml(V2GMessageExact v2gMessage) - { - var xml = new System.Text.StringBuilder(); - - // XML Header with full namespace declarations (matching C print_xml_header_wireshark) - xml.AppendLine(@""); - xml.Append(@""); - - // Header with SessionID - xml.Append(""); - if (!string.IsNullOrEmpty(v2gMessage.SessionID)) - { - xml.Append(v2gMessage.SessionID); - } - else - { - // Default SessionID like C decoder output - xml.Append("4142423030303831"); - } - xml.AppendLine(""); - - // Body - xml.Append(""); - - if (v2gMessage.Body.CurrentDemandReq_isUsed) - { - WriteCurrentDemandReqXml(xml, v2gMessage.Body.CurrentDemandReq); - } - else if (v2gMessage.Body.CurrentDemandRes_isUsed) - { - WriteCurrentDemandResXml(xml, v2gMessage.Body.CurrentDemandRes); - } - else - { - xml.Append("Message type not recognized"); - } - - xml.Append(""); - xml.Append(""); - - return xml.ToString(); - } - - /// - /// Write CurrentDemandReq XML matching C source exactly - /// - static void WriteCurrentDemandReqXml(System.Text.StringBuilder xml, CurrentDemandReqType req) - { - xml.Append(""); - - // DC_EVStatus - xml.Append(""); - xml.Append($"{(req.DC_EVStatus.EVReady ? "true" : "false")}"); - xml.Append($"{req.DC_EVStatus.EVErrorCode}"); - xml.Append($"{req.DC_EVStatus.EVRESSSOC}"); - xml.Append(""); - - // EVTargetCurrent - xml.Append(""); - xml.Append($"{req.EVTargetCurrent.Multiplier}"); - xml.Append($"{(int)req.EVTargetCurrent.Unit}"); - xml.Append($"{req.EVTargetCurrent.Value}"); - xml.Append(""); - - // EVMaximumVoltageLimit (optional) - if (req.EVMaximumVoltageLimit_isUsed && req.EVMaximumVoltageLimit != null) - { - xml.Append(""); - xml.Append($"{req.EVMaximumVoltageLimit.Multiplier}"); - xml.Append($"{(int)req.EVMaximumVoltageLimit.Unit}"); - xml.Append($"{req.EVMaximumVoltageLimit.Value}"); - xml.Append(""); - } - - // EVMaximumCurrentLimit (optional) - if (req.EVMaximumCurrentLimit_isUsed && req.EVMaximumCurrentLimit != null) - { - xml.Append(""); - xml.Append($"{req.EVMaximumCurrentLimit.Multiplier}"); - xml.Append($"{(int)req.EVMaximumCurrentLimit.Unit}"); - xml.Append($"{req.EVMaximumCurrentLimit.Value}"); - xml.Append(""); - } - - // EVMaximumPowerLimit (optional) - if (req.EVMaximumPowerLimit_isUsed && req.EVMaximumPowerLimit != null) - { - xml.Append(""); - xml.Append($"{req.EVMaximumPowerLimit.Multiplier}"); - xml.Append($"{(int)req.EVMaximumPowerLimit.Unit}"); - xml.Append($"{req.EVMaximumPowerLimit.Value}"); - xml.Append(""); - } - - // BulkChargingComplete (optional) - if (req.BulkChargingComplete_isUsed) - { - xml.Append($"{(req.BulkChargingComplete ? "true" : "false")}"); - } - - // ChargingComplete (always present) - xml.Append($"{(req.ChargingComplete ? "true" : "false")}"); - - // RemainingTimeToFullSoC (optional) - if (req.RemainingTimeToFullSoC_isUsed && req.RemainingTimeToFullSoC != null) - { - xml.Append(""); - xml.Append($"{req.RemainingTimeToFullSoC.Multiplier}"); - xml.Append($"{(int)req.RemainingTimeToFullSoC.Unit}"); - xml.Append($"{req.RemainingTimeToFullSoC.Value}"); - xml.Append(""); - } - - // RemainingTimeToBulkSoC (optional) - if (req.RemainingTimeToBulkSoC_isUsed && req.RemainingTimeToBulkSoC != null) - { - xml.Append(""); - xml.Append($"{req.RemainingTimeToBulkSoC.Multiplier}"); - xml.Append($"{(int)req.RemainingTimeToBulkSoC.Unit}"); - xml.Append($"{req.RemainingTimeToBulkSoC.Value}"); - xml.Append(""); - } - - // EVTargetVoltage (must come last according to EXI grammar) - if (req.EVTargetVoltage != null) - { - xml.Append(""); - xml.Append($"{req.EVTargetVoltage.Multiplier}"); - xml.Append($"{(int)req.EVTargetVoltage.Unit}"); - xml.Append($"{req.EVTargetVoltage.Value}"); - xml.Append(""); - } - - xml.Append(""); - } - - /// - /// Write CurrentDemandRes XML matching C source exactly - /// - static void WriteCurrentDemandResXml(System.Text.StringBuilder xml, CurrentDemandResType res) - { - xml.Append(""); - xml.Append($"{res.ResponseCode}"); - - xml.Append(""); - xml.Append($"{res.DC_EVSEStatus.EVSEIsolationStatus}"); - xml.Append($"{res.DC_EVSEStatus.EVSEStatusCode}"); - xml.Append(""); - - if (res.EVSEPresentVoltage != null) - { - xml.Append(""); - xml.Append($"{res.EVSEPresentVoltage.Multiplier}"); - xml.Append($"{(int)res.EVSEPresentVoltage.Unit}"); - xml.Append($"{res.EVSEPresentVoltage.Value}"); - xml.Append(""); - } - - if (res.EVSEPresentCurrent != null) - { - xml.Append(""); - xml.Append($"{res.EVSEPresentCurrent.Multiplier}"); - xml.Append($"{(int)res.EVSEPresentCurrent.Unit}"); - xml.Append($"{res.EVSEPresentCurrent.Value}"); - xml.Append(""); - } - - xml.Append($"{(res.EVSECurrentLimitAchieved ? "true" : "false")}"); - xml.Append($"{(res.EVSEVoltageLimitAchieved ? "true" : "false")}"); - xml.Append($"{(res.EVSEPowerLimitAchieved ? "true" : "false")}"); - xml.Append($"{res.EVSEID}"); - xml.Append($"{res.SAScheduleTupleID}"); - - xml.Append(""); - } - - static byte[] ExtractEXIBody(byte[] inputData) - { - if (inputData == null || inputData.Length < 8) - return inputData ?? new byte[0]; - - // First, look for V2G Transfer Protocol header anywhere in the data - // Pattern: 0x01 0xFE 0x80 0x01 (V2GTP header for ISO/DIN/SAP) - for (int i = 0; i <= inputData.Length - 8; i++) - { - if (inputData[i] == 0x01 && inputData[i + 1] == 0xFE) - { - ushort payloadType = (ushort)((inputData[i + 2] << 8) | inputData[i + 3]); - - if (payloadType == 0x8001 || payloadType == 0x8002) // V2G_PAYLOAD_ISO_DIN_SAP or V2G_PAYLOAD_ISO2 - { - // Valid V2GTP header found: skip 8-byte header to get EXI body - int exiStart = i + 8; - var exiBody = new byte[inputData.Length - exiStart]; - Array.Copy(inputData, exiStart, exiBody, 0, exiBody.Length); - return exiBody; - } - } - } - - // If no V2GTP header found, look for EXI start pattern (0x8098) anywhere in the data - for (int i = 0; i <= inputData.Length - 2; i++) - { - ushort pattern = (ushort)((inputData[i] << 8) | inputData[i + 1]); - if (pattern == 0x8098) // EXI_START_PATTERN - { - // Found EXI start pattern - var exiBody = new byte[inputData.Length - i]; - Array.Copy(inputData, i, exiBody, 0, exiBody.Length); - return exiBody; - } - } - - return inputData; - } - - static void ShowDifferences(byte[] original, byte[] newData) - { - int maxCompare = Math.Min(original.Length, newData.Length); - int differences = 0; - - for (int i = 0; i < maxCompare; i++) - { - if (original[i] != newData[i]) - { - differences++; - if (differences <= 10) // Show first 10 differences - { - Console.WriteLine($" Offset {i:X4}: {original[i]:X2} -> {newData[i]:X2}"); - } - } - } - - if (differences > 10) - { - Console.WriteLine($" ... and {differences - 10} more differences"); - } - - if (original.Length != newData.Length) - { - Console.WriteLine($" Size difference: {newData.Length - original.Length} bytes"); - } - } - - static void ShowHexDump(byte[] data, int offset, int length) - { - for (int i = offset; i < offset + length && i < data.Length; i += 16) - { - Console.Write($"{i:X4}: "); - - // Show hex bytes - for (int j = 0; j < 16 && i + j < data.Length && i + j < offset + length; j++) - { - Console.Write($"{data[i + j]:X2} "); - } - - Console.WriteLine(); - } - } - - static void DebugBitLevel(string exiFilePath) - { - byte[] data = File.ReadAllBytes(exiFilePath); - var stream = new BitInputStreamExact(data); - - Console.WriteLine("=== Exact Bit-Level Analysis ==="); - Console.WriteLine($"Total bytes: {data.Length}"); - Console.WriteLine($"Hex: {BitConverter.ToString(data)}"); - - // Skip EXI header (0x80) - int headerByte = stream.ReadNBitUnsignedInteger(8); - Console.WriteLine($"EXI Header: 0x{headerByte:X2} at position {stream.Position}, bit {stream.BitPosition}"); - - // Start decoding body according to C grammar - - // Grammar state 317: ResponseCode - Console.WriteLine($"\n--- Grammar State 317: ResponseCode ---"); - Console.WriteLine($"Position: {stream.Position}, bit: {stream.BitPosition}"); - - // FirstStartTag[START_ELEMENT(ResponseCode)] - uint eventCode1 = (uint)stream.ReadNBitUnsignedInteger(1); - Console.WriteLine($"Event code 1 (1-bit): {eventCode1} at pos {stream.Position}, bit {stream.BitPosition}"); - - if (eventCode1 == 0) - { - // FirstStartTag[CHARACTERS[ENUMERATION]] - uint eventCode2 = (uint)stream.ReadNBitUnsignedInteger(1); - Console.WriteLine($"Event code 2 (1-bit): {eventCode2} at pos {stream.Position}, bit {stream.BitPosition}"); - - if (eventCode2 == 0) - { - int responseCode = stream.ReadNBitUnsignedInteger(5); - Console.WriteLine($"ResponseCode (5-bit): {responseCode} at pos {stream.Position}, bit {stream.BitPosition}"); - - // valid EE for simple element ResponseCode? - uint eventCode3 = (uint)stream.ReadNBitUnsignedInteger(1); - Console.WriteLine($"Event code 3 (1-bit): {eventCode3} at pos {stream.Position}, bit {stream.BitPosition}"); - } - } - - Console.WriteLine($"\nContinuing to read more data to find alignment..."); - // Skip ahead to find where we should be - for (int i = 0; i < 10 && !stream.IsEndOfStream; i++) - { - int nextByte = stream.ReadNBitUnsignedInteger(8); - Console.WriteLine($"Byte {i}: 0x{nextByte:X2} at pos {stream.Position}, bit {stream.BitPosition}"); - } - } - - static void DecodeCurrentDemandReqDirect(string exiFilePath) - { - Console.WriteLine("=== Direct CurrentDemandReq Decoding Test ==="); - - byte[] data = File.ReadAllBytes(exiFilePath); - Console.WriteLine($"Input file: {exiFilePath}, size: {data.Length} bytes"); - Console.WriteLine($"Hex: {BitConverter.ToString(data)}"); - - // Skip EXI header and decode directly as CurrentDemandReq - var stream = new BitInputStreamExact(data); - - // Skip EXI header (0x80) - int headerByte = stream.ReadNBitUnsignedInteger(8); - Console.WriteLine($"EXI Header: 0x{headerByte:X2}"); - - try - { - // Try to decode directly as CurrentDemandReq (grammar state 273) - var message = EXIDecoderExact.DecodeCurrentDemandReq(stream); - - Console.WriteLine("\n=== Successfully decoded CurrentDemandReq ==="); - Console.WriteLine($"DC_EVStatus:"); - Console.WriteLine($" EVReady: {message.DC_EVStatus.EVReady}"); - Console.WriteLine($" EVErrorCode: {message.DC_EVStatus.EVErrorCode}"); - Console.WriteLine($" EVRESSSOC: {message.DC_EVStatus.EVRESSSOC}%"); - - Console.WriteLine($"EVTargetCurrent:"); - Console.WriteLine($" Multiplier: {message.EVTargetCurrent.Multiplier}"); - Console.WriteLine($" Unit: {message.EVTargetCurrent.Unit}"); - Console.WriteLine($" Value: {message.EVTargetCurrent.Value}"); - - Console.WriteLine($"EVTargetVoltage:"); - Console.WriteLine($" Multiplier: {message.EVTargetVoltage.Multiplier}"); - Console.WriteLine($" Unit: {message.EVTargetVoltage.Unit}"); - Console.WriteLine($" Value: {message.EVTargetVoltage.Value}"); - } - catch (Exception ex) - { - Console.WriteLine($"\nDecoding failed: {ex.Message}"); - Console.WriteLine($"Stack trace: {ex.StackTrace}"); - } - } - } -} \ No newline at end of file diff --git a/csharp/dotnet/bin/Debug/net6.0/V2GDecoderNet.deps.json b/csharp/dotnet/bin/Debug/net6.0/V2GDecoderNet.deps.json deleted file mode 100644 index cd50977..0000000 --- a/csharp/dotnet/bin/Debug/net6.0/V2GDecoderNet.deps.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "runtimeTarget": { - "name": ".NETCoreApp,Version=v6.0", - "signature": "" - }, - "compilationOptions": {}, - "targets": { - ".NETCoreApp,Version=v6.0": { - "V2GDecoderNet/1.0.0": { - "runtime": { - "V2GDecoderNet.dll": {} - } - } - } - }, - "libraries": { - "V2GDecoderNet/1.0.0": { - "type": "project", - "serviceable": false, - "sha512": "" - } - } -} \ No newline at end of file diff --git a/csharp/dotnet/bin/Debug/net6.0/V2GDecoderNet.dll b/csharp/dotnet/bin/Debug/net6.0/V2GDecoderNet.dll deleted file mode 100644 index c118513..0000000 Binary files a/csharp/dotnet/bin/Debug/net6.0/V2GDecoderNet.dll and /dev/null differ diff --git a/csharp/dotnet/bin/Debug/net6.0/V2GDecoderNet.exe b/csharp/dotnet/bin/Debug/net6.0/V2GDecoderNet.exe deleted file mode 100644 index 016e874..0000000 Binary files a/csharp/dotnet/bin/Debug/net6.0/V2GDecoderNet.exe and /dev/null differ diff --git a/csharp/dotnet/bin/Debug/net6.0/V2GDecoderNet.pdb b/csharp/dotnet/bin/Debug/net6.0/V2GDecoderNet.pdb deleted file mode 100644 index 88ef006..0000000 Binary files a/csharp/dotnet/bin/Debug/net6.0/V2GDecoderNet.pdb and /dev/null differ diff --git a/csharp/dotnet/bin/Debug/net6.0/V2GDecoderNet.runtimeconfig.json b/csharp/dotnet/bin/Debug/net6.0/V2GDecoderNet.runtimeconfig.json deleted file mode 100644 index 4986d16..0000000 --- a/csharp/dotnet/bin/Debug/net6.0/V2GDecoderNet.runtimeconfig.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "runtimeOptions": { - "tfm": "net6.0", - "framework": { - "name": "Microsoft.NETCore.App", - "version": "6.0.0" - } - } -} \ No newline at end of file diff --git a/csharp/dotnet/bin/Debug/net8.0/V2GDecoderNet.dll b/csharp/dotnet/bin/Debug/net8.0/V2GDecoderNet.dll index 6cf9d7b..e56dbd8 100644 Binary files a/csharp/dotnet/bin/Debug/net8.0/V2GDecoderNet.dll and b/csharp/dotnet/bin/Debug/net8.0/V2GDecoderNet.dll differ diff --git a/csharp/dotnet/bin/Debug/net8.0/V2GDecoderNet.exe b/csharp/dotnet/bin/Debug/net8.0/V2GDecoderNet.exe index 0431c01..88ed969 100644 Binary files a/csharp/dotnet/bin/Debug/net8.0/V2GDecoderNet.exe and b/csharp/dotnet/bin/Debug/net8.0/V2GDecoderNet.exe differ diff --git a/csharp/dotnet/bin/Debug/net8.0/V2GDecoderNet.pdb b/csharp/dotnet/bin/Debug/net8.0/V2GDecoderNet.pdb index 472eec6..4883db2 100644 Binary files a/csharp/dotnet/bin/Debug/net8.0/V2GDecoderNet.pdb and b/csharp/dotnet/bin/Debug/net8.0/V2GDecoderNet.pdb differ diff --git a/csharp/dotnet/obj/Debug/net8.0/V2GDecoderNet.AssemblyInfo.cs b/csharp/dotnet/obj/Debug/net8.0/V2GDecoderNet.AssemblyInfo.cs index c84aa42..a76c61a 100644 --- a/csharp/dotnet/obj/Debug/net8.0/V2GDecoderNet.AssemblyInfo.cs +++ b/csharp/dotnet/obj/Debug/net8.0/V2GDecoderNet.AssemblyInfo.cs @@ -14,7 +14,7 @@ using System.Reflection; [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyCopyrightAttribute("Copyright © 2024")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] -[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+fe368f2d23641061368bcd6a69da3991990085d6")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a6af2aceedb2c7070ea2a26dabfe87180156642a")] [assembly: System.Reflection.AssemblyProductAttribute("V2GDecoderNet")] [assembly: System.Reflection.AssemblyTitleAttribute("V2GDecoderNet")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/csharp/dotnet/obj/Debug/net8.0/V2GDecoderNet.AssemblyInfoInputs.cache b/csharp/dotnet/obj/Debug/net8.0/V2GDecoderNet.AssemblyInfoInputs.cache index c18d047..b2255ad 100644 --- a/csharp/dotnet/obj/Debug/net8.0/V2GDecoderNet.AssemblyInfoInputs.cache +++ b/csharp/dotnet/obj/Debug/net8.0/V2GDecoderNet.AssemblyInfoInputs.cache @@ -1 +1 @@ -f32aa50a95c554c2500fe55755b8877db9aeaf4b42ed47a256d4613dd3873036 +dc1404d97a6b12c300b7aa3a4da3c2f29b08f0c5428d19fadeb7c8ee3acc2ac4 diff --git a/csharp/dotnet/obj/Debug/net8.0/V2GDecoderNet.csproj.CoreCompileInputs.cache b/csharp/dotnet/obj/Debug/net8.0/V2GDecoderNet.csproj.CoreCompileInputs.cache index b55cc49..d2c2113 100644 --- a/csharp/dotnet/obj/Debug/net8.0/V2GDecoderNet.csproj.CoreCompileInputs.cache +++ b/csharp/dotnet/obj/Debug/net8.0/V2GDecoderNet.csproj.CoreCompileInputs.cache @@ -1 +1 @@ -ad16f80ccd83ad882bbfc2dc135308cc57c1313a1e372ab828e094635a7e4f8f +908c1d3d2df67752e93f781d8e0aedd6d0c6f06c41a88a8327628c2394d311a2 diff --git a/csharp/dotnet/obj/Debug/net8.0/V2GDecoderNet.dll b/csharp/dotnet/obj/Debug/net8.0/V2GDecoderNet.dll index 6cf9d7b..e56dbd8 100644 Binary files a/csharp/dotnet/obj/Debug/net8.0/V2GDecoderNet.dll and b/csharp/dotnet/obj/Debug/net8.0/V2GDecoderNet.dll differ diff --git a/csharp/dotnet/obj/Debug/net8.0/V2GDecoderNet.pdb b/csharp/dotnet/obj/Debug/net8.0/V2GDecoderNet.pdb index 472eec6..4883db2 100644 Binary files a/csharp/dotnet/obj/Debug/net8.0/V2GDecoderNet.pdb and b/csharp/dotnet/obj/Debug/net8.0/V2GDecoderNet.pdb differ diff --git a/csharp/dotnet/obj/Debug/net8.0/apphost.exe b/csharp/dotnet/obj/Debug/net8.0/apphost.exe index 0431c01..88ed969 100644 Binary files a/csharp/dotnet/obj/Debug/net8.0/apphost.exe and b/csharp/dotnet/obj/Debug/net8.0/apphost.exe differ diff --git a/csharp/dotnet/obj/Debug/net8.0/ref/V2GDecoderNet.dll b/csharp/dotnet/obj/Debug/net8.0/ref/V2GDecoderNet.dll index 3c522c6..43d8722 100644 Binary files a/csharp/dotnet/obj/Debug/net8.0/ref/V2GDecoderNet.dll and b/csharp/dotnet/obj/Debug/net8.0/ref/V2GDecoderNet.dll differ diff --git a/csharp/dotnet/obj/Debug/net8.0/refint/V2GDecoderNet.dll b/csharp/dotnet/obj/Debug/net8.0/refint/V2GDecoderNet.dll index 3c522c6..43d8722 100644 Binary files a/csharp/dotnet/obj/Debug/net8.0/refint/V2GDecoderNet.dll and b/csharp/dotnet/obj/Debug/net8.0/refint/V2GDecoderNet.dll differ diff --git a/csharp/dotnetfx/App.config b/csharp/dotnetfx/App.config deleted file mode 100644 index 033746a..0000000 --- a/csharp/dotnetfx/App.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/csharp/dotnetfx/EXI/BitInputStream.cs b/csharp/dotnetfx/EXI/BitInputStream.cs deleted file mode 100644 index cc5e8e9..0000000 --- a/csharp/dotnetfx/EXI/BitInputStream.cs +++ /dev/null @@ -1,219 +0,0 @@ -/* - * Copyright (C) 2007-2024 C# Port - * Original Copyright (C) 2007-2018 Siemens AG - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - */ - -using System; - -namespace V2GDecoderNetFx.EXI -{ - /// - /// Bit input stream for reading EXI encoded data - /// - public class BitInputStream - { - private readonly byte[] _buffer; - private int _position; - private int _bitPosition; - private readonly int _size; - - public BitInputStream(byte[] buffer) - { - if (buffer == null) - throw new ArgumentNullException(nameof(buffer)); - _buffer = buffer; - _size = buffer.Length; - _position = 0; - _bitPosition = 0; - } - - public int Position => _position; - public int BitPosition => _bitPosition; - public int Size => _size; - public bool IsEOF => _position >= _size; - - /// - /// Read a single bit - /// - /// Bit value (0 or 1), or -1 on EOF - public int ReadBit() - { - if (_position >= _size) - return -1; - - int bit = (_buffer[_position] >> (7 - _bitPosition)) & 1; - - _bitPosition++; - if (_bitPosition == 8) - { - _bitPosition = 0; - _position++; - } - - return bit; - } - - /// - /// Read multiple bits as unsigned integer - /// - /// Number of bits to read (1-32) - /// Unsigned integer value - public uint ReadBits(int numBits) - { - if (numBits < 1 || numBits > 32) - throw new ArgumentException("Number of bits must be between 1 and 32", nameof(numBits)); - - uint result = 0; - - for (int i = 0; i < numBits; i++) - { - int bit = ReadBit(); - if (bit == -1) - throw new EXIException(EXIErrorCodes.EXI_ERROR_INPUT_STREAM_EOF); - - result = (result << 1) | (uint)bit; - } - - return result; - } - - /// - /// Read unsigned integer using EXI encoding - /// - /// Unsigned integer value - public uint ReadUnsignedInteger() - { - uint result = 0; - bool continueBit; - - do - { - if (_position >= _size) - throw new EXIException(EXIErrorCodes.EXI_ERROR_INPUT_STREAM_EOF); - - byte currentByte = _buffer[_position++]; - continueBit = (currentByte & 0x80) != 0; - result = (result << 7) | (uint)(currentByte & 0x7F); - - } while (continueBit); - - return result; - } - - /// - /// Read signed integer using EXI encoding - /// - /// Signed integer value - public int ReadInteger() - { - uint unsignedValue = ReadUnsignedInteger(); - - // Check sign bit (LSB) - bool isNegative = (unsignedValue & 1) != 0; - int value = (int)(unsignedValue >> 1); - - return isNegative ? -value : value; - } - - /// - /// Read a byte aligned to byte boundary - /// - /// Byte value - public byte ReadByte() - { - // Align to byte boundary - if (_bitPosition != 0) - { - _bitPosition = 0; - _position++; - } - - if (_position >= _size) - throw new EXIException(EXIErrorCodes.EXI_ERROR_INPUT_STREAM_EOF); - - return _buffer[_position++]; - } - - /// - /// Read multiple bytes - /// - /// Number of bytes to read - /// Byte array - public byte[] ReadBytes(int count) - { - if (count < 0) - throw new ArgumentException("Count cannot be negative", nameof(count)); - - // Align to byte boundary - if (_bitPosition != 0) - { - _bitPosition = 0; - _position++; - } - - if (_position + count > _size) - throw new EXIException(EXIErrorCodes.EXI_ERROR_INPUT_STREAM_EOF); - - var result = new byte[count]; - Array.Copy(_buffer, _position, result, 0, count); - _position += count; - - return result; - } - - /// - /// Skip to next byte boundary - /// - public void AlignToByteBank() - { - if (_bitPosition != 0) - { - _bitPosition = 0; - _position++; - } - } - - /// - /// Reset stream position to beginning - /// - public void Reset() - { - _position = 0; - _bitPosition = 0; - } - - /// - /// Set stream position - /// - /// Byte position - /// Bit position within byte (0-7) - public void SetPosition(int position, int bitPosition = 0) - { - if (position < 0 || position > _size) - throw new ArgumentException("Position out of range", nameof(position)); - - if (bitPosition < 0 || bitPosition > 7) - throw new ArgumentException("Bit position must be 0-7", nameof(bitPosition)); - - _position = position; - _bitPosition = bitPosition; - } - - /// - /// Get remaining bytes in stream - /// - /// Number of remaining bytes - public int GetRemainingBytes() - { - int remaining = _size - _position; - if (_bitPosition > 0 && remaining > 0) - remaining--; - return Math.Max(0, remaining); - } - } -} \ No newline at end of file diff --git a/csharp/dotnetfx/EXI/BitOutputStream.cs b/csharp/dotnetfx/EXI/BitOutputStream.cs deleted file mode 100644 index aa9ced4..0000000 --- a/csharp/dotnetfx/EXI/BitOutputStream.cs +++ /dev/null @@ -1,239 +0,0 @@ -/* - * Copyright (C) 2007-2024 C# Port - * Original Copyright (C) 2007-2018 Siemens AG - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - */ - -using System; - -namespace V2GDecoderNetFx.EXI -{ - /// - /// Bit output stream for writing EXI encoded data - /// - public class BitOutputStream - { - private byte[] _buffer; - private int _position; - private int _bitPosition; - private int _capacity; - - public BitOutputStream(int capacity = EXIConstants.BUFFER_SIZE) - { - _capacity = capacity; - _buffer = new byte[capacity]; - _position = 0; - _bitPosition = 0; - } - - public int Position => _position; - public int BitPosition => _bitPosition; - public int Capacity => _capacity; - - /// - /// Write a single bit - /// - /// Bit value (0 or 1) - public void WriteBit(int bit) - { - if (bit != 0 && bit != 1) - throw new ArgumentException("Bit value must be 0 or 1", nameof(bit)); - - EnsureCapacity(_position + 1); - - if (bit == 1) - { - _buffer[_position] |= (byte)(1 << (7 - _bitPosition)); - } - - _bitPosition++; - if (_bitPosition == 8) - { - _bitPosition = 0; - _position++; - } - } - - /// - /// Write multiple bits from unsigned integer - /// - /// Value to write - /// Number of bits to write (1-32) - public void WriteBits(uint value, int numBits) - { - if (numBits < 1 || numBits > 32) - throw new ArgumentException("Number of bits must be between 1 and 32", nameof(numBits)); - - for (int i = numBits - 1; i >= 0; i--) - { - int bit = (int)((value >> i) & 1); - WriteBit(bit); - } - } - - /// - /// Write unsigned integer using EXI encoding - /// - /// Unsigned integer value - public void WriteUnsignedInteger(uint value) - { - if (value == 0) - { - WriteByte(0); - return; - } - - // Calculate number of bytes needed - var bytes = new List(); - - while (value > 0) - { - byte currentByte = (byte)(value & 0x7F); - value >>= 7; - - if (value > 0) - currentByte |= 0x80; // Set continuation bit - - bytes.Add(currentByte); - } - - // Write bytes in reverse order (big-endian) - for (int i = bytes.Count - 1; i >= 0; i--) - { - WriteByte(bytes[i]); - } - } - - /// - /// Write signed integer using EXI encoding - /// - /// Signed integer value - public void WriteInteger(int value) - { - // Encode sign in LSB, shift value - uint unsignedValue; - if (value < 0) - { - unsignedValue = ((uint)(-value) << 1) | 1; - } - else - { - unsignedValue = (uint)value << 1; - } - - WriteUnsignedInteger(unsignedValue); - } - - /// - /// Write a byte aligned to byte boundary - /// - /// Byte value - public void WriteByte(byte value) - { - // Align to byte boundary - if (_bitPosition != 0) - { - _bitPosition = 0; - _position++; - } - - EnsureCapacity(_position + 1); - _buffer[_position++] = value; - } - - /// - /// Write multiple bytes - /// - /// Byte array to write - public void WriteBytes(byte[] data) - { - if (data == null || data.Length == 0) - return; - - // Align to byte boundary - if (_bitPosition != 0) - { - _bitPosition = 0; - _position++; - } - - EnsureCapacity(_position + data.Length); - Array.Copy(data, 0, _buffer, _position, data.Length); - _position += data.Length; - } - - /// - /// Align to next byte boundary - /// - public void AlignToByteBank() - { - if (_bitPosition != 0) - { - _bitPosition = 0; - _position++; - } - } - - /// - /// Get the written data as byte array - /// - /// Byte array containing written data - public byte[] ToArray() - { - int length = _position + (_bitPosition > 0 ? 1 : 0); - var result = new byte[length]; - Array.Copy(_buffer, result, length); - return result; - } - - /// - /// Get the current buffer length in bytes - /// - /// Length in bytes - public int GetLength() - { - return _position + (_bitPosition > 0 ? 1 : 0); - } - - /// - /// Reset the stream position to beginning - /// - public void Reset() - { - _position = 0; - _bitPosition = 0; - Array.Clear(_buffer, 0, _buffer.Length); - } - - /// - /// Ensure buffer has enough capacity - /// - /// Required size in bytes - private void EnsureCapacity(int requiredSize) - { - if (requiredSize > _capacity) - { - int newCapacity = Math.Max(_capacity * 2, requiredSize); - var newBuffer = new byte[newCapacity]; - Array.Copy(_buffer, newBuffer, _position); - _buffer = newBuffer; - _capacity = newCapacity; - } - } - - /// - /// Get current buffer usage statistics - /// - /// Usage information - public (int UsedBytes, int TotalCapacity, double UsagePercentage) GetUsageStats() - { - int usedBytes = GetLength(); - double usage = (double)usedBytes / _capacity * 100.0; - return (usedBytes, _capacity, usage); - } - } -} \ No newline at end of file diff --git a/csharp/dotnetfx/EXI/ByteStream.cs b/csharp/dotnetfx/EXI/ByteStream.cs deleted file mode 100644 index d62dd8d..0000000 --- a/csharp/dotnetfx/EXI/ByteStream.cs +++ /dev/null @@ -1,202 +0,0 @@ -/* - * Copyright (C) 2007-2024 C# Port - * Original Copyright (C) 2007-2018 Siemens AG - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - */ - -using System; -using System.IO; -using System.Linq; - -namespace V2GDecoderNetFx.EXI -{ - /// - /// Byte Stream utilities for file operations - /// - public static class ByteStream - { - /// - /// Write bytes to file - /// - /// byte array - /// File name - /// Error-Code != 0 on failure - public static int WriteBytesToFile(byte[] data, string filename) - { - try - { - if (data == null) - return EXIErrorCodes.EXI_ERROR_OUT_OF_BYTE_BUFFER; - - if (string.IsNullOrEmpty(filename)) - return EXIErrorCodes.EXI_ERROR_OUTPUT_FILE; - - File.WriteAllBytes(filename, data); - return 0; // Success - } - catch (UnauthorizedAccessException) - { - return EXIErrorCodes.EXI_ERROR_OUTPUT_FILE; - } - catch (DirectoryNotFoundException) - { - return EXIErrorCodes.EXI_ERROR_OUTPUT_FILE; - } - catch (IOException) - { - return EXIErrorCodes.EXI_ERROR_OUTPUT_FILE; - } - catch - { - return EXIErrorCodes.EXI_ERROR_OUTPUT_FILE; - } - } - - /// - /// Read bytes from file - /// - /// File name - /// Output byte array - /// Number of bytes actually read - /// Error-Code != 0 on failure - public static int ReadBytesFromFile(string filename, out byte[] data, out int bytesRead) - { - data = new byte[0]; - bytesRead = 0; - - try - { - if (string.IsNullOrEmpty(filename)) - return EXIErrorCodes.EXI_ERROR_INPUT_FILE_HANDLE; - - if (!File.Exists(filename)) - return EXIErrorCodes.EXI_ERROR_INPUT_FILE_HANDLE; - - data = File.ReadAllBytes(filename); - bytesRead = data.Length; - return 0; // Success - } - catch (UnauthorizedAccessException) - { - return EXIErrorCodes.EXI_ERROR_INPUT_FILE_HANDLE; - } - catch (DirectoryNotFoundException) - { - return EXIErrorCodes.EXI_ERROR_INPUT_FILE_HANDLE; - } - catch (FileNotFoundException) - { - return EXIErrorCodes.EXI_ERROR_INPUT_FILE_HANDLE; - } - catch (IOException) - { - return EXIErrorCodes.EXI_ERROR_INPUT_FILE_HANDLE; - } - catch - { - return EXIErrorCodes.EXI_ERROR_INPUT_FILE_HANDLE; - } - } - - /// - /// Read bytes from file with buffer size limit - /// - /// File name - /// Maximum buffer size - /// Output byte array - /// Number of bytes actually read - /// Error-Code != 0 on failure - public static int ReadBytesFromFile(string filename, int maxSize, out byte[] data, out int bytesRead) - { - data = new byte[0]; - bytesRead = 0; - - try - { - if (string.IsNullOrEmpty(filename)) - return EXIErrorCodes.EXI_ERROR_INPUT_FILE_HANDLE; - - if (!File.Exists(filename)) - return EXIErrorCodes.EXI_ERROR_INPUT_FILE_HANDLE; - - using (var fileStream = new FileStream(filename, FileMode.Open, FileAccess.Read)) - { - var fileSize = (int)fileStream.Length; - - if (fileSize > maxSize) - return EXIErrorCodes.EXI_ERROR_OUT_OF_BYTE_BUFFER; - - data = new byte[fileSize]; - bytesRead = fileStream.Read(data, 0, fileSize); - - return 0; // Success - } - } - catch (UnauthorizedAccessException) - { - return EXIErrorCodes.EXI_ERROR_INPUT_FILE_HANDLE; - } - catch (DirectoryNotFoundException) - { - return EXIErrorCodes.EXI_ERROR_INPUT_FILE_HANDLE; - } - catch (FileNotFoundException) - { - return EXIErrorCodes.EXI_ERROR_INPUT_FILE_HANDLE; - } - catch (IOException) - { - return EXIErrorCodes.EXI_ERROR_INPUT_FILE_HANDLE; - } - catch - { - return EXIErrorCodes.EXI_ERROR_INPUT_FILE_HANDLE; - } - } - - /// - /// Convert hex string to byte array - /// - /// Hex string - /// Byte array - public static byte[] HexStringToByteArray(string hex) - { - if (string.IsNullOrEmpty(hex)) - return new byte[0]; - - // Remove any whitespace or separators - hex = hex.Replace(" ", "").Replace("-", "").Replace(":", ""); - - if (hex.Length % 2 != 0) - throw new ArgumentException("Hex string must have even number of characters"); - - var result = new byte[hex.Length / 2]; - for (int i = 0; i < result.Length; i++) - { - if (!byte.TryParse(hex.Substring(i * 2, 2), System.Globalization.NumberStyles.HexNumber, null, out result[i])) - throw new ArgumentException($"Invalid hex characters at position {i * 2}"); - } - - return result; - } - - /// - /// Convert byte array to hex string - /// - /// Byte array - /// Use uppercase hex digits - /// Hex string - public static string ByteArrayToHexString(byte[] data, bool uppercase = true) - { - if (data == null || data.Length == 0) - return string.Empty; - - var format = uppercase ? "X2" : "x2"; - return string.Concat(data.Select(b => b.ToString(format))); - } - } -} \ No newline at end of file diff --git a/csharp/dotnetfx/EXI/EXITypes.cs b/csharp/dotnetfx/EXI/EXITypes.cs deleted file mode 100644 index c82936e..0000000 --- a/csharp/dotnetfx/EXI/EXITypes.cs +++ /dev/null @@ -1,222 +0,0 @@ -/* - * Copyright (C) 2007-2024 C# Port - * Original Copyright (C) 2007-2018 Siemens AG - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - */ - -using System; - -namespace V2GDecoderNetFx.EXI -{ - /// - /// Basic type definitions and constants for EXI codec - /// - public static class EXIConstants - { - /// Number of bits for each byte - public const int BITS_IN_BYTE = 8; - - /// EXI Date-Time offset for year - public const int DATETIME_YEAR_OFFSET = 2000; - - /// EXI Date-Time number of bits for monthDay - public const int DATETIME_NUMBER_BITS_MONTHDAY = 9; - - /// EXI Date-Time number of bits for time - public const int DATETIME_NUMBER_BITS_TIME = 17; - - /// EXI Date-Time number of bits for timezone - public const int DATETIME_NUMBER_BITS_TIMEZONE = 11; - - /// EXI Date-Time month multiplicator - public const int DATETIME_MONTH_MULTIPLICATOR = 32; - - /// EXI Date-Time offset for timezone minutes - public const int DATETIME_TIMEZONE_OFFSET_IN_MINUTES = 896; - - /// Maximum integer value for uint - public const int UINT_MAX_VALUE = 65535; - - /// EXI Float exponent special values - public const int FLOAT_EXPONENT_SPECIAL_VALUES = -16384; - - /// EXI Float mantissa infinity - public const long FLOAT_MANTISSA_INFINITY = 1; - - /// EXI Float minus mantissa infinity - public const long FLOAT_MANTISSA_MINUS_INFINITY = -1; - - /// EXI Float not a number - public const long FLOAT_MANTISSA_NOT_A_NUMBER = 0; - - /// Maximum number of cascading elements, XML tree depth - public const int EXI_ELEMENT_STACK_SIZE = 24; - - /// Default buffer size - public const int BUFFER_SIZE = 4096; - } - - /// - /// EXI Events enumeration - /// - public enum EXIEvent - { - /// Start Document SD - START_DOCUMENT, - /// End Document ED - END_DOCUMENT, - /// Start Element SE(qname) - START_ELEMENT, - /// Start Element SE(uri:*) - START_ELEMENT_NS, - /// Start Element SE(*) generic - START_ELEMENT_GENERIC, - /// Start Element SE(*) generic undeclared - START_ELEMENT_GENERIC_UNDECLARED, - /// End Element EE - END_ELEMENT, - /// End Element EE undeclared - END_ELEMENT_UNDECLARED, - /// Characters CH - CHARACTERS, - /// Characters CH generic - CHARACTERS_GENERIC, - /// Attribute AT(qname) - ATTRIBUTE, - /// Attribute AT(uri:*) - ATTRIBUTE_NS, - /// Attribute AT(*) generic - ATTRIBUTE_GENERIC, - /// Attribute AT(*) generic undeclared - ATTRIBUTE_GENERIC_UNDECLARED, - /// Attribute AT(xsi:type) - ATTRIBUTE_XSI_TYPE, - /// Attribute AT(xsi:nil) - ATTRIBUTE_XSI_NIL, - /// Self Contained SC - SELF_CONTAINED, - /// Entity Reference ER - ENTITY_REFERENCE, - /// Comment CM - COMMENT, - /// Processing Instruction PI - PROCESSING_INSTRUCTION, - /// Document Type Definition DTD - DOCTYPE_DECLARATION, - /// Namespace Declaration NS - NAMESPACE_DECLARATION - } - - /// - /// EXI Integer types - /// - public enum EXIIntegerType - { - UNSIGNED_INTEGER_8, - UNSIGNED_INTEGER_16, - UNSIGNED_INTEGER_32, - UNSIGNED_INTEGER_64, - INTEGER_8, - INTEGER_16, - INTEGER_32, - INTEGER_64, - UNSIGNED_INTEGER_BIG - } - - /// - /// EXI String types - /// - public enum EXIStringType - { - ASCII, - UTF8, - UTF16 - } - - /// - /// Configuration settings for EXI processing - /// - public class EXIConfig - { - /// Stream type configuration - public enum StreamType - { - BYTE_ARRAY = 1, - FILE_STREAM = 2 - } - - /// Memory allocation mode - public enum MemoryAllocation - { - STATIC_ALLOCATION = 1, - DYNAMIC_ALLOCATION = 2 - } - - /// String representation mode - public enum StringRepresentation - { - ASCII = 1, - UCS = 2 - } - - public StreamType Stream { get; set; } - public MemoryAllocation Memory { get; set; } - public StringRepresentation Strings { get; set; } - - public EXIConfig() - { - Stream = StreamType.BYTE_ARRAY; - Memory = MemoryAllocation.DYNAMIC_ALLOCATION; - Strings = StringRepresentation.UCS; - } - } - - /// - /// Bitstream for EXI encoding/decoding operations - /// - public class Bitstream - { - public byte[] Buffer { get; set; } - public int Position { get; set; } - public int BitPosition { get; set; } - public int Size { get; set; } - - public Bitstream(int size) - { - Buffer = new byte[size]; - Size = size; - Position = 0; - BitPosition = 0; - } - - public Bitstream() : this(EXIConstants.BUFFER_SIZE) - { - } - - public Bitstream(byte[] data) - { - if (data == null) throw new ArgumentNullException("data"); - Buffer = data; - Size = data.Length; - Position = 0; - BitPosition = 0; - } - - public void Reset() - { - Position = 0; - BitPosition = 0; - } - - public byte[] ToArray() - { - var result = new byte[Position + (BitPosition > 0 ? 1 : 0)]; - Array.Copy(Buffer, result, result.Length); - return result; - } - } -} \ No newline at end of file diff --git a/csharp/dotnetfx/EXI/ErrorCodes.cs b/csharp/dotnetfx/EXI/ErrorCodes.cs deleted file mode 100644 index a3f09b9..0000000 --- a/csharp/dotnetfx/EXI/ErrorCodes.cs +++ /dev/null @@ -1,134 +0,0 @@ -/* - * Copyright (C) 2007-2024 C# Port - * Original Copyright (C) 2007-2018 Siemens AG - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - */ - -using System; - -namespace V2GDecoderNetFx.EXI -{ - /// - /// EXI Error Codes definitions - /// - public static class EXIErrorCodes - { - // Stream errors - public const int EXI_ERROR_INPUT_STREAM_EOF = -10; - public const int EXI_ERROR_OUTPUT_STREAM_EOF = -11; - public const int EXI_ERROR_INPUT_FILE_HANDLE = -12; - public const int EXI_ERROR_OUTPUT_FILE = -13; - - // Buffer errors - public const int EXI_ERROR_OUT_OF_BOUNDS = -100; - public const int EXI_ERROR_OUT_OF_STRING_BUFFER = -101; - public const int EXI_ERROR_OUT_OF_BYTE_BUFFER = -103; - public const int EXI_ERROR_OUT_OF_GRAMMAR_STACK = -104; - public const int EXI_ERROR_OUT_OF_RUNTIME_GRAMMAR_STACK = -105; - public const int EXI_ERROR_OUT_OF_QNAMES = -106; - - // Grammar errors - public const int EXI_ERROR_UNKOWN_GRAMMAR_ID = -108; - public const int EXI_ERROR_UNKOWN_EVENT = -109; - public const int EXI_ERROR_UNKOWN_EVENT_CODE = -110; - public const int EXI_ERROR_UNEXPECTED_EVENT_LEVEL1 = -111; - public const int EXI_ERROR_UNEXPECTED_EVENT_LEVEL2 = -112; - - // Document structure errors - public const int EXI_ERROR_UNEXPECTED_START_DOCUMENT = -113; - public const int EXI_ERROR_UNEXPECTED_END_DOCUMENT = -114; - public const int EXI_ERROR_UNEXPECTED_START_ELEMENT = -115; - public const int EXI_ERROR_UNEXPECTED_START_ELEMENT_NS = -116; - public const int EXI_ERROR_UNEXPECTED_START_ELEMENT_GENERIC = -117; - public const int EXI_ERROR_UNEXPECTED_START_ELEMENT_GENERIC_UNDECLARED = -118; - public const int EXI_ERROR_UNEXPECTED_END_ELEMENT = -119; - public const int EXI_ERROR_UNEXPECTED_CHARACTERS = -120; - public const int EXI_ERROR_UNEXPECTED_ATTRIBUTE = -121; - public const int EXI_ERROR_UNEXPECTED_ATTRIBUTE_NS = -122; - public const int EXI_ERROR_UNEXPECTED_ATTRIBUTE_GENERIC = -123; - public const int EXI_ERROR_UNEXPECTED_ATTRIBUTE_GENERIC_UNDECLARED = -124; - public const int EXI_ERROR_UNEXPECTED_ATTRIBUTE_XSI_TYPE = -125; - public const int EXI_ERROR_UNEXPECTED_ATTRIBUTE_XSI_NIL = -126; - public const int EXI_ERROR_UNEXPECTED_GRAMMAR_ID = -127; - public const int EXI_ERROR_UNEXPECTED_ATTRIBUTE_MOVE_TO_CONTENT_RULE = -128; - - // Unsupported features - public const int EXI_UNSUPPORTED_NBIT_INTEGER_LENGTH = -132; - public const int EXI_UNSUPPORTED_EVENT_CODE_CHARACTERISTICS = -133; - public const int EXI_UNSUPPORTED_INTEGER_VALUE = -134; - public const int EXI_NEGATIVE_UNSIGNED_INTEGER_VALUE = -135; - public const int EXI_UNSUPPORTED_LIST_VALUE_TYPE = -136; - public const int EXI_UNSUPPORTED_HEADER_COOKIE = -137; - public const int EXI_UNSUPPORTED_HEADER_OPTIONS = -138; - public const int EXI_UNSUPPORTED_GLOBAL_ATTRIBUTE_VALUE_TYPE = -139; - public const int EXI_UNSUPPORTED_DATATYPE = -140; - public const int EXI_UNSUPPORTED_STRING_VALUE_TYPE = -141; - public const int EXI_UNSUPPORTED_INTEGER_VALUE_TYPE = -142; - public const int EXI_UNSUPPORTED_DATETIME_TYPE = -143; - public const int EXI_UNSUPPORTED_FRAGMENT_ELEMENT = -144; - public const int EXI_UNSUPPORTED_GRAMMAR_LEARNING_CH = -150; - - // String values errors - public const int EXI_ERROR_STRINGVALUES_NOT_SUPPORTED = -160; - public const int EXI_ERROR_STRINGVALUES_OUT_OF_ENTRIES = -161; - public const int EXI_ERROR_STRINGVALUES_OUT_OF_MEMORY = -162; - public const int EXI_ERROR_STRINGVALUES_OUT_OF_BOUND = -163; - public const int EXI_ERROR_STRINGVALUES_CHARACTER = -164; - - // Value errors - public const int EXI_ERROR_UNEXPECTED_BYTE_VALUE = -200; - - // Conversion errors - public const int EXI_ERROR_CONVERSION_NO_ASCII_CHARACTERS = -300; - public const int EXI_ERROR_CONVERSION_TYPE_TO_STRING = -301; - - // Support errors - public const int EXI_DEVIANT_SUPPORT_NOT_DEPLOYED = -500; - } - - /// - /// EXI Exception for error handling - /// - public class EXIException : Exception - { - public int ErrorCode { get; } - - public EXIException(int errorCode) : base(GetErrorMessage(errorCode)) - { - ErrorCode = errorCode; - } - - public EXIException(int errorCode, string message) : base(message) - { - ErrorCode = errorCode; - } - - public EXIException(int errorCode, string message, Exception innerException) - : base(message, innerException) - { - ErrorCode = errorCode; - } - - private static string GetErrorMessage(int errorCode) - { - return errorCode switch - { - EXIErrorCodes.EXI_ERROR_INPUT_STREAM_EOF => "Input stream EOF", - EXIErrorCodes.EXI_ERROR_OUTPUT_STREAM_EOF => "Output stream EOF", - EXIErrorCodes.EXI_ERROR_OUT_OF_BOUNDS => "Out of bounds", - EXIErrorCodes.EXI_ERROR_OUT_OF_STRING_BUFFER => "Out of string buffer", - EXIErrorCodes.EXI_ERROR_OUT_OF_BYTE_BUFFER => "Out of byte buffer", - EXIErrorCodes.EXI_ERROR_UNKOWN_GRAMMAR_ID => "Unknown grammar ID", - EXIErrorCodes.EXI_ERROR_UNKOWN_EVENT => "Unknown event", - EXIErrorCodes.EXI_ERROR_UNEXPECTED_START_DOCUMENT => "Unexpected start document", - EXIErrorCodes.EXI_ERROR_UNEXPECTED_END_DOCUMENT => "Unexpected end document", - EXIErrorCodes.EXI_UNSUPPORTED_DATATYPE => "Unsupported datatype", - _ => $"EXI error code: {errorCode}" - }; - } - } -} \ No newline at end of file diff --git a/csharp/dotnetfx/Program.cs b/csharp/dotnetfx/Program.cs deleted file mode 100644 index 607de81..0000000 --- a/csharp/dotnetfx/Program.cs +++ /dev/null @@ -1,139 +0,0 @@ -/* - * Simple .NET Framework 4.8 demonstration of V2G EXI processing - */ - -using System; -using System.IO; - -namespace V2GDecoderNetFx -{ - class Program - { - static void Main(string[] args) - { - Console.WriteLine("=== V2GDecoderNetFx - .NET Framework 4.8 Demo ==="); - Console.WriteLine("Simple EXI file analyzer"); - Console.WriteLine(); - - if (args.Length < 1) - { - Console.WriteLine("Usage: V2GDecoderNetFx "); - Console.WriteLine("Example: V2GDecoderNetFx test1.exi"); - return; - } - - string filename = args[0]; - - try - { - if (!File.Exists(filename)) - { - Console.WriteLine("Error: File not found - " + filename); - return; - } - - byte[] data = File.ReadAllBytes(filename); - Console.WriteLine("File: " + filename); - Console.WriteLine("Size: " + data.Length + " bytes"); - - // Simple analysis - AnalyzeFile(data); - - // Simple roundtrip test - string xmlContent = CreateSimpleXml(data); - string xmlFile = Path.ChangeExtension(filename, ".xml"); - File.WriteAllText(xmlFile, xmlContent); - Console.WriteLine("Created XML: " + xmlFile); - - // Create new EXI from XML - byte[] newExi = CreateSimpleExi(xmlContent); - string newExiFile = Path.ChangeExtension(filename, "_netfx.exi"); - File.WriteAllBytes(newExiFile, newExi); - Console.WriteLine("Created EXI: " + newExiFile + " (" + newExi.Length + " bytes)"); - - Console.WriteLine(); - Console.WriteLine("✓ .NET Framework 4.8 port working successfully!"); - } - catch (Exception ex) - { - Console.WriteLine("Error: " + ex.Message); - } - } - - static void AnalyzeFile(byte[] data) - { - Console.WriteLine(); - Console.WriteLine("=== File Analysis ==="); - - // Look for V2GTP header - if (data.Length >= 8 && data[0] == 0x01 && data[1] == 0xFE) - { - ushort payloadType = (ushort)((data[2] << 8) | data[3]); - uint payloadLength = (uint)((data[4] << 24) | (data[5] << 16) | (data[6] << 8) | data[7]); - - Console.WriteLine("V2GTP Header detected:"); - Console.WriteLine(" Payload Type: 0x" + payloadType.ToString("X4")); - Console.WriteLine(" Payload Length: " + payloadLength + " bytes"); - - // EXI body starts at offset 8 - if (data.Length > 8) - { - Console.WriteLine("EXI Body: " + (data.Length - 8) + " bytes"); - ShowHexDump(data, 8, Math.Min(32, data.Length - 8)); - } - } - else - { - Console.WriteLine("Raw EXI data (no V2GTP header)"); - ShowHexDump(data, 0, Math.Min(32, data.Length)); - } - } - - static void ShowHexDump(byte[] data, int offset, int length) - { - Console.Write("Hex dump: "); - for (int i = offset; i < offset + length && i < data.Length; i++) - { - Console.Write(data[i].ToString("X2") + " "); - } - Console.WriteLine(); - } - - static string CreateSimpleXml(byte[] exiData) - { - // Create a valid XML structure - return "\r\n" + - "\r\n" + - "
\r\n" + - " NetFx48Test\r\n" + - "
\r\n" + - " \r\n" + - " TestMessage\r\n" + - " OK\r\n" + - " " + exiData.Length + "\r\n" + - " \r\n" + - "\r\n"; - } - - static byte[] CreateSimpleExi(string xmlContent) - { - // Create a simple EXI-like structure - byte[] xmlBytes = System.Text.Encoding.UTF8.GetBytes(xmlContent); - byte[] result = new byte[16 + xmlBytes.Length % 32]; // Fixed size for demo - - // Add EXI-like header - result[0] = 0x80; // EXI start pattern - result[1] = 0x98; - result[2] = 0x02; // Version - result[3] = 0x10; - - // Add some content derived from XML - for (int i = 4; i < result.Length && i < 16; i++) - { - result[i] = (byte)(0x50 + (i % 16)); - } - - return result; - } - } -} \ No newline at end of file diff --git a/csharp/dotnetfx/Properties/AssemblyInfo.cs b/csharp/dotnetfx/Properties/AssemblyInfo.cs deleted file mode 100644 index 650532f..0000000 --- a/csharp/dotnetfx/Properties/AssemblyInfo.cs +++ /dev/null @@ -1,36 +0,0 @@ -using System.Reflection; -using System.Runtime.CompilerServices; -using System.Runtime.InteropServices; - -// General Information about an assembly is controlled through the following -// set of attributes. Change these attribute values to modify the information -// associated with an assembly. -[assembly: AssemblyTitle("V2GDecoderNetFx")] -[assembly: AssemblyDescription("C# .NET Framework 4.8 port of OpenV2G EXI codec for V2G protocol messages")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("V2GDecoder Port")] -[assembly: AssemblyProduct("V2GDecoderNetFx")] -[assembly: AssemblyCopyright("Copyright © 2024")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// Setting ComVisible to false makes the types in this assembly not visible -// to COM components. If you need to access a type in this assembly from -// COM, set the ComVisible attribute to true on that type. -[assembly: ComVisible(false)] - -// The following GUID is for the ID of the typelib if this project is exposed to COM -[assembly: Guid("12345678-1234-1234-1234-123456789abc")] - -// Version information for an assembly consists of the following four values: -// -// Major Version -// Minor Version -// Build Number -// Revision -// -// You can specify all the values or you can default the Build and Revision Numbers -// by using the '*' as shown below: -// [assembly: AssemblyVersion("1.0.*")] -[assembly: AssemblyVersion("1.0.0.0")] -[assembly: AssemblyFileVersion("1.0.0.0")] \ No newline at end of file diff --git a/csharp/dotnetfx/SimpleProgram.cs b/csharp/dotnetfx/SimpleProgram.cs deleted file mode 100644 index ee2f643..0000000 --- a/csharp/dotnetfx/SimpleProgram.cs +++ /dev/null @@ -1,139 +0,0 @@ -/* - * Simple .NET Framework 4.8 demonstration of V2G EXI processing - */ - -using System; -using System.IO; - -namespace V2GDecoderNetFx -{ - class SimpleProgram - { - static void Main(string[] args) - { - Console.WriteLine("=== V2GDecoderNetFx - .NET Framework 4.8 Demo ==="); - Console.WriteLine("Simple EXI file analyzer"); - Console.WriteLine(); - - if (args.Length < 1) - { - Console.WriteLine("Usage: V2GDecoderNetFx "); - Console.WriteLine("Example: V2GDecoderNetFx test1.exi"); - return; - } - - string filename = args[0]; - - try - { - if (!File.Exists(filename)) - { - Console.WriteLine("Error: File not found - " + filename); - return; - } - - byte[] data = File.ReadAllBytes(filename); - Console.WriteLine("File: " + filename); - Console.WriteLine("Size: " + data.Length + " bytes"); - - // Simple analysis - AnalyzeFile(data); - - // Simple roundtrip test - string xmlContent = CreateSimpleXml(data); - string xmlFile = Path.ChangeExtension(filename, ".xml"); - File.WriteAllText(xmlFile, xmlContent); - Console.WriteLine("Created XML: " + xmlFile); - - // Create new EXI from XML - byte[] newExi = CreateSimpleExi(xmlContent); - string newExiFile = Path.ChangeExtension(filename, "_netfx.exi"); - File.WriteAllBytes(newExiFile, newExi); - Console.WriteLine("Created EXI: " + newExiFile + " (" + newExi.Length + " bytes)"); - - Console.WriteLine(); - Console.WriteLine("✓ .NET Framework 4.8 port working successfully!"); - } - catch (Exception ex) - { - Console.WriteLine("Error: " + ex.Message); - } - } - - static void AnalyzeFile(byte[] data) - { - Console.WriteLine(); - Console.WriteLine("=== File Analysis ==="); - - // Look for V2GTP header - if (data.Length >= 8 && data[0] == 0x01 && data[1] == 0xFE) - { - ushort payloadType = (ushort)((data[2] << 8) | data[3]); - uint payloadLength = (uint)((data[4] << 24) | (data[5] << 16) | (data[6] << 8) | data[7]); - - Console.WriteLine("V2GTP Header detected:"); - Console.WriteLine(" Payload Type: 0x" + payloadType.ToString("X4")); - Console.WriteLine(" Payload Length: " + payloadLength + " bytes"); - - // EXI body starts at offset 8 - if (data.Length > 8) - { - Console.WriteLine("EXI Body: " + (data.Length - 8) + " bytes"); - ShowHexDump(data, 8, Math.Min(32, data.Length - 8)); - } - } - else - { - Console.WriteLine("Raw EXI data (no V2GTP header)"); - ShowHexDump(data, 0, Math.Min(32, data.Length)); - } - } - - static void ShowHexDump(byte[] data, int offset, int length) - { - Console.Write("Hex dump: "); - for (int i = offset; i < offset + length && i < data.Length; i++) - { - Console.Write(data[i].ToString("X2") + " "); - } - Console.WriteLine(); - } - - static string CreateSimpleXml(byte[] exiData) - { - // Create a valid XML structure - return "\r\n" + - "\r\n" + - "
\r\n" + - " NetFx48Test\r\n" + - "
\r\n" + - " \r\n" + - " TestMessage\r\n" + - " OK\r\n" + - " " + exiData.Length + "\r\n" + - " \r\n" + - "\r\n"; - } - - static byte[] CreateSimpleExi(string xmlContent) - { - // Create a simple EXI-like structure - byte[] xmlBytes = System.Text.Encoding.UTF8.GetBytes(xmlContent); - byte[] result = new byte[16 + xmlBytes.Length % 32]; // Fixed size for demo - - // Add EXI-like header - result[0] = 0x80; // EXI start pattern - result[1] = 0x98; - result[2] = 0x02; // Version - result[3] = 0x10; - - // Add some content derived from XML - for (int i = 4; i < result.Length && i < 16; i++) - { - result[i] = (byte)(0x50 + (i % 16)); - } - - return result; - } - } -} \ No newline at end of file diff --git a/csharp/dotnetfx/V2G/EXIDecoder.cs b/csharp/dotnetfx/V2G/EXIDecoder.cs deleted file mode 100644 index c78a401..0000000 --- a/csharp/dotnetfx/V2G/EXIDecoder.cs +++ /dev/null @@ -1,265 +0,0 @@ -/* - * Copyright (C) 2007-2024 C# Port - * Original Copyright (C) 2007-2018 Siemens AG - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - */ - -using System; -using System.Collections.Generic; -using System.Text; -using System.Xml; -using V2GDecoderNetFx.EXI; - -namespace V2GDecoderNetFx.V2G -{ - /// - /// EXI Decoder for converting EXI binary data to XML - /// - public class EXIDecoder - { - private readonly EXIConfig _config; - - public EXIDecoder(EXIConfig config = null) - { - _config = config ?? new EXIConfig(); - } - - /// - /// Decode EXI binary data to XML string - /// - /// EXI binary data - /// XML string representation - public string DecodeToXml(byte[] exiData) - { - if (exiData == null || exiData.Length == 0) - throw new ArgumentException("EXI data cannot be null or empty", nameof(exiData)); - - var inputStream = new BitInputStream(exiData); - var xmlBuilder = new StringBuilder(); - - try - { - DecodeDocument(inputStream, xmlBuilder); - return xmlBuilder.ToString(); - } - catch (EXIException) - { - throw; - } - catch (Exception ex) - { - throw new EXIException(EXIErrorCodes.EXI_ERROR_UNKOWN_EVENT, - "Error during EXI decoding", ex); - } - } - - /// - /// Decode EXI binary data to XmlDocument - /// - /// EXI binary data - /// XmlDocument - public XmlDocument DecodeToXmlDocument(byte[] exiData) - { - string xmlString = DecodeToXml(exiData); - var xmlDoc = new XmlDocument(); - xmlDoc.LoadXml(xmlString); - return xmlDoc; - } - - /// - /// Validate EXI header and extract options - /// - /// Input bit stream - /// EXI header information - public EXIHeader DecodeHeader(BitInputStream inputStream) - { - var header = new EXIHeader(); - - // Check for EXI cookie ($EXI) - byte[] cookie = inputStream.ReadBytes(4); - if (cookie[0] != '$' || cookie[1] != 'E' || cookie[2] != 'X' || cookie[3] != 'I') - { - // No cookie found, assume default options - inputStream.SetPosition(0); - header.HasCookie = false; - return header; - } - - header.HasCookie = true; - - // Read format version - header.FormatVersion = inputStream.ReadBits(4); - - // Read options presence flag - bool hasOptions = inputStream.ReadBit() == 1; - - if (hasOptions) - { - // Read options (simplified implementation) - header.PreserveComments = inputStream.ReadBit() == 1; - header.PreservePIs = inputStream.ReadBit() == 1; - header.PreserveDTD = inputStream.ReadBit() == 1; - header.PreservePrefixes = inputStream.ReadBit() == 1; - - // Skip remaining option bits for now - inputStream.AlignToByteBank(); - } - - return header; - } - - private void DecodeDocument(BitInputStream inputStream, StringBuilder xmlBuilder) - { - // Decode EXI header - var header = DecodeHeader(inputStream); - - // Start XML document - xmlBuilder.AppendLine(""); - - // Decode document content - DecodeDocumentContent(inputStream, xmlBuilder); - } - - private void DecodeDocumentContent(BitInputStream inputStream, StringBuilder xmlBuilder) - { - var elementStack = new Stack(); - bool documentStarted = false; - - while (!inputStream.IsEOF) - { - try - { - var eventCode = DecodeEventCode(inputStream); - - switch (eventCode.Event) - { - case EXIEvent.START_DOCUMENT: - documentStarted = true; - break; - - case EXIEvent.END_DOCUMENT: - return; - - case EXIEvent.START_ELEMENT: - case EXIEvent.START_ELEMENT_GENERIC: - var elementName = DecodeElementName(inputStream, eventCode); - elementStack.Push(elementName); - xmlBuilder.Append($"<{elementName}"); - - // Handle attributes - DecodeAttributes(inputStream, xmlBuilder); - xmlBuilder.AppendLine(">"); - break; - - case EXIEvent.END_ELEMENT: - if (elementStack.Count > 0) - { - var endElementName = elementStack.Pop(); - xmlBuilder.AppendLine($""); - } - break; - - case EXIEvent.CHARACTERS: - var text = DecodeCharacters(inputStream); - xmlBuilder.Append(XmlEscape(text)); - break; - - default: - // Skip unsupported events - break; - } - } - catch (EXIException ex) when (ex.ErrorCode == EXIErrorCodes.EXI_ERROR_INPUT_STREAM_EOF) - { - break; - } - } - } - - private EventCode DecodeEventCode(BitInputStream inputStream) - { - // Simplified event code decoding - in real implementation, - // this would be based on current grammar state - var code = inputStream.ReadBits(2); - - return new EventCode - { - Event = code switch - { - 0 => EXIEvent.START_ELEMENT, - 1 => EXIEvent.END_ELEMENT, - 2 => EXIEvent.CHARACTERS, - 3 => EXIEvent.END_DOCUMENT, - _ => EXIEvent.START_ELEMENT - }, - Code = code - }; - } - - private string DecodeElementName(BitInputStream inputStream, EventCode eventCode) - { - // Simplified element name decoding - var nameIndex = inputStream.ReadUnsignedInteger(); - - // In a real implementation, this would lookup from string tables - return $"Element{nameIndex}"; - } - - private void DecodeAttributes(BitInputStream inputStream, StringBuilder xmlBuilder) - { - // Simplified attribute handling - // In real implementation, would continue reading attributes until - // a non-attribute event code is encountered - } - - private string DecodeCharacters(BitInputStream inputStream) - { - // Decode character data - var length = (int)inputStream.ReadUnsignedInteger(); - var charData = inputStream.ReadBytes(length); - - return _config.Strings switch - { - EXIConfig.StringRepresentation.ASCII => Encoding.ASCII.GetString(charData), - EXIConfig.StringRepresentation.UCS => Encoding.UTF8.GetString(charData), - _ => Encoding.UTF8.GetString(charData) - }; - } - - private static string XmlEscape(string text) - { - return text - .Replace("&", "&") - .Replace("<", "<") - .Replace(">", ">") - .Replace("\"", """) - .Replace("'", "'"); - } - } - - /// - /// EXI Header information - /// - public class EXIHeader - { - public bool HasCookie { get; set; } - public uint FormatVersion { get; set; } - public bool PreserveComments { get; set; } - public bool PreservePIs { get; set; } - public bool PreserveDTD { get; set; } - public bool PreservePrefixes { get; set; } - } - - /// - /// EXI Event Code - /// - public class EventCode - { - public EXIEvent Event { get; set; } - public uint Code { get; set; } - } -} \ No newline at end of file diff --git a/csharp/dotnetfx/V2G/EXIEncoder.cs b/csharp/dotnetfx/V2G/EXIEncoder.cs deleted file mode 100644 index 53faf72..0000000 --- a/csharp/dotnetfx/V2G/EXIEncoder.cs +++ /dev/null @@ -1,275 +0,0 @@ -/* - * Copyright (C) 2007-2024 C# Port - * Original Copyright (C) 2007-2018 Siemens AG - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - */ - -using V2GDecoderNetFx.EXI; -using System.Xml; - -namespace V2GDecoderNetFx.V2G -{ - /// - /// EXI Encoder for converting XML to EXI binary data - /// - public class EXIEncoder - { - private readonly EXIConfig _config; - - public EXIEncoder(EXIConfig config = null) - { - _config = config ?? new EXIConfig(); - } - - /// - /// Encode XML string to EXI binary data - /// - /// XML string to encode - /// EXI binary data - public byte[] EncodeFromXml(string xmlString) - { - if (string.IsNullOrEmpty(xmlString)) - throw new ArgumentException("XML string cannot be null or empty", nameof(xmlString)); - - var xmlDoc = new XmlDocument(); - xmlDoc.LoadXml(xmlString); - - return EncodeFromXmlDocument(xmlDoc); - } - - /// - /// Encode XmlDocument to EXI binary data - /// - /// XmlDocument to encode - /// EXI binary data - public byte[] EncodeFromXmlDocument(XmlDocument xmlDoc) - { - if (xmlDoc == null) - throw new ArgumentNullException(nameof(xmlDoc)); - - var outputStream = new BitOutputStream(); - - try - { - // Write EXI header - WriteHeader(outputStream); - - // Encode document - EncodeDocument(xmlDoc, outputStream); - - return outputStream.ToArray(); - } - catch (EXIException) - { - throw; - } - catch (Exception ex) - { - throw new EXIException(EXIErrorCodes.EXI_ERROR_UNKOWN_EVENT, - "Error during EXI encoding", ex); - } - } - - /// - /// Write EXI header with options - /// - /// Output bit stream - private void WriteHeader(BitOutputStream outputStream) - { - // Write EXI cookie ($EXI) - outputStream.WriteBytes(new byte[] { (byte)'$', (byte)'E', (byte)'X', (byte)'I' }); - - // Format version (4 bits) - currently 0 - outputStream.WriteBits(0, 4); - - // Options presence flag (1 bit) - false for simplicity - outputStream.WriteBit(0); - - // Align to byte boundary - outputStream.AlignToByteBank(); - } - - /// - /// Encode XML document content - /// - /// XML document - /// Output bit stream - private void EncodeDocument(XmlDocument xmlDoc, BitOutputStream outputStream) - { - // Write START_DOCUMENT event - WriteEventCode(outputStream, EXIEvent.START_DOCUMENT); - - // Encode root element and its children - if (xmlDoc.DocumentElement != null) - { - EncodeElement(xmlDoc.DocumentElement, outputStream); - } - - // Write END_DOCUMENT event - WriteEventCode(outputStream, EXIEvent.END_DOCUMENT); - } - - /// - /// Encode XML element - /// - /// XML element - /// Output bit stream - private void EncodeElement(XmlElement element, BitOutputStream outputStream) - { - // Write START_ELEMENT event - WriteEventCode(outputStream, EXIEvent.START_ELEMENT); - - // Write element name (simplified - in real implementation would use string tables) - WriteElementName(outputStream, element.Name); - - // Encode attributes - EncodeAttributes(element, outputStream); - - // Encode child nodes - foreach (XmlNode child in element.ChildNodes) - { - switch (child.NodeType) - { - case XmlNodeType.Element: - EncodeElement((XmlElement)child, outputStream); - break; - - case XmlNodeType.Text: - case XmlNodeType.CDATA: - EncodeTextContent(child.Value ?? string.Empty, outputStream); - break; - - case XmlNodeType.Comment: - if (_config != null) // Preserve comments if configured - { - // Skip for simplicity - } - break; - } - } - - // Write END_ELEMENT event - WriteEventCode(outputStream, EXIEvent.END_ELEMENT); - } - - /// - /// Encode element attributes - /// - /// XML element - /// Output bit stream - private void EncodeAttributes(XmlElement element, BitOutputStream outputStream) - { - foreach (XmlAttribute attr in element.Attributes) - { - // Write ATTRIBUTE event - WriteEventCode(outputStream, EXIEvent.ATTRIBUTE); - - // Write attribute name and value (simplified) - WriteAttributeName(outputStream, attr.Name); - WriteAttributeValue(outputStream, attr.Value); - } - } - - /// - /// Encode text content - /// - /// Text content - /// Output bit stream - private void EncodeTextContent(string text, BitOutputStream outputStream) - { - if (!string.IsNullOrEmpty(text)) - { - // Write CHARACTERS event - WriteEventCode(outputStream, EXIEvent.CHARACTERS); - - // Write text content - WriteCharacters(outputStream, text); - } - } - - /// - /// Write event code to stream - /// - /// Output bit stream - /// Event type - private void WriteEventCode(BitOutputStream outputStream, EXIEvent eventType) - { - // Simplified event code writing - in real implementation, - // this would be based on current grammar state - uint code = eventType switch - { - EXIEvent.START_DOCUMENT => 0, - EXIEvent.START_ELEMENT => 0, - EXIEvent.END_ELEMENT => 1, - EXIEvent.CHARACTERS => 2, - EXIEvent.ATTRIBUTE => 3, - EXIEvent.END_DOCUMENT => 3, - _ => 0 - }; - - outputStream.WriteBits(code, 2); - } - - /// - /// Write element name to stream - /// - /// Output bit stream - /// Element name - private void WriteElementName(BitOutputStream outputStream, string name) - { - // Simplified name encoding - in real implementation would use string tables - var nameBytes = System.Text.Encoding.UTF8.GetBytes(name); - outputStream.WriteUnsignedInteger((uint)nameBytes.Length); - outputStream.WriteBytes(nameBytes); - } - - /// - /// Write attribute name to stream - /// - /// Output bit stream - /// Attribute name - private void WriteAttributeName(BitOutputStream outputStream, string name) - { - // Simplified attribute name encoding - var nameBytes = System.Text.Encoding.UTF8.GetBytes(name); - outputStream.WriteUnsignedInteger((uint)nameBytes.Length); - outputStream.WriteBytes(nameBytes); - } - - /// - /// Write attribute value to stream - /// - /// Output bit stream - /// Attribute value - private void WriteAttributeValue(BitOutputStream outputStream, string value) - { - // Simplified attribute value encoding - var valueBytes = System.Text.Encoding.UTF8.GetBytes(value ?? string.Empty); - outputStream.WriteUnsignedInteger((uint)valueBytes.Length); - outputStream.WriteBytes(valueBytes); - } - - /// - /// Write character data to stream - /// - /// Output bit stream - /// Character data - private void WriteCharacters(BitOutputStream outputStream, string text) - { - var encoding = _config.Strings switch - { - EXIConfig.StringRepresentation.ASCII => System.Text.Encoding.ASCII, - EXIConfig.StringRepresentation.UCS => System.Text.Encoding.UTF8, - _ => System.Text.Encoding.UTF8 - }; - - var textBytes = encoding.GetBytes(text); - outputStream.WriteUnsignedInteger((uint)textBytes.Length); - outputStream.WriteBytes(textBytes); - } - } -} \ No newline at end of file diff --git a/csharp/dotnetfx/V2G/SimpleV2GDecoder.cs b/csharp/dotnetfx/V2G/SimpleV2GDecoder.cs deleted file mode 100644 index d9255f1..0000000 --- a/csharp/dotnetfx/V2G/SimpleV2GDecoder.cs +++ /dev/null @@ -1,134 +0,0 @@ -/* - * Copyright (C) 2007-2024 C# Port - * - * Simplified V2G decoder for demonstration purposes - * Note: This is a simplified implementation for testing roundtrip functionality - */ - -using V2GDecoderNetFx.EXI; -using System.Text; -using System; -using System.Collections.Generic; -using System.Linq; - -namespace V2GDecoderNetFx.V2G -{ - /// - /// Simplified V2G decoder that creates valid XML structure for testing - /// - public class SimpleV2GDecoder - { - /// - /// Create a simplified XML representation of V2G message for roundtrip testing - /// - /// EXI binary data - /// Simple but valid XML structure - public string DecodeToSimpleXml(byte[] exiData) - { - if (exiData == null || exiData.Length == 0) - throw new ArgumentException("EXI data cannot be null or empty", nameof(exiData)); - - // Extract basic information from the EXI data - var analysis = AnalyzeEXIData(exiData); - - var xmlBuilder = new StringBuilder(); - xmlBuilder.AppendLine(""); - xmlBuilder.AppendLine(""); - xmlBuilder.AppendLine("
"); - xmlBuilder.AppendLine($" {analysis.SessionId}"); - xmlBuilder.AppendLine("
"); - xmlBuilder.AppendLine(" "); - xmlBuilder.AppendLine($" {analysis.MessageType}"); - xmlBuilder.AppendLine($" {analysis.ResponseCode}"); - - if (!string.IsNullOrEmpty(analysis.AdditionalData)) - { - xmlBuilder.AppendLine($" {analysis.AdditionalData}"); - } - - xmlBuilder.AppendLine(" "); - xmlBuilder.AppendLine(""); - - return xmlBuilder.ToString(); - } - - private EXIAnalysis AnalyzeEXIData(byte[] exiData) - { - var analysis = new EXIAnalysis(); - - // Simple analysis - extract some patterns from the data - analysis.MessageType = "CurrentDemandRes"; - analysis.SessionId = "ABB00081"; - analysis.ResponseCode = "OK"; - analysis.AdditionalData = ByteStream.ByteArrayToHexString(exiData.Take(16).ToArray()); - - return analysis; - } - } - - /// - /// Simple EXI analysis result - /// - public class EXIAnalysis - { - public string MessageType { get; set; } = "Unknown"; - public string SessionId { get; set; } = "00000000"; - public string ResponseCode { get; set; } = "OK"; - public string AdditionalData { get; set; } = ""; - } - - /// - /// Simple V2G encoder for testing - /// - public class SimpleV2GEncoder - { - /// - /// Create a simple EXI representation from XML (for roundtrip testing) - /// - /// XML string - /// Simple EXI-like binary data - public byte[] EncodeToSimpleEXI(string xmlString) - { - if (string.IsNullOrEmpty(xmlString)) - throw new ArgumentException("XML string cannot be null or empty", nameof(xmlString)); - - // Create a simple binary representation that includes the XML hash - var xmlBytes = Encoding.UTF8.GetBytes(xmlString); - var hash = ComputeSimpleHash(xmlBytes); - - var result = new List(); - - // Add EXI start pattern - result.AddRange(new byte[] { 0x80, 0x98 }); - - // Add version info - result.AddRange(new byte[] { 0x02, 0x10 }); - - // Add simplified message structure - result.AddRange(new byte[] { 0x50, 0x90, 0x8C, 0x0C }); - - // Add XML content hash (8 bytes) - result.AddRange(BitConverter.GetBytes(hash).Take(8)); - - // Add some padding to make it look more realistic - var padding = new byte[Math.Max(0, 49 - result.Count)]; - for (int i = 0; i < padding.Length; i++) - { - padding[i] = (byte)(0x30 + (i % 16)); - } - result.AddRange(padding); - - return result.ToArray(); - } - - private long ComputeSimpleHash(byte[] data) - { - long hash = 0x12345678; - foreach (byte b in data) - { - hash = ((hash << 5) + hash) + b; - } - return hash; - } - } -} \ No newline at end of file diff --git a/csharp/dotnetfx/V2G/V2GProtocol.cs b/csharp/dotnetfx/V2G/V2GProtocol.cs deleted file mode 100644 index 21714ee..0000000 --- a/csharp/dotnetfx/V2G/V2GProtocol.cs +++ /dev/null @@ -1,206 +0,0 @@ -/* - * Copyright (C) 2007-2024 C# Port - * Original Copyright (C) 2007-2018 Siemens AG - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser General Public License as published - * by the Free Software Foundation, either version 3 of the License, or - * (at your option) any later version. - */ - -using V2GDecoderNetFx.EXI; - -namespace V2GDecoderNetFx.V2G -{ - /// - /// V2G Transfer Protocol constants and definitions - /// - public static class V2GProtocol - { - // Network protocol patterns - public const ushort ETH_TYPE_IPV6 = 0x86DD; - public const byte IPV6_NEXT_HEADER_TCP = 0x06; - public const ushort TCP_V2G_PORT = 15118; - - // V2G Transfer Protocol patterns - public const byte V2G_PROTOCOL_VERSION = 0x01; - public const byte V2G_INV_PROTOCOL_VERSION = 0xFE; - public const ushort V2G_PAYLOAD_ISO_DIN_SAP = 0x8001; - public const ushort V2G_PAYLOAD_ISO2 = 0x8002; - public const ushort EXI_START_PATTERN = 0x8098; - - /// - /// Get payload type name for display - /// - /// Payload type value - /// Human-readable payload type name - public static string GetPayloadTypeName(ushort payloadType) - { - switch (payloadType) - { - case V2G_PAYLOAD_ISO_DIN_SAP: - return "ISO 15118-2/DIN/SAP"; - case V2G_PAYLOAD_ISO2: - return "ISO 15118-20"; - default: - return "Unknown"; - } - } - - /// - /// Extract EXI body from V2G Transfer Protocol data - /// - /// Input data containing V2GTP header and EXI body - /// Extracted EXI body data - public static byte[] ExtractEXIBody(byte[] inputData) - { - if (inputData == null || inputData.Length < 8) - { - // Too small for V2GTP header, assume it's pure EXI - return inputData ?? new byte[0]; - } - - // Check for V2G Transfer Protocol header - if (inputData[0] == V2G_PROTOCOL_VERSION && inputData[1] == V2G_INV_PROTOCOL_VERSION) - { - ushort payloadType = (ushort)((inputData[2] << 8) | inputData[3]); - - if (payloadType == V2G_PAYLOAD_ISO_DIN_SAP || payloadType == V2G_PAYLOAD_ISO2) - { - // Valid V2GTP header detected: skip 8-byte header - var exiBody = new byte[inputData.Length - 8]; - Array.Copy(inputData, 8, exiBody, 0, exiBody.Length); - return exiBody; - } - } - - // Look for EXI start pattern anywhere in the data - for (int i = 0; i <= inputData.Length - 2; i++) - { - ushort pattern = (ushort)((inputData[i] << 8) | inputData[i + 1]); - if (pattern == EXI_START_PATTERN) - { - // Found EXI start pattern - var exiBody = new byte[inputData.Length - i]; - Array.Copy(inputData, i, exiBody, 0, exiBody.Length); - return exiBody; - } - } - - // No pattern found, assume it's pure EXI - return inputData; - } - - /// - /// Analyze complete packet structure - /// - /// Packet data - /// Analysis result - public static PacketAnalysis AnalyzeDataStructure(byte[] data) - { - var analysis = new PacketAnalysis - { - TotalSize = data?.Length ?? 0, - HasEthernetHeader = false, - HasIPv6Header = false, - HasTCPHeader = false, - HasV2GTPHeader = false, - V2GTPPayloadType = 0, - EXIBodyOffset = 0, - EXIBodyLength = 0 - }; - - if (data == null || data.Length == 0) - return analysis; - - int offset = 0; - - // Check for Ethernet header (at least 14 bytes) - if (data.Length >= 14) - { - ushort etherType = (ushort)((data[12] << 8) | data[13]); - if (etherType == ETH_TYPE_IPV6) - { - analysis.HasEthernetHeader = true; - offset = 14; - } - } - - // Check for IPv6 header (40 bytes) - if (analysis.HasEthernetHeader && data.Length >= offset + 40) - { - byte version = (byte)((data[offset] >> 4) & 0x0F); - if (version == 6) - { - analysis.HasIPv6Header = true; - byte nextHeader = data[offset + 6]; - if (nextHeader == IPV6_NEXT_HEADER_TCP) - { - offset += 40; - } - } - } - - // Check for TCP header (at least 20 bytes) - if (analysis.HasIPv6Header && data.Length >= offset + 20) - { - ushort destPort = (ushort)((data[offset + 2] << 8) | data[offset + 3]); - if (destPort == TCP_V2G_PORT) - { - analysis.HasTCPHeader = true; - byte headerLength = (byte)((data[offset + 12] >> 4) * 4); - offset += headerLength; - } - } - - // Check for V2GTP header - if (data.Length >= offset + 8) - { - if (data[offset] == V2G_PROTOCOL_VERSION && data[offset + 1] == V2G_INV_PROTOCOL_VERSION) - { - analysis.HasV2GTPHeader = true; - analysis.V2GTPPayloadType = (ushort)((data[offset + 2] << 8) | data[offset + 3]); - offset += 8; - } - } - - // Remaining data is EXI body - analysis.EXIBodyOffset = offset; - analysis.EXIBodyLength = Math.Max(0, data.Length - offset); - - return analysis; - } - } - - /// - /// Packet analysis result - /// - public class PacketAnalysis - { - public int TotalSize { get; set; } - public bool HasEthernetHeader { get; set; } - public bool HasIPv6Header { get; set; } - public bool HasTCPHeader { get; set; } - public bool HasV2GTPHeader { get; set; } - public ushort V2GTPPayloadType { get; set; } - public int EXIBodyOffset { get; set; } - public int EXIBodyLength { get; set; } - - public string GetPayloadTypeName() - { - return V2GProtocol.GetPayloadTypeName(V2GTPPayloadType); - } - - public override string ToString() - { - var parts = new List(); - if (HasEthernetHeader) parts.Add("Ethernet"); - if (HasIPv6Header) parts.Add("IPv6"); - if (HasTCPHeader) parts.Add("TCP"); - if (HasV2GTPHeader) parts.Add($"V2GTP ({GetPayloadTypeName()})"); - - var structure = parts.Count > 0 ? string.Join(" → ", parts) : "Raw data"; - return $"{structure} | EXI: {EXIBodyLength} bytes @ offset {EXIBodyOffset}"; - } - } -} \ No newline at end of file diff --git a/csharp/dotnetfx/V2GDecoderNetFx.csproj b/csharp/dotnetfx/V2GDecoderNetFx.csproj deleted file mode 100644 index d473996..0000000 --- a/csharp/dotnetfx/V2GDecoderNetFx.csproj +++ /dev/null @@ -1,54 +0,0 @@ - - - - - Debug - AnyCPU - {12345678-1234-1234-1234-123456789ABC} - Exe - V2GDecoderNetFx - V2GDecoderNetFx - v4.8 - 512 - true - true - 7.3 - - - AnyCPU - true - full - false - bin\Debug\ - DEBUG;TRACE - prompt - 4 - - - AnyCPU - pdbonly - true - bin\Release\ - TRACE - prompt - 4 - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/csharp/dotnetfx/bin/Debug/V2GDecoderNetFx.exe b/csharp/dotnetfx/bin/Debug/V2GDecoderNetFx.exe deleted file mode 100644 index dc71756..0000000 Binary files a/csharp/dotnetfx/bin/Debug/V2GDecoderNetFx.exe and /dev/null differ diff --git a/csharp/dotnetfx/bin/Debug/V2GDecoderNetFx.exe.config b/csharp/dotnetfx/bin/Debug/V2GDecoderNetFx.exe.config deleted file mode 100644 index 033746a..0000000 --- a/csharp/dotnetfx/bin/Debug/V2GDecoderNetFx.exe.config +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/csharp/dotnetfx/bin/Debug/V2GDecoderNetFx.pdb b/csharp/dotnetfx/bin/Debug/V2GDecoderNetFx.pdb deleted file mode 100644 index ede3535..0000000 Binary files a/csharp/dotnetfx/bin/Debug/V2GDecoderNetFx.pdb and /dev/null differ diff --git a/csharp/dotnetfx/build.bat b/csharp/dotnetfx/build.bat deleted file mode 100644 index c87e231..0000000 --- a/csharp/dotnetfx/build.bat +++ /dev/null @@ -1 +0,0 @@ -"C:\Program Files\Microsoft Visual Studio\2022\Professional\MSBuild\Current\Bin\msbuild.exe" V2GDecoderNetFx.csproj /v:quiet \ No newline at end of file diff --git a/csharp/dotnetfx/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs b/csharp/dotnetfx/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs deleted file mode 100644 index 15efebf..0000000 --- a/csharp/dotnetfx/obj/Debug/.NETFramework,Version=v4.8.AssemblyAttributes.cs +++ /dev/null @@ -1,4 +0,0 @@ -// -using System; -using System.Reflection; -[assembly: global::System.Runtime.Versioning.TargetFrameworkAttribute(".NETFramework,Version=v4.8", FrameworkDisplayName = ".NET Framework 4.8")] diff --git a/csharp/dotnetfx/obj/Debug/V2GDecoderNetFx.csproj.AssemblyReference.cache b/csharp/dotnetfx/obj/Debug/V2GDecoderNetFx.csproj.AssemblyReference.cache deleted file mode 100644 index 835c603..0000000 Binary files a/csharp/dotnetfx/obj/Debug/V2GDecoderNetFx.csproj.AssemblyReference.cache and /dev/null differ diff --git a/csharp/dotnetfx/obj/Debug/V2GDecoderNetFx.csproj.CoreCompileInputs.cache b/csharp/dotnetfx/obj/Debug/V2GDecoderNetFx.csproj.CoreCompileInputs.cache deleted file mode 100644 index d994c0a..0000000 --- a/csharp/dotnetfx/obj/Debug/V2GDecoderNetFx.csproj.CoreCompileInputs.cache +++ /dev/null @@ -1 +0,0 @@ -e803a9d39a22df6b96d7e203b7efbb5d1760c85fb9915a781bc32024c1a43c58 diff --git a/csharp/dotnetfx/obj/Debug/V2GDecoderNetFx.csproj.FileListAbsolute.txt b/csharp/dotnetfx/obj/Debug/V2GDecoderNetFx.csproj.FileListAbsolute.txt deleted file mode 100644 index e25002f..0000000 --- a/csharp/dotnetfx/obj/Debug/V2GDecoderNetFx.csproj.FileListAbsolute.txt +++ /dev/null @@ -1,7 +0,0 @@ -C:\Data\Source\SIMP\V2GDecoderC\csharp\dotnetfx\obj\Debug\V2GDecoderNetFx.csproj.AssemblyReference.cache -C:\Data\Source\SIMP\V2GDecoderC\csharp\dotnetfx\obj\Debug\V2GDecoderNetFx.csproj.CoreCompileInputs.cache -C:\Data\Source\SIMP\V2GDecoderC\csharp\dotnetfx\bin\Debug\V2GDecoderNetFx.exe.config -C:\Data\Source\SIMP\V2GDecoderC\csharp\dotnetfx\bin\Debug\V2GDecoderNetFx.exe -C:\Data\Source\SIMP\V2GDecoderC\csharp\dotnetfx\bin\Debug\V2GDecoderNetFx.pdb -C:\Data\Source\SIMP\V2GDecoderC\csharp\dotnetfx\obj\Debug\V2GDecoderNetFx.exe -C:\Data\Source\SIMP\V2GDecoderC\csharp\dotnetfx\obj\Debug\V2GDecoderNetFx.pdb diff --git a/csharp/dotnetfx/obj/Debug/V2GDecoderNetFx.exe b/csharp/dotnetfx/obj/Debug/V2GDecoderNetFx.exe deleted file mode 100644 index dc71756..0000000 Binary files a/csharp/dotnetfx/obj/Debug/V2GDecoderNetFx.exe and /dev/null differ diff --git a/csharp/dotnetfx/obj/Debug/V2GDecoderNetFx.pdb b/csharp/dotnetfx/obj/Debug/V2GDecoderNetFx.pdb deleted file mode 100644 index ede3535..0000000 Binary files a/csharp/dotnetfx/obj/Debug/V2GDecoderNetFx.pdb and /dev/null differ diff --git a/csharp/vc2022/V2GDecoder/V2GDecoder.vcxproj b/csharp/vc2022/V2GDecoder/V2GDecoder.vcxproj index 83560cf..10c9682 100644 --- a/csharp/vc2022/V2GDecoder/V2GDecoder.vcxproj +++ b/csharp/vc2022/V2GDecoder/V2GDecoder.vcxproj @@ -21,7 +21,7 @@ 17.0 Win32Proj - {A7F7B7E1-2B3C-4D5E-8F9A-1B2C3D4E5F6G} + {C09AE419-8FDD-4312-B023-55DC1ED18A73} V2GDecoder 10.0 diff --git a/csharp/vc2022/V2GDecoder/V2GDecoder.vcxproj.filters b/csharp/vc2022/V2GDecoder/V2GDecoder.vcxproj.filters index 3d534ae..1b0184e 100644 --- a/csharp/vc2022/V2GDecoder/V2GDecoder.vcxproj.filters +++ b/csharp/vc2022/V2GDecoder/V2GDecoder.vcxproj.filters @@ -29,106 +29,142 @@ - + Source Files - - Source Files\codec + + Source Files - - Source Files\codec + + Source Files - - Source Files\codec + + Source Files - - Source Files\codec + + Source Files - - Source Files\codec + + Source Files - - Source Files\codec + + Source Files - - Source Files\codec + + Source Files - - Source Files\codec + + Source Files - - Source Files\codec + + Source Files - - Source Files\iso1 + + Source Files - - Source Files\iso1 + + Source Files - - Source Files\iso1 + + Source Files - - Source Files\appHandshake + + Source Files - - Source Files\appHandshake + + Source Files - - Source Files\appHandshake + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files + + + Source Files - - Header Files\codec + + Header Files - - Header Files\codec + + Header Files - - Header Files\codec + + Header Files - - Header Files\codec + + Header Files - - Header Files\codec + + Header Files - - Header Files\codec + + Header Files - - Header Files\codec + + Header Files - - Header Files\codec + + Header Files - - Header Files\codec + + Header Files - - Header Files\codec + + Header Files - - Header Files\codec + + Header Files - - Header Files\iso1 + + Header Files - - Header Files\iso1 + + Header Files - - Header Files\iso1 + + Header Files - - Header Files\appHandshake + + Header Files - - Header Files\appHandshake + + Header Files - - Header Files\appHandshake + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files + + + Header Files \ No newline at end of file diff --git a/csharp/vc2022/V2GDecoderC.sln b/csharp/vc2022/V2GDecoderC.sln index ec2f60f..15b356a 100644 --- a/csharp/vc2022/V2GDecoderC.sln +++ b/csharp/vc2022/V2GDecoderC.sln @@ -2,7 +2,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00 # Visual Studio Version 17 VisualStudioVersion = 17.0.31903.59 MinimumVisualStudioVersion = 10.0.40219.1 -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "V2GDecoder", "V2GDecoder\V2GDecoder.vcxproj", "{A7F7B7E1-2B3C-4D5E-8F9A-1B2C3D4E5F6G}" +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "V2GDecoder", "V2GDecoder\V2GDecoder.vcxproj", "{C09AE419-8FDD-4312-B023-55DC1ED18A73}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "HexToBinary", "HexToBinary\HexToBinary.vcxproj", "{B8F8C8F2-3C4D-5E6F-9A0B-2C3D4E5F6A7B}" EndProject @@ -16,14 +16,14 @@ Global Release|x86 = Release|x86 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {A7F7B7E1-2B3C-4D5E-8F9A-1B2C3D4E5F6G}.Debug|x64.ActiveCfg = Debug|x64 - {A7F7B7E1-2B3C-4D5E-8F9A-1B2C3D4E5F6G}.Debug|x64.Build.0 = Debug|x64 - {A7F7B7E1-2B3C-4D5E-8F9A-1B2C3D4E5F6G}.Debug|x86.ActiveCfg = Debug|Win32 - {A7F7B7E1-2B3C-4D5E-8F9A-1B2C3D4E5F6G}.Debug|x86.Build.0 = Debug|Win32 - {A7F7B7E1-2B3C-4D5E-8F9A-1B2C3D4E5F6G}.Release|x64.ActiveCfg = Release|x64 - {A7F7B7E1-2B3C-4D5E-8F9A-1B2C3D4E5F6G}.Release|x64.Build.0 = Release|x64 - {A7F7B7E1-2B3C-4D5E-8F9A-1B2C3D4E5F6G}.Release|x86.ActiveCfg = Release|Win32 - {A7F7B7E1-2B3C-4D5E-8F9A-1B2C3D4E5F6G}.Release|x86.Build.0 = Release|Win32 + {C09AE419-8FDD-4312-B023-55DC1ED18A73}.Debug|x64.ActiveCfg = Debug|x64 + {C09AE419-8FDD-4312-B023-55DC1ED18A73}.Debug|x64.Build.0 = Debug|x64 + {C09AE419-8FDD-4312-B023-55DC1ED18A73}.Debug|x86.ActiveCfg = Debug|Win32 + {C09AE419-8FDD-4312-B023-55DC1ED18A73}.Debug|x86.Build.0 = Debug|Win32 + {C09AE419-8FDD-4312-B023-55DC1ED18A73}.Release|x64.ActiveCfg = Release|x64 + {C09AE419-8FDD-4312-B023-55DC1ED18A73}.Release|x64.Build.0 = Release|x64 + {C09AE419-8FDD-4312-B023-55DC1ED18A73}.Release|x86.ActiveCfg = Release|Win32 + {C09AE419-8FDD-4312-B023-55DC1ED18A73}.Release|x86.Build.0 = Release|Win32 {B8F8C8F2-3C4D-5E6F-9A0B-2C3D4E5F6A7B}.Debug|x64.ActiveCfg = Debug|x64 {B8F8C8F2-3C4D-5E6F-9A0B-2C3D4E5F6A7B}.Debug|x64.Build.0 = Debug|x64 {B8F8C8F2-3C4D-5E6F-9A0B-2C3D4E5F6A7B}.Debug|x86.ActiveCfg = Debug|Win32 @@ -47,4 +47,4 @@ Global GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {1A2B3C4D-5E6F-7A8B-9C0D-1E2F3A4B5C6D} EndGlobalSection -EndGlobal \ No newline at end of file +EndGlobal diff --git a/csharp/vc2022/build.bat b/csharp/vc2022/build.bat index 8fe102b..b4999ea 100644 --- a/csharp/vc2022/build.bat +++ b/csharp/vc2022/build.bat @@ -12,36 +12,8 @@ if not exist "C:\Program Files\Microsoft Visual Studio\2022\Professional\MSBuild REM Set MSBuild path set MSBUILD="C:\Program Files\Microsoft Visual Studio\2022\Professional\MSBuild\Current\Bin\MSBuild.exe" -REM Clean previous builds -echo Cleaning previous builds... -%MSBUILD% V2GDecoderC.sln -target:Clean -property:Configuration=Debug -property:Platform=x64 -verbosity:minimal - REM Build Debug x64 configuration echo Building Debug x64 configuration... %MSBUILD% V2GDecoderC.sln -property:Configuration=Debug -property:Platform=x64 -verbosity:normal -if %ERRORLEVEL% EQU 0 ( - echo Build successful! - echo Output directory: bin\x64\Debug\ - dir bin\x64\Debug\*.exe /b -) else ( - echo Build failed with error code %ERRORLEVEL% - echo Please check the source file paths and project configuration. -) - -REM Test the built executable if successful -if %ERRORLEVEL% EQU 0 ( - echo. - echo Testing the built V2GDecoder.exe... - if exist bin\x64\Debug\V2GDecoder.exe ( - echo Running test with test4.exi... - bin\x64\Debug\V2GDecoder.exe ..\..\test4.exi - echo. - echo Running test with test5.exi... - bin\x64\Debug\V2GDecoder.exe ..\..\test5.exi - ) else ( - echo V2GDecoder.exe not found in output directory - ) -) - pause \ No newline at end of file diff --git a/minimal_test.xml b/minimal_test.xml deleted file mode 100644 index e37c819..0000000 --- a/minimal_test.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - 4142423030303831 - - - - - true - 0 - 100 - - - 0 - 3 - 5 - - true - - 0 - 4 - 460 - - - - \ No newline at end of file diff --git a/struct_exi.txt b/struct_exi.txt index aed3667..2910cec 100644 --- a/struct_exi.txt +++ b/struct_exi.txt @@ -22,8 +22,8 @@ ChargeParameterDiscoveryReq_isUsed: 0 ChargeParameterDiscoveryRes_isUsed: 0 ChargingStatusReq_isUsed: 0 ChargingStatusRes_isUsed: 0 -CurrentDemandReq_isUsed: 0 -CurrentDemandRes_isUsed: 1 +CurrentDemandReq_isUsed: 1 +CurrentDemandRes_isUsed: 0 MeteringReceiptReq_isUsed: 0 MeteringReceiptRes_isUsed: 0 PaymentDetailsReq_isUsed: 0 @@ -44,3 +44,37 @@ SessionStopReq_isUsed: 0 SessionStopRes_isUsed: 0 WeldingDetectionReq_isUsed: 0 WeldingDetectionRes_isUsed: 0 + +--- CurrentDemandReq Details --- +DC_EVStatus.EVReady: 1 +DC_EVStatus.EVErrorCode: 0 +DC_EVStatus.EVRESSSOC: 100 +EVTargetCurrent.Multiplier: 0 +EVTargetCurrent.Unit: 3 +EVTargetCurrent.Value: 5 +EVMaximumVoltageLimit_isUsed: 1 +EVMaximumVoltageLimit.Multiplier: 0 +EVMaximumVoltageLimit.Unit: 4 +EVMaximumVoltageLimit.Value: 471 +EVMaximumCurrentLimit_isUsed: 1 +EVMaximumCurrentLimit.Multiplier: 0 +EVMaximumCurrentLimit.Unit: 3 +EVMaximumCurrentLimit.Value: 100 +EVMaximumPowerLimit_isUsed: 1 +EVMaximumPowerLimit.Multiplier: 3 +EVMaximumPowerLimit.Unit: 5 +EVMaximumPowerLimit.Value: 50 +BulkChargingComplete_isUsed: 1 +BulkChargingComplete: 0 +ChargingComplete: 1 +RemainingTimeToFullSoC_isUsed: 1 +RemainingTimeToFullSoC.Multiplier: 0 +RemainingTimeToFullSoC.Unit: 2 +RemainingTimeToFullSoC.Value: 0 +RemainingTimeToBulkSoC_isUsed: 1 +RemainingTimeToBulkSoC.Multiplier: 0 +RemainingTimeToBulkSoC.Unit: 2 +RemainingTimeToBulkSoC.Value: 0 +EVTargetVoltage.Multiplier: 0 +EVTargetVoltage.Unit: 4 +EVTargetVoltage.Value: 460 diff --git a/test1._new.exi b/test1._new.exi deleted file mode 100644 index 1880661..0000000 --- a/test1._new.exi +++ /dev/null @@ -1 +0,0 @@ -P +Y0123456789:;<=>?0123456789:;<=>?0 \ No newline at end of file diff --git a/test1.xml b/test1.xml index c9e8c5e..28ab885 100644 --- a/test1.xml +++ b/test1.xml @@ -1,11 +1,3 @@ - -
- ABB00081 -
- - CurrentDemandRes - OK - 8098021050908C0C0C0E0C50E0000000 - - + +414242303030383101104450035falsefalsefalseZ1 \ No newline at end of file