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

Implement RIT on/off function

pull/1001/head
PianetaRadio 2022-04-03 01:08:45 +02:00 zatwierdzone przez GitHub
rodzic 7671229529
commit d2dfa10d89
Nie znaleziono w bazie danych klucza dla tego podpisu
ID klucza GPG: 4AEE18F83AFDEB23
1 zmienionych plików z 15 dodań i 6 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

21
rigs/yaesu/ft817.c
Wyświetl plik

@ -31,9 +31,6 @@
/* /*
* Unimplemented features supported by the FT-817: * Unimplemented features supported by the FT-817:
* *
* - RIT ON/OFF without touching the RIT offset. This would
* need frontend support (eg. a new RIG_FUNC_xxx)
*
* - RX status command returns info that is not used: * - RX status command returns info that is not used:
* - discriminator centered (yes/no flag) * - discriminator centered (yes/no flag)
* - received ctcss/dcs matched (yes/no flag) TBC * - received ctcss/dcs matched (yes/no flag) TBC
@ -316,7 +313,7 @@ const struct rig_caps ft817_caps =
.timeout = FT817_TIMEOUT, .timeout = FT817_TIMEOUT,
.retry = 5, .retry = 5,
.has_get_func = RIG_FUNC_NONE, .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 = .has_get_level =
RIG_LEVEL_STRENGTH | RIG_LEVEL_RAWSTR | RIG_LEVEL_RFPOWER | RIG_LEVEL_STRENGTH | RIG_LEVEL_RAWSTR | RIG_LEVEL_RFPOWER |
RIG_LEVEL_ALC | RIG_LEVEL_SWR, RIG_LEVEL_ALC | RIG_LEVEL_SWR,
@ -463,7 +460,7 @@ const struct rig_caps ft818_caps =
.timeout = FT817_TIMEOUT, .timeout = FT817_TIMEOUT,
.retry = 5, .retry = 5,
.has_get_func = RIG_FUNC_NONE, .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 = .has_get_level =
RIG_LEVEL_STRENGTH | RIG_LEVEL_RAWSTR | RIG_LEVEL_RFPOWER | RIG_LEVEL_STRENGTH | RIG_LEVEL_RAWSTR | RIG_LEVEL_RFPOWER |
RIG_LEVEL_ALC | RIG_LEVEL_SWR, RIG_LEVEL_ALC | RIG_LEVEL_SWR,
@ -1615,6 +1612,16 @@ static int ft817_set_func(RIG *rig, vfo_t vfo, setting_t func, int status)
return ft817_send_cmd(rig, FT817_NATIVE_CAT_SET_CTCSS_DCS_OFF); return ft817_send_cmd(rig, FT817_NATIVE_CAT_SET_CTCSS_DCS_OFF);
} }
case RIG_FUNC_RIT:
if (status)
{
return ft817_send_cmd(rig, FT817_NATIVE_CAT_CLAR_ON);
}
else
{
return ft817_send_cmd(rig, FT817_NATIVE_CAT_CLAR_OFF);
}
default: default:
return -RIG_EINVAL; return -RIG_EINVAL;
} }
@ -1775,6 +1782,8 @@ static int ft817_set_rit(RIG *rig, vfo_t vfo, shortfreq_t rit)
} }
/* the rig rejects if these are repeated - don't confuse user with retcode */ /* the rig rejects if these are repeated - don't confuse user with retcode */
/* not used anymore, RIG_FUNC_RIT implemented
if (rit == 0) if (rit == 0)
{ {
ft817_send_cmd(rig, FT817_NATIVE_CAT_CLAR_OFF); ft817_send_cmd(rig, FT817_NATIVE_CAT_CLAR_OFF);
@ -1782,7 +1791,7 @@ static int ft817_set_rit(RIG *rig, vfo_t vfo, shortfreq_t rit)
else else
{ {
ft817_send_cmd(rig, FT817_NATIVE_CAT_CLAR_ON); ft817_send_cmd(rig, FT817_NATIVE_CAT_CLAR_ON);
} } */
return RIG_OK; return RIG_OK;
} }