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

Allow jupiter to do retries -- and also check freq after setting it 

https://github.com/Hamlib/Hamlib/issues/1607
pull/1612/head
Mike Black W9MDB 2024-09-13 07:23:09 -05:00
rodzic 711089f252
commit 99d008a664
1 zmienionych plików z 12 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

15
rigs/tentec/jupiter.c
Wyświetl plik

@ -128,7 +128,7 @@ struct rig_caps tt538_caps =
RIG_MODEL(RIG_MODEL_TT538), RIG_MODEL(RIG_MODEL_TT538),
.model_name = "TT-538 Jupiter", .model_name = "TT-538 Jupiter",
.mfg_name = "Ten-Tec", .mfg_name = "Ten-Tec",
.version = "20221205.0", .version = "20240913.0",
.copyright = "LGPL", .copyright = "LGPL",
.status = RIG_STATUS_STABLE, .status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER, .rig_type = RIG_TYPE_TRANSCEIVER,
@ -257,7 +257,7 @@ static int tt538_transaction(RIG *rig, const char *cmd, int cmd_len,
retval = tentec_transaction(rig, cmd, cmd_len, data, data_len); retval = tentec_transaction(rig, cmd, cmd_len, data, data_len);
if (retval == RIG_OK) if (data == NULL || (data != NULL && data_len > 0))
{ {
return retval; return retval;
} }
@ -444,6 +444,9 @@ int tt538_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
{ {
unsigned char bytes[4]; unsigned char bytes[4];
unsigned char cmdbuf[16]; unsigned char cmdbuf[16];
int retval=-RIG_EINTERNAL;
int retry = STATE(rig)->retry;
freq_t freqchk=0;
/* Freq is 4 bytes long, MSB sent first. */ /* Freq is 4 bytes long, MSB sent first. */
bytes[3] = ((unsigned int) freq >> 24) & 0xff; bytes[3] = ((unsigned int) freq >> 24) & 0xff;
@ -451,12 +454,18 @@ int tt538_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
bytes[1] = ((unsigned int) freq >> 8) & 0xff; bytes[1] = ((unsigned int) freq >> 8) & 0xff;
bytes[0] = ((unsigned int) freq) & 0xff; bytes[0] = ((unsigned int) freq) & 0xff;
do {
SNPRINTF((char *) cmdbuf, sizeof(cmdbuf), "*%c%c%c%c%c" EOM, SNPRINTF((char *) cmdbuf, sizeof(cmdbuf), "*%c%c%c%c%c" EOM,
which_vfo(rig, vfo), which_vfo(rig, vfo),
bytes[3], bytes[2], bytes[1], bytes[0]); bytes[3], bytes[2], bytes[1], bytes[0]);
return tt538_transaction(rig, (char *) cmdbuf, 6, NULL, retval = tt538_transaction(rig, (char *) cmdbuf, 6, NULL,
NULL); NULL);
if (retval != RIG_OK) continue;
retval = tt538_get_freq(rig, vfo, &freqchk);
if (retval != RIG_OK) return retval;
} while ( freq != freqchk && --retry >= 0);
return retval;
} }
/* /*