Changeset 417

Timestamp:

Aug 20, 2012, 2:47:30 PM (12 years ago)

Author:

chronos

Message:

• Modified: Classs TDallasProgrammer in ISPProgrammer package now user generalized property Connector for communication with serial port combinations.

Location:

ISPProgrammer

Files:

• Dallas/UDallasProgrammer.pas (modified) (15 diffs)
• PRESTO/UPresto.pas (modified) (1 diff)
• UISPProgrammer.pas (modified) (3 diffs)

ISPProgrammer/Dallas/UDallasProgrammer.pas

@@ -9 +9 @@
   UJobProgressView, SyncObjs, DateUtils, Dialogs, URegistry,
   Forms, UISPProgrammer, Registry, UBinarySerializer, SpecializedList,
-  UCommTelnet;
+  UCommTelnet, UCommTCPClient, UCommTelnetComPortOption, UCommConnector;
 
 const
@@ -27 +27 @@
     ResponseLock: TCriticalSection;
     ResponseTemp: TBinarySerializer;
-    SerialPortBackup: TCommSerialPort;
-    SerialPortBackupPin: TCommPin;
+    ConnectorBackup: TDeviceConnector;
+    ConnectorBackupPin: TCommPin;
     HexData: TStringList;
     Request: TBinarySerializer;
@@ -36 +36 @@
     function ResponseCount: Integer;
     procedure ResponseClear;
-    procedure CheckErrorCode(Value: string);
+    procedure CheckWriteErrorCode(Value: string);
+    procedure CheckResponseErrorCode(Value: string);
   protected
     procedure SetActive(AValue: Boolean); override;
@@ -43 +44 @@
     Identification: string;
     BaudRate: Integer;
+    Connector: TDeviceConnector;
     procedure LoadFromRegistry(Root: HKEY; Key: string); override;
     procedure SaveToRegistry(Root: HKEY; Key: string); override;
@@ -139 +141 @@
   SerialPort: TCommSerialPort;
   Telnet: TCommTelnet;
+  TelnetOption: TTelnetOptionComPort;
 begin
   if Active = AValue then Exit;
@@ -148 +151 @@
     HexData := TStringList.Create;
 
-    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;
-
+    Connector.Active := False;
+    ConnectorBackup.Assign(Connector);
+    ConnectorBackupPin := Connector.Pin.RemotePin;
+    Connector.Pin.Disconnect;
+    if Connector.ConnectionType = ctSerialPort then begin
       //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;
+      Connector.CommSerial.SerialPort.FlowControl := fcNone;
+      Connector.CommSerial.SerialPort.BaudRate := BaudRate;
+      Connector.CommSerial.SerialPort.DTR := True;
+      Connector.CommSerial.SerialPort.Flush;
+    end else
+    if Connector.ConnectionType = ctNetworkClient then begin
+      TelnetOption := TTelnetOptionComPort(Connector.CommTelnet.SearchOption(tmComPortControlOption));
+      TelnetOption.FlowControl := fcNone;
+      TelnetOption.BaudRate := BaudRate;
+      TelnetOption.DTR := True;
+    end;
+    Connector.CommSerial.SerialPort.Purge;
+    Connector.CommTelnet.Purge;
+    Connector.Pin.Connect(CommMark.PinRaw);
+    if Assigned(FOnLogData) then
+      Pin.OnLogData := FOnLogData;
+    CommMark.Active := True;
+    Connector.Active := True;
     ResponseClear;
-    CommMark.Active := True;
+    Sleep(1000);
     ReadIdentification;
   end else begin
     CommMark.Active := False;
-    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;
+    Connector.Active := False;
+    Connector.Assign(ConnectorBackup);
+    Connector.Pin.Connect(ConnectorBackupPin);
+    Connector.Active := True;
     HexData.Free;
     Request.Free;
@@ -189 +189 @@
 end;
 
-procedure TDallasProgrammer.CheckErrorCode(Value: string);
+procedure TDallasProgrammer.CheckWriteErrorCode(Value: string);
 begin
   if Value = 'H' then raise Exception.Create(SInvalidHexFormat)
@@ -203 +203 @@
 end;
 
+procedure TDallasProgrammer.CheckResponseErrorCode(Value: string);
+begin
+  if Value <> '' then begin
+    if Value[1] = 'E' then
+      raise Exception.Create('Dallas error: ' + Value);
+  end;
+end;
+
 procedure TDallasProgrammer.LoadFromRegistry(Root: HKEY; Key: string);
 begin
@@ -239 +247 @@
   Pin.Send(Request.List);
   Value := ReadResponse;
-  ReadResponse; // Empty line
+  Value := ReadResponse; // Empty line
+  CheckResponseErrorCode(Value);
 
   //HexFile.SaveToStringList(HexData);
@@ -287 +296 @@
       Pin.Send(Request.List);
       Value := ReadResponse;
-      CheckErrorCode(Value);
+      CheckWriteErrorCode(Value);
       Job.Progress.Value := I;
       if Job.Terminate then Break;
@@ -319 +328 @@
       Pin.Send(Request.List);
       Value := ReadResponse;
-      CheckErrorCode(Value);
+      CheckWriteErrorCode(Value);
       Job.Progress.Value := I;
       if Job.Terminate then Break;
@@ -335 +344 @@
   Request.WriteByte(Ord('K'));
   Pin.Send(Request.List);
-  ReadResponse;
+  CheckResponseErrorCode(ReadResponse);
 end;
 
@@ -354 +363 @@
   Request.Clear;
   Pin.Send(Request.List);
-  ReadResponse; // Empty line
+  Value := ReadResponse; // Empty line
   Identification := ReadResponse;
-  Result := Identification;
+
   Log(SIdentification + ': ' + Identification);
 end;
@@ -378 +387 @@
   CommMark.PinFrame.Connect(Pin);
   BaudRate := 9600;
-  SerialPortBackup := TCommSerialPort.Create(nil);
+  ConnectorBackup := TDeviceConnector.Create;
 end;
 
@@ -384 +393 @@
 begin
   Active := False;
-  Mark.Free;
-  CommMark.Free;
-  SerialPortBackup.Free;
-  Pin.Free;
-  ResponseQueue.Free;
-  ResponseLock.Free;
-  ResponseTemp.Free;
-  inherited Destroy;
+  FreeAndNil(Mark);
+  FreeAndNil(CommMark);
+  FreeAndNil(ConnectorBackup);
+  FreeAndNil(Pin);
+  FreeAndNil(ResponseQueue);
+  FreeAndNil(ResponseLock);
+  FreeAndNil(ResponseTemp);
+  inherited;
 end;
 

ISPProgrammer/PRESTO/UPresto.pas

@@ -8 +8 @@
 
 uses
-  Classes, SysUtils, UISPProgrammer, UPrestoDLL,
+  Classes, SysUtils, UISPProgrammer, UPrestoDLL, UCommPin,
   UStreamHelper, Globals, Processors, Delays, UCPUType, Registry,
   UJobProgressView;

ISPProgrammer/UISPProgrammer.pas

@@ -32 +32 @@
     FileName: string;
     Capabilities: TISPProgCapabilities;
-    ExtPin: TCommPin;
     procedure Log(Text: string);
     procedure LoadFromRegistry(Root: HKEY; Key: string); virtual;
@@ -130 +129 @@
 constructor TISPProgrammer.Create;
 begin
-  ExtPin := TCommPin.Create;
+  //ExtPin := TCommPin.Create;
   HexFile := TIntelHexFile.Create;
   HexFile.BytePerLine := 20;
@@ -138 +137 @@
 begin
   Active := False;
-  FreeAndNil(ExtPin);
+  //FreeAndNil(ExtPin);
   FreeAndNil(HexFile);
   inherited Destroy;