Changeset 409 for PinConnection/USerialPort.pas

Timestamp:

Aug 14, 2012, 11:55:28 AM (12 years ago)

Author:

chronos

Message:

• Modified: Class TSerialPort in PinConnection package now use only numeric baud rate instead of static list of possible rates.

File:

• PinConnection/USerialPort.pas (modified) (7 diffs)

PinConnection/USerialPort.pas

@@ -37 +37 @@
     FDTR: Boolean;
     FActive: Boolean;
-    FBaudRate: TBaudRate;
+    FBaudRate: Integer;
     FDataBits: TDataBits;
     FFlowControl: TFlowControl;
@@ -46 +46 @@
     FReceiveThread: TSerialPortReceiveThread;
     FReceiveBuffer: TListByte;
-    function GetBaudRateNumeric: Integer;
     function GetName: string;
-    procedure SetBaudRate(const AValue: TBaudRate);
-    procedure SetBaudRateNumeric(const AValue: Integer);
+    procedure SetBaudRate(const AValue: Integer);
     procedure SetDataBits(const AValue: TDataBits);
     procedure SetDTR(const AValue: Boolean);
@@ -66 +64 @@
     property StopBits: TStopBits read FStopBits write SetStopBits;
     property Parity: TParity read FParity write SetParity;
-    property BaudRate: TBaudRate read FBaudRate write SetBaudRate;
+    property BaudRate: Integer read FBaudRate write SetBaudRate;
     property Active: Boolean read FActive write SetActive;
     property RTS: Boolean read FRTS write SetRTS;
@@ -72 +70 @@
     property ReceiveBuffer: TListByte read FReceiveBuffer;
 
-    property BaudRateNumeric: Integer read GetBaudRateNumeric write SetBaudRateNumeric;
     property OnReceiveData: TReceiveDataEvent read FOnReceiveData write FOnReceiveData;
     procedure LoadAvailableToStrings(Strings: TStrings; Check: Boolean = False);
@@ -215 +212 @@
   inherited Create;
   FReceiveBuffer := TListByte.Create;
-  FBaudRate := br9600;
+  FBaudRate := 9600;
   FName := 'COM1';
   FDataBits := 8;
@@ -248 +245 @@
 end;
 
-procedure TSerialPort.SetBaudRate(const AValue: TBaudRate);
+procedure TSerialPort.SetBaudRate(const AValue: Integer);
 begin
   FBaudRate := AValue;
   if FActive then begin
     GetCommState;
-    DCB.BaudRate := BaudRateNumeric;
-    SetCommState;
-  end;
-end;
-
-function TSerialPort.GetBaudRateNumeric: Integer;
-begin
-  Result := BaudRateNumericTable[FBaudRate];
+    DCB.BaudRate := AValue;
+    SetCommState;
+  end;
 end;
 
@@ -266 +258 @@
 begin
   Result := FName;
-end;
-
-procedure TSerialPort.SetBaudRateNumeric(const AValue: Integer);
-begin
-  case AValue of
-    110: BaudRate := br110;
-    300: BaudRate := br300;
-    600: BaudRate := br600;
-    1200: BaudRate := br1200;
-    2400: BaudRate := br2400;
-    4800: BaudRate := br4800;
-    9600: BaudRate := br9600;
-    14400: BaudRate := br14400;
-    19200: BaudRate := br19200;
-    38400: BaudRate := br38400;
-    56000: BaudRate := br56000;
-    57600: BaudRate := br57600;
-    115200: BaudRate := br115200;
-    128000: BaudRate := br128000;
-    256000: BaudRate := br256000;
-    else raise Exception.CreateFmt(SWrongNumericBaudRate, [AValue]);
-  end;
 end;