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

Move K3 DT0 before mode switch, add version info to electraft rig open, WSJT-X VOX rig split now works

Hamlib-3.1
Michael Black 2016-11-19 10:38:54 -06:00
rodzic 41f120dc35
commit 1e462e10e0
2 zmienionych plików z 14 dodań i 11 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
kenwood/elecraft.c
Wyświetl plik

@ -87,7 +87,7 @@ int elecraft_get_firmware_revision_level(RIG *rig, const char *cmd, char *fw_rev
int elecraft_open(RIG *rig)
{
rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
rig_debug(RIG_DEBUG_VERBOSE, "%s called, rig version=%s\n", __func__,rig->version);
if (!rig)
return -RIG_EINVAL;

23
kenwood/k3.c
Wyświetl plik

@ -93,7 +93,7 @@ const struct rig_caps k3_caps = {
.rig_model = RIG_MODEL_K3,
.model_name = "K3/KX3",
.mfg_name = "Elecraft",
.version = "20130118",
.version = "20161116",
.copyright = "LGPL",
.status = RIG_STATUS_BETA,
.rig_type = RIG_TYPE_TRANSCEIVER,
@ -625,6 +625,18 @@ int k3_set_split_mode(RIG * rig, vfo_t vfo, rmode_t tx_mode, pbwidth_t tx_width)
break;
}
#if 0
/* Set data sub-mode. K3 needs to be in a DATA mode before setting
* the sub-mode or switching to VFOB so we do this before the MD$ command.
*/
if (tx_mode == RIG_MODE_PKTLSB || tx_mode == RIG_MODE_PKTUSB
|| tx_mode == RIG_MODE_RTTY || tx_mode == RIG_MODE_RTTYR) {
err = kenwood_transaction(rig, cmd_m, NULL, 0);
if (err != RIG_OK)
return err;
}
#endif
struct kenwood_priv_caps *caps = kenwood_caps(rig);
char buf[6];
char kmode;
@ -672,15 +684,6 @@ int k3_set_split_mode(RIG * rig, vfo_t vfo, rmode_t tx_mode, pbwidth_t tx_width)
return err;
}
/* Now set data sub-mode. K3 needs to be in a DATA mode before setting
* the sub-mode.
*/
if (tx_mode == RIG_MODE_PKTLSB || tx_mode == RIG_MODE_PKTUSB
|| tx_mode == RIG_MODE_RTTY || tx_mode == RIG_MODE_RTTYR) {
err = kenwood_transaction(rig, cmd_m, NULL, 0);
if (err != RIG_OK)
return err;
}
return RIG_OK;
}