Skip to content

Commit

Permalink
Fix for dmUtils.FreqFromBand
Browse files Browse the repository at this point in the history 
	dmUtils.FreqFromBand was hard coded to return frequency when band and mode was given.
	How ever it had a typing error with 60M band that caused LoTW import fail with that band.
	As hard coded errors are difficult to fix frequency lookup is now moved tocarlog_common.bands
	where user can edit values via preferences/bands/Frequencies.

	For more information see issue ok2cqr#457

	Created update to version 5 for cqrlog_common. Added 3 microwave bands.

Squashed commit of the following:

commit ea685a6
Author: OH1KH <[email protected]>
Date:   Tue Nov 16 15:33:31 2021 +0200

    Added missing 3 microvawe bands to cqrlog_common.bands by database version update to 5

commit d70345c
Author: OH1KH <[email protected]>
Date:   Mon Nov 15 21:17:37 2021 +0200

    Small fix to phone modes

commit b9543a5
Author: OH1KH <[email protected]>
Date:   Mon Nov 15 21:07:40 2021 +0200

    dmUtils.FreqFromBand rewritten
  • Loading branch information
OH1KH committed Nov 16, 2021
1 parent b4125a4 commit 295fe4b
Show file tree
Hide file tree
Showing 3 changed files with 48 additions and 213 deletions.
18 changes: 17 additions & 1 deletion src/dData.pas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ interface
const
cDB_LIMIT = 500;
cDB_MAIN_VER = 18;
cDB_COMN_VER = 4;
cDB_COMN_VER = 5;
cDB_PING_INT = 300; //ping interval for database connection in seconds
//program crashed after long time of inactivity
//so now after cDB_PING_INT will be run simple sql query
Expand Down Expand Up @@ -2734,6 +2734,22 @@ procedure TdmData.UpgradeCommonDatabase(old_version : Integer);
Q1.ExecSQL
end;

if old_version < 5 then
begin
Q1.SQL.Text := 'INSERT INTO cqrlog_common.bands (band,b_begin,b_end,cw,rtty,ssb) VALUES (' +
QuotedStr('2.5MM')+',122250.0,123000.0,122251.0,122251.0,122251.0)';
if fDebugLevel>=1 then Writeln(Q1.SQL.Text);
Q1.ExecSQL;
Q1.SQL.Text := 'INSERT INTO cqrlog_common.bands (band,b_begin,b_end,cw,rtty,ssb) VALUES (' +
QuotedStr('2MM')+',134000.0,141000.0,134930.0,134930.0,134930.0)';
if fDebugLevel>=1 then Writeln(Q1.SQL.Text);
Q1.ExecSQL;
Q1.SQL.Text := 'INSERT INTO cqrlog_common.bands (band,b_begin,b_end,cw,rtty,ssb) VALUES (' +
QuotedStr('1MM')+',241000.0,250000.0,248000.0,248000.0,248000.0)';
if fDebugLevel>=1 then Writeln(Q1.SQL.Text);
Q1.ExecSQL;
end;

Q1.SQL.Text := 'update cqrlog_common.db_version set nr='+IntToStr(cDB_COMN_VER);
if fDebugLevel>=1 then Writeln(Q1.SQL.Text);
Q1.ExecSQL
Expand Down
241 changes: 30 additions & 211 deletions src/dUtils.pas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1289,221 +1289,40 @@ function TdmUtils.IsFreqOK(freq: string): boolean;
function TdmUtils.FreqFromBand(band, mode: string): string;
begin
Result := '';
mode := UpperCase(mode);
mode := LowerCase(mode);
band := UpperCase(band);
if band = '2190M' then
begin
Result := '0.139';
exit;
end;
if band = '630M' then
begin
Result := '0.472';
exit;
end;
if band = '160M' then
begin
if (mode = 'CW') then
Result := '1.800'
else
Result := '1.850';
exit;
end;
if band = '80M' then
begin
if (mode = 'CW') then
Result := '3.520'
else
Result := '3.770';
exit;
end;
if band = '60M' then
begin
Result := '5.2585';
exit;
end;
if band = '40M' then
begin
if (mode = 'CW') then
Result := '7.020'
else
Result := '7.055';
exit;
end;
if band = '30M' then
begin
Result := '10.1';
exit;
end;
if band = '20M' then
begin
if (mode = 'CW') then
Result := '14.025'
else
begin
if (Pos('PSK', mode) > 0) then
Result := '14.075'
else
begin
if (mode = 'RTTY') then
Result := '14.085'
else
Result := '14.200';
end;
end;
end;
if band = '17M' then
begin
if (mode = 'CW') then
Result := '18.070'
else
Result := '18.100';
exit;
end;
if band = '15M' then
begin
if (mode = 'CW') then
Result := '21.050'
else
begin
if (Pos('PSK', mode) > 0) then
Result := '21.075'
else
begin
if mode = 'RTTY' then
Result := '21.085'
else
Result := '21.200';
end;
end;
exit;
end;
if band = '12M' then
begin
if (mode = 'CW') then
Result := '24.916'
else
begin
if LetterFromMode(mode) = 'D' then
Result := '24.917'
else
Result := '24.932';
end;
exit;
end;
if band = '10M' then
begin
if (mode = 'CW') then
Result := '28.050'
else
begin
if LetterFromMode(mode) = 'D' then
Result := '28.100'

if mode='' then
mode:='b_begin'
else
case mode of
'usb','lsb',
'fm','am',
'ssb' : mode:='ssb';
'cw' : mode:='cw';
else
Result := '28.200';
mode:='rtty' //this covers all modes not phone or cw
end;
exit;
end;
if band = '6M' then
begin
Result := '50.100';
exit;
end;
if band = '4M' then
begin
if mode = 'CW' then
Result := ' 70.0500'
else
Result := '70.0875';
exit;
end;
if band = '1.25M' then
begin
Result := '222.010';
exit;
end;
if band = '2M' then
begin
if (mode = 'CW') then
Result := '144.050'
else
Result := '144.280';
exit;
end;
if band = '70CM' then
begin
if mode = 'CW' then
Result := '432.100'
else
Result := '432.200';
exit;
end;
if band = '33CM' then
begin
Result := '902.000';
exit;
end;
if band = '23CM' then
begin
if mode = 'CW' then
Result := '1296.150'
else
Result := '1296.200';
exit;
end;
if band = '13CM' then
begin
if mode = 'CW' then
Result := '2320.150'
else
Result := '2320.200';
exit;
end;
if band = '9CM' then
begin
Result := '3400.200';
exit;
end;
if band = '6CM' then
begin
Result := '5760.200';
exit;
end;
if band = '3CM' then
begin
Result := '10368.200';
exit;
end;
if band = '1.25CM' then
begin
Result := '24048.200';
exit;
end;
if band = '6MM' then
begin
Result := '47088';
exit;
end;
if band = '4MM' then
begin
Result := '77500.200';
exit;
end;
if band = '2.5MM' then
begin
Result := '122250.000';
exit;
end;
if band = '2MM' then
begin
Result := '134930.000';
exit;
end;
if band = '1MM' then
begin
Result := '248000.000';
exit;

dmData.qBands.Close;
dmData.qBands.SQL.Text := 'SELECT '+mode+' FROM cqrlog_common.bands WHERE band = ' + QuotedStr(band);
if dmData.DebugLevel >=1 then
Writeln(dmData.qBands.SQL.Text);

if dmData.trBands.Active then
dmData.trBands.Rollback;
dmData.trBands.StartTransaction;
try
dmData.qBands.Open;
if dmData.qBands.RecordCount > 0 then
Result:= dmData.qBands.FieldByName(mode).AsString;
finally
if dmData.DebugLevel >=1 then
Writeln('FreqFromBand('+band+','+mode+')='+Result);
dmData.qBands.Close;
dmData.trBands.Rollback
end;

end;

function TdmUtils.IsAdifOK(qsodate, time_on, time_off, call, freq, mode, rst_s, rst_r, iota,
Expand Down
2 changes: 1 addition & 1 deletion src/uVersion.pas
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ interface
cRELEAS = 2;
cBUILD = 1;

cBUILD_DATE = '2021-11-12';
cBUILD_DATE = '2021-11-16';

implementation

Expand Down

0 comments on commit 295fe4b

Please sign in to comment.