Changeset 416

Timestamp:

Aug 20, 2012, 2:45:39 PM (12 years ago)

Author:

chronos

Message:

• Added: TDeviceConnector in PinConnection package for generalized routing serial data to various TCommNode objects.

Location:

PinConnection

Files:

• PinConnection.lpk (modified) (2 diffs)
• PinConnection.pas (modified) (1 diff)
• UCommConcentrator.pas (modified) (1 diff)
• UCommConnector.pas (added)
• UCommSerialPort.pas (modified) (2 diffs)
• UCommTCPClient.pas (modified) (2 diffs)
• UCommTelnet.pas (modified) (6 diffs)
• UCommTelnetComPortOption.pas (modified) (2 diffs)

PinConnection/PinConnection.lpk

@@ -22 +22 @@
     <License Value="GNU/GPL"/>
     <Version Minor="4"/>
-    <Files Count="15">
+    <Files Count="16">
       <Item1>
         <Filename Value="USerialPort.pas"/>
@@ -80 +80 @@
       </Item14>
       <Item15>
+        <Filename Value="UCommConnector.pas"/>
+        <UnitName Value="UCommConnector"/>
+      </Item15>
+      <Item16>
         <Filename Value="UPinConnection.pas"/>
         <HasRegisterProc Value="True"/>
         <UnitName Value="UPinConnection"/>
-      </Item15>
+      </Item16>
     </Files>
     <i18n>

PinConnection/PinConnection.pas

@@ -10 +10 @@
   USerialPort, UPacketBurst, UCommFrame, UCommHub, UCommPin, UCommSerialPort, 
   UCommThread, UCommConcentrator, UCommDelay, UCommTCPClient, UCommTCPServer, 
-  UCommTelnet, UCommTelnetComPortOption, UCommMark, UPinConnection, 
-  LazarusPackageIntf;
+  UCommTelnet, UCommTelnetComPortOption, UCommMark, UCommConnector, 
+  UPinConnection, LazarusPackageIntf;
 
 implementation

PinConnection/UCommConcentrator.pas

@@ -115 +115 @@
   FPins.Concentrator := Self;
   FMain := TCommPin.Create;
+  FMain.Node := Self;
   FMain.OnSetSatus := MainSetStatus;
   FMain.OnReceive := MainReceive;

PinConnection/UCommSerialPort.pas

@@ -20 +20 @@
   protected
     procedure SetActive(const AValue: Boolean); override;
+    procedure AssignTo(Dest: TPersistent); override;
   public
     SerialPort: TSerialPort;
@@ -43 +44 @@
   inherited;
   SerialPort.Active := AValue;
+end;
+
+procedure TCommSerialPort.AssignTo(Dest: TPersistent);
+begin
+  if Dest is TCommSerialPort then begin
+    TCommSerialPort(Dest).SerialPort.Assign(SerialPort);
+  end else inherited;
 end;
 

PinConnection/UCommTCPClient.pas

@@ -35 +35 @@
     procedure ReceiveData(Sender: TCommPin; Stream: TListByte);
     procedure SetActive(const AValue: Boolean);
+  protected
+    procedure AssignTo(Dest: TPersistent); override;
   public
     Socket: TTCPBlockSocket;
@@ -91 +93 @@
     FreeAndNil(FReceiveThread);
   end;
+end;
+
+procedure TCommTCPClient.AssignTo(Dest: TPersistent);
+begin
+  if Dest is TCommTCPClient then begin
+    TCommTCPClient(Dest).Address := Address;
+    TCommTCPClient(Dest).Port := Port;
+  end
+  else inherited;
 end;
 

PinConnection/UCommTelnet.pas

@@ -57 +57 @@
     ServerChecked: Boolean;
     SupportedByServer: Boolean;
+    procedure Assign(Source: TTelnetOption); virtual;
     function CheckOption: Boolean;
     procedure SendCommand(Request, Response: TListByte);
@@ -78 +79 @@
     procedure ReadResponse(Response: TListByte);
     function ResponseCount: Integer;
+  protected
+    procedure AssignTo(Dest: TPersistent); override;
   public
     Options: TListObject;
@@ -92 +95 @@
     procedure SendSubCommand(OptionCode: TTelnetCommand; Request, Response: TListByte);
     procedure SendCommand(Code: TTelnetCode; Request, Response: TListByte);
+    procedure Purge;
     constructor Create(AOwner: TComponent); override;
     destructor Destroy; override;
@@ -114 +118 @@
   if FActive = AValue then Exit;
   FActive := AValue;
+end;
+
+procedure TTelnetOption.Assign(Source: TTelnetOption);
+begin
+  SupportedByServer := Source.SupportedByServer;
+  ServerChecked := Source.ServerChecked;
+  Code := Source.Code;
+  FOnRequest := Source.FOnRequest;
+  Active := Source.FActive;
 end;
 
@@ -306 +319 @@
 end;
 
+procedure TCommTelnet.AssignTo(Dest: TPersistent);
+var
+  I: Integer;
+begin
+  if Dest is TCommTelnet then begin
+    TCommTelnet(Dest).Timeout := Timeout;
+    TCommTelnet(Dest).PortType := PortType;
+    TCommTelnet(Dest).ErrorCount := ErrorCount;
+    TCommTelnet(Dest).OptionsNegotationEnable := OptionsNegotationEnable;
+    for I := 0 to Options.Count - 1 do begin
+      TTelnetOption(TCommTelnet(Dest).Options[I]).Assign(TTelnetOption(Options[I]));
+      TTelnetOption(TCommTelnet(Dest).Options[I]).Telnet := TCommTelnet(Dest);
+    end;
+  end else inherited;
+end;
+
 procedure TCommTelnet.Register(Option: TTelnetOption);
 begin
@@ -399 +428 @@
 end;
 
+procedure TCommTelnet.Purge;
+begin
+  FState := tsNormal;
+  FResponses.Clear;
+end;
+
 constructor TCommTelnet.Create(AOwner: TComponent);
 begin

PinConnection/UCommTelnetComPortOption.pas

@@ -41 +41 @@
     constructor Create;
     destructor Destroy; override;
+    procedure Assign(Source: TTelnetOption); override;
     property FlowControl: TFlowControl read GetFlowControl write SetFlowControl;
     property DataBits: TDataBits read GetDataBits write SetDataBits;
@@ -224 +225 @@
 end;
 
+procedure TTelnetOptionComPort.Assign(Source: TTelnetOption);
+begin
+  FBaudRate := TTelnetOptionComPort(Source).FBaudRate;
+  FDTR := TTelnetOptionComPort(Source).FDTR;
+  FRTS := TTelnetOptionComPort(Source).FRTS;
+  inherited Assign(Source);
+end;
+
 end.