Changeset 10 for branches/ByteArray/Devices

Timestamp:

Aug 7, 2024, 12:12:42 AM (6 months ago)

Author:

chronos

Message:

• Modified: Improved serial console handling.

Location:

branches/ByteArray/Devices

Files:

• Memory.pas (modified) (2 diffs)
• Serial.pas (modified) (3 diffs)

branches/ByteArray/Devices/Memory.pas

@@ -32 +32 @@
     procedure FillZero;
     procedure Clear;
+    function ToString: string; override;
     property Size: TInt read FSize write SetSize;
+    constructor Create;
     destructor Destroy; override;
   end;
@@ -144 +146 @@
 end;
 
+function TMemory.ToString: string;
+var
+  I: Integer;
+begin
+  Result := '';
+  for I := 0 to FSize - 1 do
+    Result := Result + ', ' + IntToStr(FData[I]);
+  Delete(Result, 1, 2);
+end;
+
+constructor TMemory.Create;
+begin
+  FSize := 0;
+end;
+
 destructor TMemory.Destroy;
 begin

branches/ByteArray/Devices/Serial.pas

@@ -4 +4 @@
 
 uses
-  Classes, SysUtils, Device, Int, Channel;
+  Classes, SysUtils, Device, Int, Channel, syncobjs;
 
 type
-  TReadEvent = function: Byte of object;
-  TWriteEvent = procedure (Value: Byte) of object;
-
   { TSerial }
 
   TSerial = class(TDevice)
   private
-    FOnRead: TReadEvent;
-    FOnWrite: TWriteEvent;
+    FLock: TCriticalSection;
+    FOnInput: TNotifyEvent;
+    FOnOutput: TNotifyEvent;
+    InputBuffer: string;
+    OutputBuffer: string;
+    function ReadData(Size: TIntSize): TInt;
+    function ReadInputBufferCount(Size: TIntSize): TInt;
+    function ReadOutputBufferCount(Size: TIntSize): TInt;
+    procedure WriteData(Size: TIntSize; Value: TInt);
+    procedure WriteInputBufferCount(Size: TIntSize; Value: TInt);
+    procedure WriteOutputBufferCount(Size: TIntSize; Value: TInt);
   public
-    function ReadData(Size: TIntSize): TInt;
-    procedure WriteData(Size: TIntSize; Value: TInt);
+    constructor Create;
+    destructor Destroy; override;
+    function ReadOutputBuffer: string;
+    procedure WriteInputBuffer(Text: string);
     function GetHandlers: THandlers; override;
-    property OnWrite: TWriteEvent read FOnWrite write FOnWrite;
-    property OnRead: TReadEvent read FOnRead write FOnRead;
+    property OnOutput: TNotifyEvent read FOnOutput write FOnOutput;
+    property OnInput: TNotifyEvent read FOnInput write FOnInput;
   end;
 
@@ -31 +39 @@
 function TSerial.ReadData(Size: TIntSize): TInt;
 begin
-  if Assigned(FOnRead) then Result := FOnRead;
+  FLock.Acquire;
+  try
+    if Length(InputBuffer) > 0 then begin
+      Result := Ord(InputBuffer[1]);
+      Delete(InputBuffer, 1, 1);
+    end;
+  finally
+    FLock.Release;
+  end;
+end;
+
+function TSerial.ReadInputBufferCount(Size: TIntSize): TInt;
+begin
+  FLock.Acquire;
+  try
+    Result := Length(InputBuffer);
+  finally
+    FLock.Release;
+  end;
+end;
+
+function TSerial.ReadOutputBufferCount(Size: TIntSize): TInt;
+begin
+  FLock.Acquire;
+  try
+    Result := Length(OutputBuffer);
+  finally
+    FLock.Release;
+  end;
 end;
 
 procedure TSerial.WriteData(Size: TIntSize; Value: TInt);
 begin
-  if Assigned(FOnWrite) then FOnWrite(Value);
+  FLock.Acquire;
+  try
+    OutputBuffer := OutputBuffer + Chr(Value);
+  finally
+    FLock.Release;
+  end;
+end;
+
+procedure TSerial.WriteInputBufferCount(Size: TIntSize; Value: TInt);
+begin
+  FLock.Acquire;
+  try
+    InputBuffer := '';
+  finally
+    FLock.Release;
+  end;
+end;
+
+procedure TSerial.WriteOutputBufferCount(Size: TIntSize; Value: TInt);
+begin
+  FLock.Acquire;
+  try
+    OutputBuffer := '';
+  finally
+    FLock.Release;
+  end;
+end;
+
+constructor TSerial.Create;
+begin
+  FLock := TCriticalSection.Create;
+  OutputBuffer := '';
+  InputBuffer := '';
+end;
+
+destructor TSerial.Destroy;
+begin
+  FreeAndNil(FLock);
+  inherited;
+end;
+
+function TSerial.ReadOutputBuffer: string;
+begin
+  FLock.Acquire;
+  try
+    Result := OutputBuffer;
+    OutputBuffer := '';
+  finally
+    FLock.Release;
+  end;
+end;
+
+procedure TSerial.WriteInputBuffer(Text: string);
+begin
+  FLock.Acquire;
+  try
+    InputBuffer := InputBuffer + Text;
+  finally
+    FLock.Release;
+  end;
 end;
 
@@ -43 +138 @@
   Result := THandlers.Create;
   Result.ReadHandlers.Add(ReadData);
+  Result.ReadHandlers.Add(ReadOutputBufferCount);
+  Result.ReadHandlers.Add(ReadOutputBufferCount);
   Result.WriteHandlers.Add(WriteData);
+  Result.WriteHandlers.Add(WriteInputBufferCount);
+  Result.WriteHandlers.Add(WriteOutputBufferCount);
 end;