Merge pull request #1003 from PianetaRadio/master

FT857 implement RIT on/off function
pull/1007/head
Michael Black 2022-04-04 13:02:41 -05:00 zatwierdzone przez GitHub
commit 467d0fd716
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
1 zmienionych plików z 15 dodań i 6 usunięć

Wyświetl plik

@ -33,9 +33,6 @@
/*
* Unimplemented features supported by the FT-857:
*
* - RIT ON/OFF without touching the RIT offset. This would
* need frontend support (eg. a new RIG_FUNC_xxx)
*
* - DCS encoder/squelch ON/OFF, similar to RIG_FUNC_TONE/TSQL.
* Needs frontend support.
*
@ -251,7 +248,7 @@ const struct rig_caps ft857_caps =
RIG_MODEL(RIG_MODEL_FT857),
.model_name = "FT-857",
.mfg_name = "Yaesu",
.version = "20210330.0",
.version = "20220404.0",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
@ -269,7 +266,7 @@ const struct rig_caps ft857_caps =
.timeout = FT857_TIMEOUT,
.retry = 0,
.has_get_func = RIG_FUNC_NONE,
.has_set_func = RIG_FUNC_LOCK | RIG_FUNC_TONE | RIG_FUNC_TSQL,
.has_set_func = RIG_FUNC_LOCK | RIG_FUNC_TONE | RIG_FUNC_TSQL | RIG_FUNC_RIT,
.has_get_level = RIG_LEVEL_STRENGTH | RIG_LEVEL_RFPOWER,
.has_set_level = RIG_LEVEL_BAND_SELECT,
.has_get_parm = RIG_PARM_NONE,
@ -1151,6 +1148,16 @@ int ft857_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
{
return ft857_send_cmd(rig, FT857_NATIVE_CAT_SET_CTCSS_DCS_OFF);
}
case RIG_FUNC_RIT:
if (status)
{
return ft857_send_cmd(rig, FT857_NATIVE_CAT_CLAR_ON);
}
else
{
return ft857_send_cmd(rig, FT857_NATIVE_CAT_CLAR_OFF);
}
#if 0
@ -1340,6 +1347,8 @@ int ft857_set_rit(RIG *rig, vfo_t vfo, shortfreq_t rit)
}
/* the rig rejects if these are repeated - don't confuse user with retcode */
/* not used anymore, RIG_FUNC_RIT implemented
if (rit == 0)
{
ft857_send_cmd(rig, FT857_NATIVE_CAT_CLAR_OFF);
@ -1347,7 +1356,7 @@ int ft857_set_rit(RIG *rig, vfo_t vfo, shortfreq_t rit)
else
{
ft857_send_cmd(rig, FT857_NATIVE_CAT_CLAR_ON);
}
}*/
return RIG_OK;
}