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

Fix FT1000MP set_rit -- helps if one reads the manual 

https://github.com/Hamlib/Hamlib/issues/353
pull/356/head
Michael Black W9MDB 2020-07-27 12:54:37 -05:00
rodzic 6dbbe4a8ff
commit 9d64f642ce
1 zmienionych plików z 4 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

10
rigs/yaesu/ft1000mp.c
Wyświetl plik

@ -216,7 +216,7 @@ const struct rig_caps ft1000mp_caps =
RIG_MODEL(RIG_MODEL_FT1000MP), RIG_MODEL(RIG_MODEL_FT1000MP),
.model_name = "FT-1000MP", .model_name = "FT-1000MP",
.mfg_name = "Yaesu", .mfg_name = "Yaesu",
.version = "20200716.0", .version = "20200727.0",
.copyright = "LGPL", .copyright = "LGPL",
.status = RIG_STATUS_STABLE, .status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER, .rig_type = RIG_TYPE_TRANSCEIVER,
@ -1170,10 +1170,8 @@ int ft1000mp_set_rit(RIG *rig, vfo_t vfo, shortfreq_t rit)
*/ */
memcpy(&priv->p_cmd, &ncmd[FT1000MP_NATIVE_RIT_ON].nseq, YAESU_CMD_LENGTH); memcpy(&priv->p_cmd, &ncmd[FT1000MP_NATIVE_RIT_ON].nseq, YAESU_CMD_LENGTH);
// scaled 2's complement to_bcd(priv->p_cmd, labs(rit) / 10, 4); /* store bcd format in in p_cmd */
rit = ((~(rit*16/10))&0xffff)+1; priv->p_cmd[2] = rit >= 0 ? 0x00 : 0xff;
priv->p_cmd[0] = rit>>8;
priv->p_cmd[1] = rit&0xff;
cmd = priv->p_cmd; /* get native sequence */ cmd = priv->p_cmd; /* get native sequence */
write_block(&rs->rigport, (char *) cmd, YAESU_CMD_LENGTH); write_block(&rs->rigport, (char *) cmd, YAESU_CMD_LENGTH);
@ -1238,7 +1236,7 @@ int ft1000mp_get_rit(RIG *rig, vfo_t vfo, shortfreq_t *rit)
if (p[0] & 0x80) if (p[0] & 0x80)
{ {
f = ~(f - 1) & 0x7fff; // two's complement f = (~(f - 1) & 0x7fff) * -1; // two's complement
} }
f = f * 10 / 16; f = f * 10 / 16;