Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Alt-F9/Alt-F10 now uses 2 WPM speed increments. #245 #246

Merged
merged 2 commits into from Feb 15, 2024
Merged

Alt-F9/Alt-F10 now uses 2 WPM speed increments. #245 #246

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9108507
Alt-F9/Alt-F10 now uses 2 WPM speed increments. #245
w7sst Feb 14, 2024
c2bbd37
Add Ini.WpmStepRate to adjust WPM incremental step size.
w7sst Feb 14, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
3 changes: 3 additions & 0 deletions Ini.pas
View file
Open in desktop
Expand Up @@ -185,6 +185,7 @@ TContestDefinition = record
ArrlClass: string = '3A';
ArrlSection: string = 'GH';
Wpm: integer = 25;
WpmStepRate: integer = 2;
MaxRxWpm: integer = 0;
MinRxWpm: integer = 0;
NRDigits: integer = 1;
Expand Down Expand Up @@ -288,6 +289,7 @@ procedure FromIni;
MainForm.UpdNRDigits(ReadInteger(SEC_STN, 'NRDigits', NRDigits));

Wpm := ReadInteger(SEC_STN, 'Wpm', Wpm);
WpmStepRate := Max(1, Min(20, ReadInteger(SEC_STN, 'WpmStepRate', WpmStepRate)));
Qsk := ReadBool(SEC_STN, 'Qsk', Qsk);
CallsFromKeyer := ReadBool(SEC_STN, 'CallsFromKeyer', CallsFromKeyer);
GetWpmUsesGaussian := ReadBool(SEC_STN, 'GetWpmUsesGaussian', GetWpmUsesGaussian);
Expand Down Expand Up @@ -368,6 +370,7 @@ procedure ToIni;
WriteInteger(SEC_STN, 'Pitch', MainForm.ComboBox1.ItemIndex);
WriteInteger(SEC_STN, 'BandWidth', MainForm.ComboBox2.ItemIndex);
WriteInteger(SEC_STN, 'Wpm', Wpm);
WriteInteger(SEC_STN, 'WpmStepRate', WpmStepRate);
WriteBool(SEC_STN, 'Qsk', Qsk);

{
Expand Down
10 changes: 8 additions & 2 deletions Main.pas
View file
Open in desktop
Expand Up @@ -966,13 +966,19 @@ procedure TMainForm.Edit1Enter(Sender: TObject);

procedure TMainForm.IncSpeed;
begin
SetWpm(Trunc(Wpm / 5) * 5 + 5);
if RunMode = rmHST then
SetWpm(Trunc(Wpm / 5) * 5 + 5)
else
SetWpm(Wpm + Ini.WpmStepRate);
end;


procedure TMainForm.DecSpeed;
begin
SetWpm(Ceil(Wpm / 5) * 5 - 5);
if RunMode = rmHST then
SetWpm(Ceil(Wpm / 5) * 5 - 5)
else
SetWpm(Wpm - Ini.WpmStepRate);
end;


Expand Down
9 changes: 7 additions & 2 deletions Readme.txt
View file
Open in desktop
@@ -1,4 +1,4 @@
MORSE RUNNER
 MORSE RUNNER
Contest Simulator
freeware

Expand Down Expand Up @@ -158,7 +158,12 @@ KEY ASSIGNMENTS
Ctrl-Up/Ctrl-Down arrows - bandwidth;

PgUp/PgDn, Ctrl-F10/Ctrl-F9, Alt-F10/Alt-F9 - keying speed,
in 5 WPM increments.
in 2 WPM increments. HST Competition uses 5 WPM increments.
The default WPM Step rate is 2. Valid values range between 1 and 20.
You can override this value by changing the WpmStepRate entry in the
MorseRunner.ini file, e.g.:
[Station]
WpmStepRate=2

STATISTICS AREA
The bottom right panel shows your current score, both Raw (calculated
Expand Down