Changeset 288

Timestamp:

Oct 24, 2011, 9:01:08 AM (13 years ago)

Author:

george

Message:

• Added: TCommPin now support state number forwarding. State value is designed mainly for simulating parity bit and possibly other state bits.

Location:

PinConnection

Files:

• UCommFrame.pas (modified) (4 diffs)
• UCommHub.pas (modified) (6 diffs)
• UCommPin.pas (modified) (7 diffs)
• UCommSerialPort.pas (modified) (3 diffs)
• UCommThread.pas (modified) (7 diffs)

PinConnection/UCommFrame.pas

@@ -19 +19 @@
   TFrameState = (fsOutside, fsStart, fsInside, fsEnd);
 
+  { TCommFrame }
+
   TCommFrame = class
   private
@@ -32 +34 @@
     PacketLoss: Real;
     procedure RawDataReceive(Sender: TCommPin; Stream: TStream);
+    procedure RawSetStatus(Sender: TCommPin; Status: Integer);
     procedure FrameDataReceive(Sender: TCommPin; Stream: TStream);
+    procedure FrameSetStatus(Sender: TCommPin; Status: Integer);
     constructor Create;
     destructor Destroy; override;
@@ -103 +107 @@
 end;
 
+procedure TCommFrame.FrameSetStatus(Sender: TCommPin; Status: Integer);
+begin
+  RawDataPin.Status := Status;
+end;
+
 procedure TCommFrame.RawDataReceive(Sender: TCommPin; Stream: TStream);
 var
@@ -148 +157 @@
 end;
 
+procedure TCommFrame.RawSetStatus(Sender: TCommPin; Status: Integer);
+begin
+  FrameDataPin.Status := Status;
+end;
+
 function TCommFrame.GetStreamCRC8(Stream: TStream): Byte;
 var

PinConnection/UCommHub.pas

@@ -18 +18 @@
     function GetPin(Index: Integer): TCommPin;
     procedure Receive(Sender: TCommPin; Stream: TStream);
+    procedure SetStatus(Sender: TCommPin; Status: Integer);
   public
     constructor Create;
@@ -54 +55 @@
 end;
 
+procedure TCommHub.SetStatus(Sender: TCommPin; Status: Integer);
+var
+  I: Integer;
+begin
+  if FActive then begin
+    // Broadcast received packet to all other pins
+    for I := 0 to FPins.Count - 1 do
+      if Sender <> FPins[I] then
+        TCommPin(FPins[I]).Status := Status;
+  end;
+end;
+
 constructor TCommHub.Create;
 begin
@@ -68 +81 @@
 begin
   Pin.OnReceive := Receive;
+  Pin.OnSetSatus := SetStatus;
   Result := FPins.Add(Pin);
 end;
@@ -74 +88 @@
 begin
   Pin.OnReceive := nil;
+  Pin.OnSetSatus := nil;
   Result := TCommPin(FPins.Extract(Pin));
 end;
@@ -90 +105 @@
 begin
   Pin.OnReceive := Receive;
+  Pin.OnSetSatus := SetStatus;
   FPins.Insert(Index, Pin);
 end;
@@ -107 +123 @@
   Result := TCommPin.Create;
   Result.OnReceive := Receive;
+  Result.OnSetSatus := SetStatus;
   FPins.Add(Result);
 end;

PinConnection/UCommPin.pas

@@ -14 +14 @@
   TOnLogDataEvent = procedure (Stream: TStream; Direction: TDataDiretion) of object;
   TOnStreamEvent = procedure (Sender: TCommPin; Stream: TStream) of object;
+  TOnSetStatus = procedure (Sender: TCommPin; Status: Integer) of object;
 
   { TCommPin }
@@ -25 +26 @@
     FFrameTxCount: Integer;
     FFrameRxCount: Integer;
+    FOnSetStatus: TOnSetStatus;
+    FStatus: Integer;
     function GetConnected: Boolean;
+    procedure SetStatus(AValue: Integer);
+  protected
+    procedure Receive(Stream: TStream);
+    procedure ReceiveStatus(AValue: Integer);
   public
     RemotePin: TCommPin;
@@ -33 +40 @@
     procedure Disconnect;
     procedure Send(Stream: TStream);
-    procedure Receive(Stream: TStream);
     procedure ResetCounters;
-    property OnReceive: TOnStreamEvent read FOnReceive write FOnReceive;
     property Connected: Boolean read GetConnected;
     property OnLogData: TOnLogDataEvent read FOnLogData write FOnLogData;
@@ -42 +47 @@
     property FrameTxCount: Integer read FFrameTxCount;
     property FrameRxCount: Integer read FFrameRxCount;
+    property Status: Integer read FStatus write SetStatus; // Used for general status bits such as parity bit
+    property OnReceive: TOnStreamEvent read FOnReceive write FOnReceive;
+    property OnSetSatus: TOnSetStatus read FOnSetStatus write FOnSetStatus;
   end;
 
@@ -55 +63 @@
     Disconnect;
     Self.RemotePin := Pin;
-    Pin.RemotePin := Self;
+    if Assigned(Pin) then begin
+      Pin.RemotePin := Self;
+      RemotePin.ReceiveStatus(FStatus);
+    end;
   end;
 end;
@@ -78 +89 @@
 end;
 
+procedure TCommPin.SetStatus(AValue: Integer);
+begin
+  FStatus := AValue;
+  if Assigned(RemotePin) then RemotePin.ReceiveStatus(AValue);
+end;
+
 constructor TCommPin.Create;
 begin
@@ -90 +107 @@
   Stream.Position := 0;
   if Assigned(FOnReceive) then FOnReceive(Self, Stream);
+end;
+
+procedure TCommPin.ReceiveStatus(AValue: Integer);
+begin
+  if Assigned(FOnSetStatus) then FOnSetStatus(Self, AValue);
 end;
 

PinConnection/UCommSerialPort.pas

@@ -10 +10 @@
 
 type
+
+  { TCommSerialPort }
+
   TCommSerialPort = class(TSerialPort)
   private
     procedure Receive(Sender: TCommPin; Stream: TStream);
+    procedure SetStatus(Sender: TCommPin; AValue: Integer);
     procedure ReceiveData(Stream: TMemoryStream);
   public
@@ -32 +36 @@
 end;
 
+procedure TCommSerialPort.SetStatus(Sender: TCommPin; AValue: Integer);
+begin
+  try
+    Lock.Acquire;
+    if (AValue and 1) = 1 then Parity := paMark else Parity := paSpace;
+  finally
+    Lock.Release;
+  end;
+end;
+
 constructor TCommSerialPort.Create;
 begin
@@ -38 +52 @@
   Pin := TCommPin.Create;
   Pin.OnReceive := Receive;
+  Pin.OnSetSatus := SetStatus;
   OnReceiveData := ReceiveData;
 end;

PinConnection/UCommThread.pas

@@ -36 +36 @@
     FInputBufferLock: TCriticalSection;
     FDataAvailable: TEvent;
-    procedure ReceiveData(Sender: TCommPin; Stream: TStream);
+    FStatusEvent: TEvent;
+    FStatusValue: Integer;
+    procedure PinReceiveData(Sender: TCommPin; Stream: TStream);
+    procedure PinSetStatus(Sender: TCommPin; Status: Integer);
     procedure ExtReceiveData(Sender: TCommPin; Stream: TStream);
+    procedure ExtSetStatus(Sender: TCommPin; AStatus: Integer);
     procedure SetActive(const AValue: Boolean);
   public
@@ -51 +55 @@
 { TCommThread }
 
-procedure TCommThread.ReceiveData(Sender: TCommPin; Stream:TStream);
+procedure TCommThread.PinReceiveData(Sender: TCommPin; Stream:TStream);
 begin
   if FActive then Ext.Send(Stream);
+end;
+
+procedure TCommThread.PinSetStatus(Sender: TCommPin; Status: Integer);
+begin
+  if FActive then Ext.Status := Status;
 end;
 
@@ -68 +77 @@
     FInputBufferLock.Release;
     StreamHelper.Free;
+  end;
+end;
+
+procedure TCommThread.ExtSetStatus(Sender: TCommPin; AStatus: Integer);
+begin
+  try
+    FInputBufferLock.Acquire;
+    FStatusValue := AStatus;
+    FStatusEvent.SetEvent;
+  finally
+    FInputBufferLock.Release;
   end;
 end;
@@ -96 +116 @@
   Ext := TCommPin.Create;
   Ext.OnReceive := ExtReceiveData;
+  Ext.OnSetSatus := ExtSetStatus;
   Pin := TCommPin.Create;
-  Pin.OnReceive := ReceiveData;
+  Pin.OnReceive := PinReceiveData;
+  Pin.OnSetSatus := PinSetStatus;
   FDataAvailable := TSimpleEvent.Create;
+  FStatusEvent := TSimpleEvent.Create;
 end;
 
@@ -108 +131 @@
   Ext.Free;
   Pin.Free;
+  FStatusEvent.Free;
   FDataAvailable.Free;
   inherited Destroy;
@@ -119 +143 @@
     with Parent do
     repeat
+      // Check if new data arrived
       if FDataAvailable.WaitFor(1) = wrSignaled then
       try
@@ -130 +155 @@
         FInputBufferLock.Release;
       end; // else Yield;
+
+      // Check if state changed
+      if FStatusEvent.WaitFor(1) = wrSignaled then
+      try
+        FInputBufferLock.Acquire;
+        Pin.Status := FStatusValue;
+      finally
+        FStatusEvent.ResetEvent;
+        FInputBufferLock.Release;
+      end;
     until Terminated;
   finally