ADD: check if tnc still not in hostmode

Author: andreaspeters

src/flexpacket.lpi

@@ -23,7 +23,7 @@
       <UseVersionInfo Value="True"/>
       <AutoIncrementBuild Value="True"/>
       <MinorVersionNr Value="8"/>
-      <BuildNr Value="2628"/>
+      <BuildNr Value="2631"/>
       <Language Value="0C0C"/>
       <StringTable InternalName="flexpacket" ProductName="flexpacket" ProductVersion="0.8.0"/>
     </VersionInfo>

src/flexpacket.lps

@@ -31,8 +31,8 @@
         <IsPartOfProject Value="True"/>
         <IsVisibleTab Value="True"/>
         <EditorIndex Value="9"/>
-        <TopLine Value="88"/>
-        <CursorPos X="12" Y="105"/>
+        <TopLine Value="120"/>
+        <CursorPos X="6" Y="130"/>
         <UsageCount Value="214"/>
         <Loaded Value="True"/>
       </Unit>
@@ -267,26 +267,10 @@
         <EditorIndex Value="-1"/>
         <TopLine Value="375"/>
         <CursorPos Y="387"/>
-        <UsageCount Value="4"/>
+        <UsageCount Value="3"/>
       </Unit>
     </Units>
     <JumpHistory HistoryIndex="29">
-      <Position>
-        <Filename Value="umain.pas"/>
-        <Caret Line="1136" Column="24" TopLine="1109"/>
-      </Position>
-      <Position>
-        <Filename Value="umain.pas"/>
-        <Caret Line="1306" TopLine="1300"/>
-      </Position>
-      <Position>
-        <Filename Value="umain.pas"/>
-        <Caret Line="190" Column="31" TopLine="187"/>
-      </Position>
-      <Position>
-        <Filename Value="umain.pas"/>
-        <Caret Line="1314" Column="38" TopLine="1292"/>
-      </Position>
       <Position>
         <Filename Value="uinfo.pas"/>
         <Caret Line="50" TopLine="36"/>
@@ -391,6 +375,22 @@
         <Filename Value="uhostmode.pas"/>
         <Caret Line="47" Column="27" TopLine="21"/>
       </Position>
+      <Position>
+        <Filename Value="uhostmode.pas"/>
+        <Caret Line="136" TopLine="113"/>
+      </Position>
+      <Position>
+        <Filename Value="uhostmode.pas"/>
+        <Caret Line="170" Column="20" TopLine="157"/>
+      </Position>
+      <Position>
+        <Filename Value="uhostmode.pas"/>
+        <Caret Line="127" Column="34" TopLine="105"/>
+      </Position>
+      <Position>
+        <Filename Value="uhostmode.pas"/>
+        <Caret Line="131" Column="17" TopLine="121"/>
+      </Position>
     </JumpHistory>
     <RunParams>
       <FormatVersion Value="2"/>

src/flexpacket.res

@@ -25,6 +25,7 @@   THostmode = class(TThread)
     function ReceiveDataUntilZero: AnsiString;
     function ReceiveStringData: AnsiString;
     function ReceiveByteData:TBytes;
+    function ReadWithTimeout(Ser: TBlockSerial; TimeoutMS: Integer): String;
   protected
     procedure Execute; override;
   public
@@ -90,17 +91,17 @@ function THostmode.ComPortExists(const APort: String): Boolean;
 end;
 
 procedure THostmode.Execute;
-var
-  LastSendTimeG, LastSendTimeL: Cardinal;
+var LastSendTimeG, LastSendTimeL: Cardinal;
+    resp: String;
 begin
   repeat
-    SetTNCStatusMessage('TNC Init Comport');
+    SetTNCStatusMessage('TNC Init COM Port');
     if FPConfig^.ComPort <> '' then
     begin
       try
         if not ComPortExists(FPConfig^.ComPort) then
         begin
-          SetTNCStatusMessage('COM does not exist');
+          SetTNCStatusMessage('COM Port does not exist');
           Terminate;
           Exit;
         end;
@@ -121,10 +122,18 @@ procedure THostmode.Execute;
 
   // Init TNC
   SetTNCStatusMessage('TNC Set Hostmode');
-  repeat
-    Sleep(200)
-  until FSerial.CanWrite(100);
+
   FSerial.SendString(#17#24#13#27'JHOST1'#13);
+  sleep(200);
+
+  resp := ReadWithTimeout(FSerial, 500);
+  if Pos('*', resp) > 0 then
+  begin
+    SetTNCStatusMessage('TNC could''t set Hostmode');
+    Terminate;
+    Exit;
+  end;
+
   Sleep(200);
 
   Connected := True;
@@ -167,6 +176,23 @@ procedure THostmode.Execute;
   WaitFor;
 end;
 
+function THostmode.ReadWithTimeout(Ser: TBlockSerial; TimeoutMS: Integer): String;
+var T0: QWord;
+begin
+  Result := '';
+  T0 := GetTickCount64;
+
+  repeat
+    if Ser.CanRead(50) then
+      Result := Result + Ser.RecvString(50);
+
+    if Result <> '' then
+      Exit;
+
+    Sleep(10);
+  until (GetTickCount64 - T0) > QWord(TimeoutMS);
+end;
+
 procedure THostmode.SendG;
 var i: Integer;
 begin