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.

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

Resend macros #361

Merged
merged 28 commits into from
Nov 14, 2022
Merged

Resend macros #361

merged 28 commits into from
Nov 14, 2022

Conversation

VictorDenisov
Copy link
Contributor

This is another approach to solving this problem: #332.
Compared to #360 this PR minimally touches existing code.
It's easier to prove that this code doesn't break any existing behavior.
We can make new behavior configurable if you are not certain whether it can suit everyone.

@VictorDenisov VictorDenisov mentioned this pull request Nov 8, 2022
src/sendbuf.c Outdated Show resolved Hide resolved
src/sendbuf.c Outdated Show resolved Hide resolved
src/getexchange.c Outdated Show resolved Hide resolved
src/sendbuf.c Outdated Show resolved Hide resolved
@zcsahok
Copy link
Member

zcsahok commented Nov 9, 2022

Re-sent serial has one leading zero less:
image

src/sendbuf.h Outdated Show resolved Hide resolved
src/keyer.c Show resolved Hide resolved
src/sendbuf.c Outdated Show resolved Hide resolved
@zcsahok
Copy link
Member

zcsahok commented Nov 11, 2022

Re-sent serial looks OK now.

@VictorDenisov
Copy link
Contributor Author

I think I addressed all comments.

@zcsahok
Copy link
Member

zcsahok commented Nov 12, 2022

Thanks, will make a final test tomorrow.

Two minor points:
Please check the man page if it needs an update.
Apply source formatting to the changed files: we use astyle with the setting in tools/astylerc

sendbuf.c has a merge conflict now due to #358, but I can merge it manually, no problem.

src/callinput.c Outdated Show resolved Hide resolved
@zcsahok
Copy link
Member

zcsahok commented Nov 13, 2022

Just for the record, there are two minor issues related to the re-send functionality in general.
For normal contest operation these are not really relevant, but nevertheless shall be fixed to have a consistent behavior.

  • an eventual correction of RST of the previous QSO is not honored: the value
    of last_rst global is sent instead of the actual one from the last QSO.

  • confirm call (=) does not respect correction of call. Same story as above:
    global lastcall is used instead of a QSO field. In addition, its value
    is initially empty so after start-up last call can't be confirmed.

Both globals have to be dropped and this will require a separate PR.

@VictorDenisov
Copy link
Contributor Author

I didn't quite understand the comment about confirm call. But I fixed rst field.

@zcsahok
Copy link
Member

zcsahok commented Nov 14, 2022

Thanks for the RST fix! Please also remove the global variable last_rst as it is now written only.

S&P works now OK.

For confirming call I meant the message sent on pressing =. It is useful for CQ mode only and shall send the previous call. But let's check this separately.

@zcsahok
Copy link
Member

zcsahok commented Nov 14, 2022

Thanks!

Merged in master to resolve the merge conflict.

@zcsahok zcsahok merged commit 1ecb3b9 into Tlf:master Nov 14, 2022
@zcsahok zcsahok linked an issue Nov 14, 2022 that may be closed by this pull request
@VictorDenisov VictorDenisov deleted the resend_macros branch November 15, 2022 01:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Re-send exchange should respect contest specific settings
2 participants