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

OmniVII fix several places where command lengths were incorrect

pull/1073/head
Mike Black W9MDB 2022-06-18 12:57:34 -05:00
rodzic afabcfffa5
commit 521d3f6ac3
1 zmienionych plików z 10 dodań i 12 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

22
rigs/tentec/omnivii.c
Wyświetl plik

@ -127,7 +127,7 @@ const struct rig_caps tt588_caps =
RIG_MODEL(RIG_MODEL_TT588), RIG_MODEL(RIG_MODEL_TT588),
.model_name = "TT-588 Omni VII", .model_name = "TT-588 Omni VII",
.mfg_name = "Ten-Tec", .mfg_name = "Ten-Tec",
.version = "20220617.0", .version = "20220618.0",
.copyright = "LGPL", .copyright = "LGPL",
.status = RIG_STATUS_STABLE, .status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER, .rig_type = RIG_TYPE_TRANSCEIVER,
@ -550,7 +550,7 @@ int tt588_set_freq(RIG *rig, vfo_t vfo, freq_t freq)
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 tt588_transaction(rig, (char *) cmdbuf, strlen((char *)cmdbuf), NULL, return tt588_transaction(rig, (char *) cmdbuf, 7, NULL,
NULL); NULL);
} }
@ -881,7 +881,7 @@ int tt588_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
return -RIG_EINVAL; return -RIG_EINVAL;
} }
retval = tt588_transaction(rig, (char *) cmdbuf, strlen((char *)cmdbuf), NULL, retval = tt588_transaction(rig, (char *) cmdbuf, 4, NULL,
NULL); NULL);
if (retval != RIG_OK) if (retval != RIG_OK)
@ -899,7 +899,7 @@ int tt588_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)
width = tt588_filter_number((int) width); width = tt588_filter_number((int) width);
SNPRINTF((char *) cmdbuf, sizeof(cmdbuf), "*W%c" EOM, (unsigned char) width); SNPRINTF((char *) cmdbuf, sizeof(cmdbuf), "*W%c" EOM, (unsigned char) width);
return tt588_transaction(rig, (char *) cmdbuf, strlen((char *)cmdbuf), NULL, return tt588_transaction(rig, (char *) cmdbuf, 4, NULL,
NULL); NULL);
} }
@ -1202,8 +1202,7 @@ int tt588_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
/* Volume */ /* Volume */
SNPRINTF((char *) cmdbuf, sizeof(cmdbuf), "*U%c" EOM, (char)(val.f * 127)); SNPRINTF((char *) cmdbuf, sizeof(cmdbuf), "*U%c" EOM, (char)(val.f * 127));
retval = tt588_transaction(rig, (char *) cmdbuf, strlen((char *)cmdbuf), NULL, retval = tt588_transaction(rig, (char *) cmdbuf, 3, NULL, NULL);
NULL);
if (retval != RIG_OK) if (retval != RIG_OK)
{ {
@ -1217,8 +1216,7 @@ int tt588_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
/* RF gain. Omni-VII expects value 0 for full gain, and 127 for lowest gain */ /* RF gain. Omni-VII expects value 0 for full gain, and 127 for lowest gain */
SNPRINTF((char *) cmdbuf, sizeof(cmdbuf), "*I%c" EOM, SNPRINTF((char *) cmdbuf, sizeof(cmdbuf), "*I%c" EOM,
127 - (char)(val.f * 127)); 127 - (char)(val.f * 127));
retval = tt588_transaction(rig, (char *) cmdbuf, strlen((char *)cmdbuf), NULL, retval = tt588_transaction(rig, (char *) cmdbuf, 3, NULL, NULL);
NULL);
if (retval != RIG_OK) if (retval != RIG_OK)
{ {
@ -1264,7 +1262,7 @@ int tt588_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
} }
SNPRINTF((char *) cmdbuf, sizeof(cmdbuf), "*J%c" EOM, ii + '0'); SNPRINTF((char *) cmdbuf, sizeof(cmdbuf), "*J%c" EOM, ii + '0');
retval = tt588_transaction(rig, (char *) cmdbuf, strlen((char *)cmdbuf), NULL, retval = tt588_transaction(rig, (char *) cmdbuf, 4, NULL,
NULL); NULL);
if (retval != RIG_OK) if (retval != RIG_OK)
@ -1277,7 +1275,7 @@ int tt588_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val)
case RIG_LEVEL_SQL: case RIG_LEVEL_SQL:
/* Squelch level, float 0.0 - 1.0 */ /* Squelch level, float 0.0 - 1.0 */
SNPRINTF((char *) cmdbuf, sizeof(cmdbuf), "*H%c" EOM, (int)(val.f * 127)); SNPRINTF((char *) cmdbuf, sizeof(cmdbuf), "*H%c" EOM, (int)(val.f * 127));
retval = tt588_transaction(rig, (char *) cmdbuf, strlen((char *)cmdbuf), NULL, retval = tt588_transaction(rig, (char *) cmdbuf, 3, NULL,
NULL); NULL);
if (retval != RIG_OK) if (retval != RIG_OK)
@ -1332,7 +1330,7 @@ int tt588_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo)
} }
resp_len = 3; resp_len = 3;
retval = tt588_transaction(rig, cmdbuf, strlen(cmdbuf), respbuf, &resp_len); retval = tt588_transaction(rig, cmdbuf, 4, respbuf, &resp_len);
if (retval != RIG_OK) if (retval != RIG_OK)
{ {
@ -1542,7 +1540,7 @@ static int set_rit_xit(RIG *rig, vfo_t vfo, shortfreq_t rit, int which)
cmdbuf[2] = which; // set xit bit. 0=off,1=rit, 2=xit, 3=both cmdbuf[2] = which; // set xit bit. 0=off,1=rit, 2=xit, 3=both
cmdbuf[3] = rit >> 8; cmdbuf[3] = rit >> 8;
cmdbuf[4] = rit & 0xff; cmdbuf[4] = rit & 0xff;
retval = tt588_transaction(rig, cmdbuf, strlen(cmdbuf), NULL, retval = tt588_transaction(rig, cmdbuf, 6, NULL,
0); // no response 0); // no response
if (retval != RIG_OK) if (retval != RIG_OK)