Skip to content

Commit 25ddf08

Browse files
andreaspetersandreaspeters
committed
FIX: search free channel to connect
1 parent 45528b6 commit 25ddf08

File tree

5 files changed

+69
-69
lines changed

5 files changed

+69
-69
lines changed

‎src/flexpacket.lpi‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
<UseVersionInfo Value="True"/>
2424
<AutoIncrementBuild Value="True"/>
2525
<MinorVersionNr Value="7"/>
26-
<BuildNr Value="2563"/>
26+
<BuildNr Value="2567"/>
2727
<Language Value="0C0C"/>
2828
<StringTable InternalName="flexpacket" ProductName="flexpacket" ProductVersion="0.7.0"/>
2929
</VersionInfo>

‎src/flexpacket.lps‎

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
<CONFIG>
33
<ProjectSession>
44
<Version Value="12"/>
5-
<BuildModes Active="Release"/>
5+
<BuildModes Active="Debug"/>
66
<Units>
77
<Unit>
88
<Filename Value="flexpacket.lpr"/>
@@ -18,9 +18,10 @@
1818
<HasResources Value="True"/>
1919
<ResourceBaseClass Value="Form"/>
2020
<UnitName Value="UMain"/>
21+
<IsVisibleTab Value="True"/>
2122
<EditorIndex Value="15"/>
22-
<TopLine Value="592"/>
23-
<CursorPos X="16" Y="615"/>
23+
<TopLine Value="1844"/>
24+
<CursorPos X="31" Y="1862"/>
2425
<UsageCount Value="210"/>
2526
<Loaded Value="True"/>
2627
<LoadedDesigner Value="True"/>
@@ -172,10 +173,9 @@
172173
<Unit>
173174
<Filename Value="upipes.pas"/>
174175
<IsPartOfProject Value="True"/>
175-
<IsVisibleTab Value="True"/>
176176
<EditorIndex Value="16"/>
177177
<TopLine Value="112"/>
178-
<CursorPos X="29" Y="141"/>
178+
<CursorPos X="55" Y="127"/>
179179
<UsageCount Value="200"/>
180180
<Loaded Value="True"/>
181181
</Unit>
@@ -265,129 +265,129 @@
265265
<EditorIndex Value="-1"/>
266266
<TopLine Value="375"/>
267267
<CursorPos Y="387"/>
268-
<UsageCount Value="11"/>
268+
<UsageCount Value="8"/>
269269
</Unit>
270270
</Units>
271271
<JumpHistory HistoryIndex="29">
272272
<Position>
273-
<Filename Value="uconvers.pas"/>
274-
<Caret Line="318" Column="50" TopLine="295"/>
273+
<Filename Value="umain.pas"/>
274+
<Caret Line="1712" Column="26" TopLine="1690"/>
275275
</Position>
276276
<Position>
277-
<Filename Value="uconvers.pas"/>
278-
<Caret Line="319" Column="19" TopLine="296"/>
277+
<Filename Value="umain.pas"/>
278+
<Caret Line="43" Column="13" TopLine="30"/>
279279
</Position>
280280
<Position>
281-
<Filename Value="uconvers.pas"/>
282-
<Caret Line="334" Column="60" TopLine="311"/>
281+
<Filename Value="umain.pas"/>
282+
<Caret Line="69" Column="12" TopLine="47"/>
283283
</Position>
284284
<Position>
285-
<Filename Value="uconvers.pas"/>
286-
<Caret Line="335" Column="29" TopLine="312"/>
285+
<Filename Value="umain.pas"/>
286+
<Caret Line="159" Column="33" TopLine="137"/>
287287
</Position>
288288
<Position>
289-
<Filename Value="uconvers.pas"/>
290-
<Caret Line="348" Column="29" TopLine="325"/>
289+
<Filename Value="umain.pas"/>
290+
<Caret Line="1697" Column="21" TopLine="13"/>
291291
</Position>
292292
<Position>
293-
<Filename Value="uconvers.pas"/>
294-
<Caret Line="365" Column="49" TopLine="342"/>
293+
<Filename Value="umain.pas"/>
294+
<Caret Line="1884" Column="3" TopLine="1861"/>
295295
</Position>
296296
<Position>
297297
<Filename Value="umain.pas"/>
298-
<Caret Line="744" Column="31" TopLine="34"/>
298+
<Caret Line="1080" Column="74" TopLine="1073"/>
299299
</Position>
300300
<Position>
301301
<Filename Value="umain.pas"/>
302-
<Caret Line="1126" Column="24" TopLine="1113"/>
302+
<Caret Line="1809" Column="37" TopLine="1802"/>
303303
</Position>
304304
<Position>
305305
<Filename Value="umain.pas"/>
306-
<Caret Line="1489" Column="26" TopLine="1470"/>
306+
<Caret Line="43" Column="13" TopLine="30"/>
307307
</Position>
308308
<Position>
309309
<Filename Value="umain.pas"/>
310-
<Caret Line="1485" Column="74" TopLine="1470"/>
310+
<Caret Line="159" Column="23" TopLine="137"/>
311311
</Position>
312312
<Position>
313313
<Filename Value="umain.pas"/>
314-
<Caret Line="1491" Column="71" TopLine="1471"/>
314+
<Caret Line="753" Column="30" TopLine="731"/>
315315
</Position>
316316
<Position>
317317
<Filename Value="umain.pas"/>
318-
<Caret Line="1486" Column="48" TopLine="1472"/>
318+
<Caret Line="1698" Column="61" TopLine="1693"/>
319319
</Position>
320320
<Position>
321321
<Filename Value="umain.pas"/>
322-
<Caret Line="1487" Column="45" TopLine="1473"/>
322+
<Caret Line="1688" Column="40" TopLine="1687"/>
323323
</Position>
324324
<Position>
325325
<Filename Value="umain.pas"/>
326-
<Caret Line="1491" Column="20" TopLine="1473"/>
326+
<Caret Line="1697" Column="30" TopLine="1686"/>
327327
</Position>
328328
<Position>
329329
<Filename Value="umain.pas"/>
330-
<Caret Line="1490" TopLine="1476"/>
330+
<Caret Line="1834" Column="25" TopLine="1817"/>
331331
</Position>
332332
<Position>
333333
<Filename Value="umain.pas"/>
334-
<Caret Line="1711" Column="39" TopLine="1709"/>
334+
<Caret Line="1861" Column="63" TopLine="1851"/>
335335
</Position>
336336
<Position>
337337
<Filename Value="umain.pas"/>
338-
<Caret Line="1482" Column="35" TopLine="1477"/>
338+
<Caret Line="1864" Column="41" TopLine="1851"/>
339339
</Position>
340340
<Position>
341341
<Filename Value="umain.pas"/>
342-
<Caret Line="1674" Column="10" TopLine="1647"/>
342+
<Caret Line="1900" Column="46" TopLine="1877"/>
343343
</Position>
344344
<Position>
345345
<Filename Value="umain.pas"/>
346-
<Caret Line="1122" Column="25" TopLine="1107"/>
346+
<Caret Line="1937" Column="32" TopLine="1918"/>
347347
</Position>
348348
<Position>
349-
<Filename Value="upipes.pas"/>
350-
<Caret Line="18" Column="17"/>
349+
<Filename Value="umain.pas"/>
350+
<Caret Line="181" Column="32" TopLine="168"/>
351351
</Position>
352352
<Position>
353353
<Filename Value="umain.pas"/>
354-
<Caret Line="1509" TopLine="1496"/>
354+
<Caret Line="1116" Column="24" TopLine="1094"/>
355355
</Position>
356356
<Position>
357357
<Filename Value="umain.pas"/>
358-
<Caret Line="1105" Column="9" TopLine="1067"/>
358+
<Caret Line="1872" TopLine="1860"/>
359359
</Position>
360360
<Position>
361361
<Filename Value="umain.pas"/>
362-
<Caret Line="629" Column="9" TopLine="611"/>
362+
<Caret Line="1864" Column="29" TopLine="1859"/>
363363
</Position>
364364
<Position>
365-
<Filename Value="upipes.pas"/>
366-
<Caret Line="19" Column="11" TopLine="6"/>
365+
<Filename Value="umain.pas"/>
366+
<Caret Line="1849" Column="23" TopLine="1835"/>
367367
</Position>
368368
<Position>
369369
<Filename Value="umain.pas"/>
370-
<Caret Line="618" Column="35" TopLine="608"/>
370+
<Caret Line="1844" Column="8" TopLine="1835"/>
371371
</Position>
372372
<Position>
373373
<Filename Value="umain.pas"/>
374-
<Caret Line="1514" Column="27" TopLine="1503"/>
374+
<Caret Line="1116" Column="12" TopLine="1103"/>
375375
</Position>
376376
<Position>
377377
<Filename Value="umain.pas"/>
378-
<Caret Line="617" TopLine="601"/>
378+
<Caret Line="181" Column="20" TopLine="168"/>
379379
</Position>
380380
<Position>
381381
<Filename Value="umain.pas"/>
382-
<Caret Line="1107" Column="2" TopLine="1090"/>
382+
<Caret Line="1116" Column="24" TopLine="1094"/>
383383
</Position>
384384
<Position>
385385
<Filename Value="umain.pas"/>
386-
<Caret Line="1684" Column="18" TopLine="1669"/>
386+
<Caret Line="181" Column="20" TopLine="168"/>
387387
</Position>
388388
<Position>
389-
<Filename Value="upipes.pas"/>
390-
<Caret Line="186" Column="32" TopLine="170"/>
389+
<Filename Value="umain.pas"/>
390+
<Caret Line="1926" Column="60" TopLine="1915"/>
391391
</Position>
392392
</JumpHistory>
393393
<RunParams>

‎src/flexpacket.res‎

0 Bytes
Binary file not shown.

‎src/umain.pas‎

Lines changed: 22 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -1690,28 +1690,15 @@ procedure TFMain.actQuickConnectExecute(Sender: TObject);
16901690
i, Channel: Byte;
16911691
btn: TMenuItem;
16921692
begin
1693-
Channel := CurrentChannel;
1694-
1695-
// if the current channel is already connected, choose a free one.
1696-
if FPConfig.Connected[Channel] then
1697-
Channel := 0;
1693+
Channel := 1;
16981694

16991695
// search next free channel if the current channel is 0
1700-
if Channel = 0 then
1701-
begin
1702-
for i := 1 to FPConfig.MaxChannels do
1703-
if not FPConfig.Connected[i] then
1704-
begin
1705-
Channel := i;
1706-
break;
1707-
end
1708-
end;
1709-
1710-
if Channel = 0 then
1711-
begin
1712-
ShowMessage('No quickconnect at the monitoring channel.');
1713-
Exit;
1714-
end;
1696+
for i := 1 to FPConfig.MaxChannels do
1697+
if not FPConfig.Connected[i] then
1698+
begin
1699+
Channel := i;
1700+
break;
1701+
end;
17151702

17161703
if Sender is TMenuItem then
17171704
begin
@@ -1866,20 +1853,30 @@ procedure TFMain.CheckDisconnected(const Channel: Byte; const Data: String);
18661853
if (Length(Data) = 0) then
18671854
Exit;
18681855

1856+
if not Assigned(FPConfig.DestCallsign[Channel]) then
1857+
begin
1858+
FPConfig.Connected[Channel] := False;
1859+
Exit;
1860+
end;
1861+
18691862
Regex := TRegExpr.Create;
18701863
try
18711864
Regex.Expression := '^.*Disconnected from (?:[A-Z]{0,7}\:)?([A-Z0-9]{1,7}-[0-9]).*';
18721865
Regex.ModifierI := True;
18731866
if Regex.Exec(Data) then
18741867
begin
18751868
// delete the last one
1876-
i := FPConfig.DestCallsign[CurrentChannel].Count;
1869+
i := FPConfig.DestCallsign[Channel].Count;
1870+
if i <= 0 then
1871+
FPConfig.Connected[i] := False;
1872+
18771873
if (i - 1) > 0 then
18781874
begin
18791875
SetChannelButtonLabel(Channel,Trim(FPConfig.DestCallsign[Channel][i-2]));
18801876
FPConfig.DestCallsign[Channel].Delete(i-1);
18811877
FPConfig.ConnectInfo[Channel] := Default(TConnectInfo);
1882-
FPConfig.Connected[Channel] := False;
1878+
if FPConfig.DestCallsign[Channel].Count <= 0 then
1879+
FPConfig.Connected[Channel] := False;
18831880
SBStatus.Panels[6].Text := '';
18841881
end;
18851882
end;
@@ -1935,7 +1932,10 @@ procedure TFMain.GetStatus(const Channel: Byte);
19351932
Status := AGWClient.ChannelStatus[Channel];
19361933

19371934
if (Status[6] = 'DISCONNECTED') or (Status[5] = Chr(0)) then
1935+
begin
19381936
SetChannelButtonLabel(Channel,'Disc');
1937+
FPConfig.Connected[Channel] := False;
1938+
end;
19391939
end;
19401940

19411941

‎use/cmdline‎

0 commit comments

Comments
 (0)