Skip to content

Fix problems when HAMLIB_KEYER is set, but rig control is disabled #494

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

Merged
merged 1 commit into from
Nov 26, 2025
Merged

Fix problems when HAMLIB_KEYER is set, but rig control is disabled #494

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 15 additions & 2 deletions src/hamlib_keyer.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,14 @@
#include "hamlib_keyer.h"

int hamlib_keyer_set_speed(int *cwspeed) {
gran_t keyspd_gran = my_rig->caps->level_gran[rig_setting2idx(
RIG_LEVEL_KEYSPD)];
gran_t keyspd_gran;
value_t spd;

if (! trx_control)
return RIG_OK;

keyspd_gran = my_rig->caps->level_gran[rig_setting2idx(RIG_LEVEL_KEYSPD)];

/* if rig declared min/max speed, honor it. */
if (keyspd_gran.min.i > 0 && *cwspeed < keyspd_gran.min.i)
*cwspeed = keyspd_gran.min.i;
Expand All @@ -46,6 +50,9 @@ int hamlib_keyer_set_speed(int *cwspeed) {
int hamlib_keyer_get_speed(int *cwspeed) {
value_t value;

if (! trx_control)
return RIG_OK;

assert(cwspeed != NULL);

pthread_mutex_lock(&tlf_rig_mutex);
Expand All @@ -58,6 +65,9 @@ int hamlib_keyer_get_speed(int *cwspeed) {
}

int hamlib_keyer_send(char *cwmessage) {
if (! trx_control)
return RIG_OK;

pthread_mutex_lock(&tlf_rig_mutex);
int ret = rig_send_morse(my_rig, RIG_VFO_CURR, cwmessage);
pthread_mutex_unlock(&tlf_rig_mutex);
Expand All @@ -66,6 +76,9 @@ int hamlib_keyer_send(char *cwmessage) {
}

int hamlib_keyer_stop() {
if (! trx_control)
return RIG_OK;

#if HAMLIB_VERSION >= 400
if (rig_has_stop_morse()) {
pthread_mutex_lock(&tlf_rig_mutex);
Expand Down
2 changes: 1 addition & 1 deletion src/main.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -951,7 +951,7 @@ static void keyer_init() {
showmsg("CW-Keyer is Hamlib");
if (trx_control_disabled) {
showmsg("Radio control disabled - no keying!");
sleep(2);
sleep(1);
return;
}
if (!trx_control) {
Expand Down