mirror
/
Hamlib
kopia lustrzana https://github.com/Hamlib/Hamlib
1
0
Forkuj 0
Kod Zgłoszenia Projekty Wydania Wiki Aktywność

Move morse handler after rig_open

pull/1347/head
Mike Black W9MDB 2023-07-15 22:24:17 -05:00
rodzic 685f8c3862
commit 8cd135e2ce
1 zmienionych plików z 11 dodań i 9 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

20
src/rig.c
Wyświetl plik

@ -1326,15 +1326,6 @@ int HAMLIB_API rig_open(RIG *rig)
rs->comm_state);
hl_usleep(100 * 1000); // wait a bit after opening to give some serial ports time
status = morse_data_handler_start(rig);
if (status < 0)
{
rig_debug(RIG_DEBUG_ERR, "%s: cw_data_handler_start failed: %s\n", __func__, rigerror(status));
port_close(&rs->rigport, rs->rigport.type.rig);
RETURNFUNC2(status);
}
/*
* Maybe the backend has something to initialize
@ -1430,6 +1421,15 @@ int HAMLIB_API rig_open(RIG *rig)
}
}
status = morse_data_handler_start(rig);
if (status < 0)
{
rig_debug(RIG_DEBUG_ERR, "%s: cw_data_handler_start failed: %s\n", __func__, rigerror(status));
port_close(&rs->rigport, rs->rigport.type.rig);
RETURNFUNC2(status);
}
if (rs->auto_disable_screensaver)
{
// try to turn off the screensaver if possible
@ -6876,12 +6876,14 @@ int HAMLIB_API rig_send_morse(RIG *rig, vfo_t vfo, const char *msg)
if (msg[0]=='+')
{
keyspd.i += 5;
rig_debug(RIG_DEBUG_VERBOSE, "%s: change keyspd to %d\n", __func__, keyspd.i);
rig_set_level(rig, RIG_VFO_CURR, RIG_LEVEL_KEYSPD, keyspd);
return RIG_OK;
}
else if (msg[0]=='-')
{
keyspd.i -= 5;
rig_debug(RIG_DEBUG_VERBOSE, "%s: change keyspd to %d\n", __func__, keyspd.i);
rig_set_level(rig, RIG_VFO_CURR, RIG_LEVEL_KEYSPD, keyspd);
return RIG_OK;
}