Changeset 272 for PinConnection/UCommProtocol.pas

Timestamp:

Aug 30, 2011, 3:50:15 PM (13 years ago)

Author:

george

Message:

• Fixed: Do not send or receive data for comm classes if not in active state.
• Fixed: TCommProtocol now raise ENotActive exception on try to send data while in inactive state.
• Fixed: Reseting event after data received in TCommThread class.

File:

• PinConnection/UCommProtocol.pas (modified) (5 diffs)

PinConnection/UCommProtocol.pas

@@ -14 +14 @@
   ECommTimeout = class(Exception);
   ECommError = class(Exception);
+  ENotActive = class(Exception);
 
   TResponseError = (rcNone, rcCommandNotSupported, rcSequenceOutOfRange,
@@ -118 +119 @@
   SDeviceProtocol = 'Device protocol';
   SProtocolDecodeError = 'Data decode error';
+  SProtocolNotActive = 'Device protocol not active';
 
 procedure TCommProtocol.DataReceive(Sender: TCommPin; Stream: TStream);
@@ -133 +135 @@
     with Request do
     try
+      Stream.Position := 0;
       ReadFromStream(Stream);
       if TestIndex(0) then
@@ -273 +276 @@
   NewRequest: TVarBlockIndexed;
 begin
+  if FActive then begin
   try
     Session := TDeviceProtocolSession.Create;
@@ -337 +341 @@
     NewRequest.Free;
   end;
+  end else raise ENotActive.Create(SProtocolNotActive);
 end;