diff --git a/Elwig/Helpers/Utils.cs b/Elwig/Helpers/Utils.cs index 544845f..cb3b185 100644 --- a/Elwig/Helpers/Utils.cs +++ b/Elwig/Helpers/Utils.cs @@ -8,6 +8,7 @@ using System.Text.RegularExpressions; using System.IO.Ports; using System.Net.Sockets; using Elwig.Dialogs; +using System.Text; namespace Elwig.Helpers { public static partial class Utils { @@ -26,6 +27,41 @@ namespace Elwig.Helpers { [GeneratedRegex("^tcp://([A-Za-z0-9._-]+):([0-9]+)$", RegexOptions.Compiled)] private static partial Regex GeneratedTcpRegex(); + private static readonly ushort[] Crc16ModbusTable = { + 0x0000, 0xC0C1, 0xC181, 0x0140, 0xC301, 0x03C0, 0x0280, 0xC241, + 0xC601, 0x06C0, 0x0780, 0xC741, 0x0500, 0xC5C1, 0xC481, 0x0440, + 0xCC01, 0x0CC0, 0x0D80, 0xCD41, 0x0F00, 0xCFC1, 0xCE81, 0x0E40, + 0x0A00, 0xCAC1, 0xCB81, 0x0B40, 0xC901, 0x09C0, 0x0880, 0xC841, + 0xD801, 0x18C0, 0x1980, 0xD941, 0x1B00, 0xDBC1, 0xDA81, 0x1A40, + 0x1E00, 0xDEC1, 0xDF81, 0x1F40, 0xDD01, 0x1DC0, 0x1C80, 0xDC41, + 0x1400, 0xD4C1, 0xD581, 0x1540, 0xD701, 0x17C0, 0x1680, 0xD641, + 0xD201, 0x12C0, 0x1380, 0xD341, 0x1100, 0xD1C1, 0xD081, 0x1040, + 0xF001, 0x30C0, 0x3180, 0xF141, 0x3300, 0xF3C1, 0xF281, 0x3240, + 0x3600, 0xF6C1, 0xF781, 0x3740, 0xF501, 0x35C0, 0x3480, 0xF441, + 0x3C00, 0xFCC1, 0xFD81, 0x3D40, 0xFF01, 0x3FC0, 0x3E80, 0xFE41, + 0xFA01, 0x3AC0, 0x3B80, 0xFB41, 0x3900, 0xF9C1, 0xF881, 0x3840, + 0x2800, 0xE8C1, 0xE981, 0x2940, 0xEB01, 0x2BC0, 0x2A80, 0xEA41, + 0xEE01, 0x2EC0, 0x2F80, 0xEF41, 0x2D00, 0xEDC1, 0xEC81, 0x2C40, + 0xE401, 0x24C0, 0x2580, 0xE541, 0x2700, 0xE7C1, 0xE681, 0x2640, + 0x2200, 0xE2C1, 0xE381, 0x2340, 0xE101, 0x21C0, 0x2080, 0xE041, + 0xA001, 0x60C0, 0x6180, 0xA141, 0x6300, 0xA3C1, 0xA281, 0x6240, + 0x6600, 0xA6C1, 0xA781, 0x6740, 0xA501, 0x65C0, 0x6480, 0xA441, + 0x6C00, 0xACC1, 0xAD81, 0x6D40, 0xAF01, 0x6FC0, 0x6E80, 0xAE41, + 0xAA01, 0x6AC0, 0x6B80, 0xAB41, 0x6900, 0xA9C1, 0xA881, 0x6840, + 0x7800, 0xB8C1, 0xB981, 0x7940, 0xBB01, 0x7BC0, 0x7A80, 0xBA41, + 0xBE01, 0x7EC0, 0x7F80, 0xBF41, 0x7D00, 0xBDC1, 0xBC81, 0x7C40, + 0xB401, 0x74C0, 0x7580, 0xB541, 0x7700, 0xB7C1, 0xB681, 0x7640, + 0x7200, 0xB2C1, 0xB381, 0x7340, 0xB101, 0x71C0, 0x7080, 0xB041, + 0x5000, 0x90C1, 0x9181, 0x5140, 0x9301, 0x53C0, 0x5280, 0x9241, + 0x9601, 0x56C0, 0x5780, 0x9741, 0x5500, 0x95C1, 0x9481, 0x5440, + 0x9C01, 0x5CC0, 0x5D80, 0x9D41, 0x5F00, 0x9FC1, 0x9E81, 0x5E40, + 0x5A00, 0x9AC1, 0x9B81, 0x5B40, 0x9901, 0x59C0, 0x5880, 0x9841, + 0x8801, 0x48C0, 0x4980, 0x8941, 0x4B00, 0x8BC1, 0x8A81, 0x4A40, + 0x4E00, 0x8EC1, 0x8F81, 0x4F40, 0x8D01, 0x4DC0, 0x4C80, 0x8C41, + 0x4400, 0x84C1, 0x8581, 0x4540, 0x8701, 0x47C0, 0x4680, 0x8641, + 0x8201, 0x42C0, 0x4380, 0x8341, 0x4100, 0x81C1, 0x8081, 0x4040, + }; + public static SerialPort OpenSerialConnection(string connection) { var m = SerialRegex.Match(connection); if (!m.Success) @@ -45,8 +81,8 @@ namespace Elwig.Helpers { DataBits = data == "" ? 8 : int.Parse(data), StopBits = (StopBits)(stop == "" ? 1 : stop == "1.5" ? 3 : stop[0] - '0'), Handshake = Handshake.None, - ReadTimeout = 1000, - WriteTimeout = 1000, + WriteTimeout = 250, + ReadTimeout = 11000, }; port.Open(); return port; @@ -58,8 +94,8 @@ namespace Elwig.Helpers { throw new ArgumentException("Invalid connection string for scheme \"tcp\""); var client = new TcpClient() { - SendTimeout = 1000, - ReceiveTimeout = 1000, + SendTimeout = 250, + ReceiveTimeout = 11000, }; client.Connect(m.Groups[1].Value, int.Parse(m.Groups[2].Value)); return client; @@ -74,6 +110,22 @@ namespace Elwig.Helpers { return a.Select(ch => ch - '0').Aggregate((sum, n) => (sum * 10 + n) % b); } + public static ushort CalcCrc16Modbus(byte[] data) { + // https://www.modbustools.com/modbus_crc16.htm + byte temp; + ushort crc = 0xFFFF; + foreach (byte b in data) { + temp = (byte)(b ^ crc); + crc >>= 8; + crc ^= Crc16ModbusTable[temp]; + } + return crc; + } + + public static ushort CalcCrc16Modbus(string data) { + return CalcCrc16Modbus(Encoding.ASCII.GetBytes(data)); + } + public static void RunBackground(string title, Func a) { Task.Run(async () => { try { diff --git a/Elwig/Helpers/Weighing/SystecScale.cs b/Elwig/Helpers/Weighing/SystecScale.cs index a76a952..c0d7dc4 100644 --- a/Elwig/Helpers/Weighing/SystecScale.cs +++ b/Elwig/Helpers/Weighing/SystecScale.cs @@ -4,7 +4,6 @@ using System.IO.Ports; using System.Net.Sockets; using System.Text; using System.Threading.Tasks; -using System.Windows; namespace Elwig.Helpers.Weighing { public class SystecScale : IScale { @@ -76,12 +75,12 @@ namespace Elwig.Helpers.Weighing { throw new ArgumentException("Invalid value for argument empty"); } - public async Task SendCommand(string command) { + protected async Task SendCommand(string command) { byte[] bytes = Encoding.ASCII.GetBytes($"<{command}>"); await Stream.WriteAsync(bytes); } - public async Task ReceiveResponse() { + protected async Task ReceiveResponse() { string? line = null; using (var reader = new StreamReader(Stream, Encoding.ASCII, false, -1, true)) { line = await reader.ReadLineAsync(); @@ -93,7 +92,7 @@ namespace Elwig.Helpers.Weighing { var error = line[1..3]; if (error[0] == '0') { if (error[1] != '0') { - throw new IOException($"Invalid response from scale (error code {error}"); + throw new IOException($"Invalid response from scale (error code {error})"); } } else if (error[0] == '1') { string msg = $"Unbekannter Fehler (Fehler code {error})"; @@ -118,32 +117,41 @@ namespace Elwig.Helpers.Weighing { throw new IOException($"Invalid response from scale (error code {error})"); } - return line[3..(line.Length - 1)]; + return line[1..(line.Length - 1)]; } protected async Task Weigh(bool incIdentNr) { - await SendCommand(incIdentNr ? $"RM{InternalScaleNr}" : $"RN{InternalScaleNr}"); - string line = await ReceiveResponse(); + await SendCommand(incIdentNr ? $"RN{InternalScaleNr}" : $"RM{InternalScaleNr}"); + string record = await ReceiveResponse(); + if (record.Length != 62) + throw new IOException("Invalid response from scale: Received record has invalid size"); + var line = record[2..]; var status = line[ 0.. 2]; var date = line[ 2..10]; var time = line[10..15]; - var identNr = line[15..19]; + var identNr = line[15..19].Trim(); var scaleNr = line[19..20]; - var brutto = line[20..28]; - var tara = line[28..36]; - var netto = line[36..44]; + var brutto = line[20..28].Trim(); + var tara = line[28..36].Trim(); + var netto = line[36..44].Trim(); var unit = line[44..46]; var taraCode = line[46..48]; - var zone = line[48..49]; - var terminalNr = line[49..52]; - var crc16 = line[52..60]; + var zone = line[48..49].Trim(); + var terminalNr = line[49..52].Trim(); + var crc16 = line[52..60].Trim(); + + if (Utils.CalcCrc16Modbus(record[..54]).ToString() != crc16) { + throw new IOException($"Invalid response from scale: Invalid CRC16 checksum ({crc16} != {Utils.CalcCrc16Modbus(record[..54]).ToString()})"); + } else if (unit != "kg") { + throw new IOException($"Unsupported unit in weighing response: '{unit}'"); + } return new() { - Weight = int.TryParse(netto.Trim(), out int w) ? w : null, - WeighingId = identNr.Trim().Length > 0 ? identNr.Trim() : null, - Date = date, - Time = time, + Weight = int.TryParse(netto, out int w) ? w : null, + WeighingId = identNr.Length > 0 && identNr != "0" ? identNr : null, + Date = DateOnly.Parse(date), + Time = TimeOnly.Parse(time), }; } diff --git a/Elwig/Helpers/Weighing/WeighingResult.cs b/Elwig/Helpers/Weighing/WeighingResult.cs index fe037ce..5388eb0 100644 --- a/Elwig/Helpers/Weighing/WeighingResult.cs +++ b/Elwig/Helpers/Weighing/WeighingResult.cs @@ -1,3 +1,5 @@ +using System; + namespace Elwig.Helpers.Weighing { /// /// Result of a weighing process on an industrial scale @@ -16,17 +18,17 @@ namespace Elwig.Helpers.Weighing { /// /// Date string provided by the scale /// - public string? Date = null; + public DateOnly? Date = null; /// /// Time string provided by the scale /// - public string? Time = null; + public TimeOnly? Time = null; /// <Weight/WeighingId/Date/Time> override public string ToString() { var w = Weight != null ? $"{Weight}kg" : ""; - return $"<{w}/{WeighingId}/{Date}/{Time}>"; + return $"<{w}/{WeighingId}/{Date:yyyy-MM-dd}/{Time:HH:mm}>"; } } }