Changeset 413 for ISPProgrammer/Dallas/UDallasProgrammer.pas

Timestamp:

Aug 16, 2012, 12:59:53 PM (12 years ago)

Author:

chronos

Message:

• Modified: Classes using TCommPin class now inherits from TCommNode which inherits from TComponent. All TCommNodes are now registred as components in PinConnection group on component palette.
• Modified: TCommPin now have reference to parent TCommNode.

File:

• ISPProgrammer/Dallas/UDallasProgrammer.pas (modified) (4 diffs)

ISPProgrammer/Dallas/UDallasProgrammer.pas

@@ -8 +8 @@
   Classes, SysUtils, USerialPort, UCommSerialPort, UCommPin, UCommMark,
   UJobProgressView, SyncObjs, DateUtils, Dialogs, URegistry,
-  Forms, UISPProgrammer, Registry, UBinarySerializer, SpecializedList;
+  Forms, UISPProgrammer, Registry, UBinarySerializer, SpecializedList,
+  UCommTelnet;
 
 const
@@ -135 +136 @@
 
 procedure TDallasProgrammer.SetActive(AValue: Boolean);
+var
+  SerialPort: TCommSerialPort;
+  Telnet: TCommTelnet;
 begin
   if Active = AValue then Exit;
@@ -144 +148 @@
     HexData := TStringList.Create;
 
-    SerialPort.Active := False;
-    SerialPortBackup.Assign(SerialPort);
-    SerialPortBackupPin := SerialPort.Pin.RemotePin;
-    SerialPort.Pin.Disconnect;
-
-    //SerialPort.Name := SerialPort.Name;
-    SerialPort.FlowControl := fcNone;
-    SerialPort.BaudRate := BaudRate;
-    SerialPort.DTR := True;
-    SerialPort.Pin.Connect(CommMark.PinRaw);
-    SerialPort.Flush;
-    SerialPort.Purge;
-    SerialPort.Active := True;
-    if Assigned(FOnLogData) then
-      Pin.OnLogData := FOnLogData;
+    if ExtPin.Connected and (ExtPin.RemotePin.Node is TCommSerialPort) then begin
+      SerialPort := TCommSerialPort(ExtPin.RemotePin.Node);
+      SerialPort.Active := False;
+      SerialPortBackup.Assign(SerialPort);
+      SerialPortBackupPin := SerialPort.Pin.RemotePin;
+      SerialPort.Pin.Disconnect;
+
+      //SerialPort.Name := SerialPort.Name;
+      SerialPort.SerialPort.FlowControl := fcNone;
+      SerialPort.SerialPort.BaudRate := BaudRate;
+      SerialPort.SerialPort.DTR := True;
+      SerialPort.Pin.Connect(CommMark.PinRaw);
+      SerialPort.SerialPort.Flush;
+      SerialPort.SerialPort.Purge;
+      SerialPort.Active := True;
+      if Assigned(FOnLogData) then
+        Pin.OnLogData := FOnLogData;
+    end;
+    if ExtPin.Connected and (ExtPin.RemotePin.Node is TCommTelnet) then begin
+      Telnet := TCommTelnet(ExtPin.RemotePin.Node);
+    end;
     ResponseClear;
     CommMark.Active := True;
-
     ReadIdentification;
   end else begin
     CommMark.Active := False;
-    SerialPort.Active := False;
-    SerialPort.Assign(SerialPortBackup);
-    SerialPort.Pin.Connect(SerialPortBackupPin);
-    SerialPort.Active := True;
+    if ExtPin.Connected and (ExtPin.RemotePin.Node is TCommSerialPort) then begin
+      SerialPort := TCommSerialPort(ExtPin.Node);
+      SerialPort.Active := False;
+      SerialPort.Assign(SerialPortBackup);
+      SerialPort.Pin.Connect(SerialPortBackupPin);
+      SerialPort.Active := True;
+    end;
+    if ExtPin.Connected and (ExtPin.RemotePin.Node is TCommTelnet) then begin
+      Telnet := TCommTelnet(ExtPin.RemotePin.Node);
+    end;
     HexData.Free;
     Request.Free;
@@ -359 +374 @@
   Mark := TListByte.Create;
   Mark.SetArray([13, 10]);
-  CommMark := TCommMark.Create;
+  CommMark := TCommMark.Create(nil);
   CommMark.Mark.Assign(Mark);
   CommMark.PinFrame.Connect(Pin);
   BaudRate := 9600;
-  SerialPortBackup := TCommSerialPort.Create;
+  SerialPortBackup := TCommSerialPort.Create(nil);
 end;