From ac61159575a62a1eaad777790551cc9a2f72b8e2 Mon Sep 17 00:00:00 2001 From: Shawn Ferry Date: Wed, 11 Oct 2023 22:36:50 -0400 Subject: [PATCH 1/2] Automatic Whitespace Changes --- .../LogicAnalyzer/I2CProtocolAnalyzer/I2CAnalyzer.cs | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/Software/LogicAnalyzer/I2CProtocolAnalyzer/I2CAnalyzer.cs b/Software/LogicAnalyzer/I2CProtocolAnalyzer/I2CAnalyzer.cs index 0a263bd..288995b 100644 --- a/Software/LogicAnalyzer/I2CProtocolAnalyzer/I2CAnalyzer.cs +++ b/Software/LogicAnalyzer/I2CProtocolAnalyzer/I2CAnalyzer.cs @@ -31,7 +31,7 @@ namespace I2CProtocolAnalyzer { get { - return new ProtocolAnalyzerSignal[] + return new ProtocolAnalyzerSignal[] { new ProtocolAnalyzerSignal{ Required = true, SignalName = "SCL" }, new ProtocolAnalyzerSignal{ Required = true, SignalName = "SDA" }, @@ -79,7 +79,7 @@ namespace I2CProtocolAnalyzer { addressByte = false; - segment.Value += $"\r\nOp: {((value & 1) == 1 ? "Read" : "Write") }"; + segment.Value += $"\r\nOp: {((value & 1) == 1 ? "Read" : "Write")}"; if ((value & 0xf8) == 0xf7) { @@ -88,7 +88,7 @@ namespace I2CProtocolAnalyzer } else segment.Value += $"\r\nAddress (7b): 0x{(value >> 1).ToString("X2")}"; - + } else if (address10) { @@ -105,7 +105,7 @@ namespace I2CProtocolAnalyzer if (pos == -1) break; - if(foundStartStop) + if (foundStartStop) segments.Add(new ProtocolAnalyzerDataSegment { FirstSample = startPosition, LastSample = endPosition, Value = isStart ? "START" : "STOP" }); if (foundStartStop && !isStart) @@ -216,7 +216,7 @@ namespace I2CProtocolAnalyzer private int ReadByte(int pos, ProtocolAnalyzerSelectedChannel scl, ProtocolAnalyzerSelectedChannel sda, out int byteStart, out int byteEnd, out byte value, out bool ack, out bool frameError) { - byteStart = 0; byteEnd = 0; value = 0; ack = false; frameError= false; + byteStart = 0; byteEnd = 0; value = 0; ack = false; frameError = false; while (pos < scl.Samples.Length && scl.Samples[pos] == 1) //Find next low clock pos++; From f1f9aeb17a6c3fa9e1ce6e90d4c37ecaf2358a3b Mon Sep 17 00:00:00 2001 From: Shawn Ferry Date: Wed, 11 Oct 2023 22:45:10 -0400 Subject: [PATCH 2/2] Fix Mask for 10bit I2C Parsing * Changed mask to recognize 10bit reserved byte --- Software/LogicAnalyzer/I2CProtocolAnalyzer/I2CAnalyzer.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Software/LogicAnalyzer/I2CProtocolAnalyzer/I2CAnalyzer.cs b/Software/LogicAnalyzer/I2CProtocolAnalyzer/I2CAnalyzer.cs index 288995b..b70a3cb 100644 --- a/Software/LogicAnalyzer/I2CProtocolAnalyzer/I2CAnalyzer.cs +++ b/Software/LogicAnalyzer/I2CProtocolAnalyzer/I2CAnalyzer.cs @@ -81,7 +81,7 @@ namespace I2CProtocolAnalyzer segment.Value += $"\r\nOp: {((value & 1) == 1 ? "Read" : "Write")}"; - if ((value & 0xf8) == 0xf7) + if ((value & 0xf8) == 0xf0) { address10 = true; firstAddressByte = value;