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

Add GET_TX_METER to FT897

pull/922/head
Mike Black W9MDB 2022-01-03 11:38:19 -06:00
rodzic 5b942259ac
commit 5a5902c7ed
1 zmienionych plików z 55 dodań i 3 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

58
rigs/yaesu/ft897.c
Wyświetl plik

@ -123,6 +123,7 @@ enum ft897_native_cmd_e
FT897_NATIVE_CAT_PWR_ON,
FT897_NATIVE_CAT_PWR_OFF,
FT897_NATIVE_CAT_EEPROM_READ,
FT897_NATIVE_CAT_GET_TX_METER,
FT897_NATIVE_SIZE /* end marker */
};
@ -139,6 +140,10 @@ struct ft897_priv_data
/* freq & mode status */
struct timeval fm_status_tv;
unsigned char fm_status[YAESU_CMD_LENGTH + 1];
/* tx meter status */
struct timeval tm_status_tv;
unsigned char tm_status[3];
};
@ -221,6 +226,7 @@ static const yaesu_cmd_set_t ncmd[] =
{ 1, { 0x00, 0x00, 0x00, 0x00, 0x0f } }, /* pwr on */
{ 1, { 0x00, 0x00, 0x00, 0x00, 0x8f } }, /* pwr off */
{ 0, { 0x00, 0x00, 0x00, 0x00, 0xbb } }, /* eeprom read */
{ 1, { 0x00, 0x00, 0x00, 0x00, 0xbd } }, /* tx meter status, i.e ALC, MOD, PWR, SWR */
};
enum ft897_digi
@ -250,7 +256,7 @@ const struct rig_caps ft897_caps =
RIG_MODEL(RIG_MODEL_FT897),
.model_name = "FT-897",
.mfg_name = "Yaesu",
.version = "20201215.0",
.version = "20210103.0",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
@ -269,7 +275,7 @@ const struct rig_caps ft897_caps =
.retry = 0,
.has_get_func = RIG_FUNC_NONE,
.has_set_func = RIG_FUNC_LOCK | RIG_FUNC_TONE | RIG_FUNC_TSQL,
.has_get_level = RIG_LEVEL_STRENGTH | RIG_LEVEL_RFPOWER | RIG_LEVEL_SWR | RIG_LEVEL_RAWSTR,
.has_get_level = RIG_LEVEL_STRENGTH | RIG_LEVEL_RFPOWER | RIG_LEVEL_SWR | RIG_LEVEL_RAWSTR | RIG_LEVEL_ALC,
.has_set_level = RIG_LEVEL_NONE,
.has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE,
@ -412,7 +418,7 @@ const struct rig_caps ft897d_caps =
.retry = 0,
.has_get_func = RIG_FUNC_NONE,
.has_set_func = RIG_FUNC_LOCK | RIG_FUNC_TONE | RIG_FUNC_TSQL,
.has_get_level = RIG_LEVEL_STRENGTH | RIG_LEVEL_RFPOWER | RIG_LEVEL_SWR | RIG_LEVEL_RAWSTR,
.has_get_level = RIG_LEVEL_STRENGTH | RIG_LEVEL_RFPOWER | RIG_LEVEL_SWR | RIG_LEVEL_RAWSTR | RIG_LEVEL_ALC,
.has_set_level = RIG_LEVEL_NONE,
.has_get_parm = RIG_PARM_NONE,
.has_set_parm = RIG_PARM_NONE,
@ -667,6 +673,13 @@ static int ft897_get_status(RIG *rig, int status)
tv = &p->tx_status_tv;
break;
case FT897_NATIVE_CAT_GET_TX_METER:
data = p->tm_status;
len = 2;
tv = &p->tm_status_tv;
break;
default:
rig_debug(RIG_DEBUG_ERR, "%s: internal error!\n", __func__);
return -RIG_EINTERNAL;
@ -929,6 +942,42 @@ static int ft897_get_rawstr_level(RIG *rig, value_t *val)
return RIG_OK;
}
static int ft897_get_alc_level(RIG *rig, value_t *val)
{
struct ft897_priv_data *p = (struct ft897_priv_data *) rig->state.priv;
rig_debug(RIG_DEBUG_VERBOSE, "%s: called\n", __func__);
/* have to check PTT first - only 1 byte (0xff) returned in RX
and two bytes returned in TX */
if ((p->tx_status & 0x80) == 0)
{
if (check_cache_timeout(&p->tm_status_tv))
{
int n;
if ((n = ft897_get_status(rig, FT897_NATIVE_CAT_GET_TX_METER)) < 0)
{
return n;
}
}
/* returns 2 bytes when in TX mode:
byte[0]: bits 7:4 --> power
byte[0]: bits 3:0 --> ALC
byte[1]: bits 7:4 --> SWR
byte[1]: bits 3:0 --> MOD */
val->f = p->tm_status[0] >> 4;
}
else
{
val->f = 0;
}
return RIG_OK;
}
int ft897_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
{
rig_debug(RIG_DEBUG_VERBOSE, "%s: called\n", __func__);
@ -947,6 +996,9 @@ int ft897_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val)
case RIG_LEVEL_SWR:
return ft897_get_swr_level(rig, val);
case RIG_LEVEL_ALC:
return ft897_get_alc_level(rig, val);
default:
return -RIG_EINVAL;
}