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

Implement STRENGTH calibrations for FTDX101D/MP

pull/608/head
Michael Black W9MDB 2021-03-08 10:42:41 -06:00
rodzic 29fa3b7093
commit ca9b043cbe
3 zmienionych plików z 61 dodań i 8 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

27
rigs/yaesu/ftdx101.c
Wyświetl plik

@ -37,6 +37,27 @@
#include "newcat.h"
#include "ftdx101.h"
#define FTDX101D_STR_CAL { 16, \
{ \
{ 0x00, -54 }, /* S0 */ \
{ 0x01, -48 }, \
{ 0x02, -42 }, \
{ 0x03, -36 }, \
{ 0x04, -30 }, \
{ 0x05, -24 }, \
{ 0x06, -18 }, \
{ 0x07, -12 }, \
{ 0x08, -6 }, \
{ 0x09, 0 }, /* S9 */ \
{ 0x0A, 10 }, /* +10 */ \
{ 0x0B, 20 }, /* +20 */ \
{ 0x0C, 30 }, /* +30 */ \
{ 0x0D, 40 }, /* +40 */ \
{ 0x0E, 50 }, /* +50 */ \
{ 0x0F, 60 } /* +60 */ \
} }
const struct newcat_priv_caps ftdx101d_priv_caps =
{
.roofing_filter_count = 6,
@ -76,7 +97,7 @@ const struct rig_caps ftdx101d_caps =
RIG_MODEL(RIG_MODEL_FTDX101D),
.model_name = "FTDX-101D",
.mfg_name = "Yaesu",
.version = NEWCAT_VER ".9",
.version = NEWCAT_VER ".10",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
@ -117,8 +138,10 @@ const struct rig_caps ftdx101d_caps =
.transceive = RIG_TRN_OFF, /* May enable later as the FTDX101 has an Auto Info command */
.bank_qty = 0,
.chan_desc_sz = 0,
.rfpower_meter_cal = FTDX101D_RFPOWER_METER_CAL,
.rfpower_meter_cal = FTDX101D_RFPOWER_METER_WATTS_CAL,
.str_cal = FTDX101D_RFPOWER_METER_CAL,
.swr_cal = FTDX101D_SWR_CAL,
.str_cal = FTDX101D_STR_CAL,
.chan_list = {
{ 1, 99, RIG_MTYPE_MEM, NEWCAT_MEM_CAP },
RIG_CHAN_END,

37
rigs/yaesu/ftdx101.h
Wyświetl plik

@ -71,14 +71,26 @@
RIG_OP_UP|RIG_OP_DOWN|RIG_OP_BAND_UP|RIG_OP_BAND_DOWN|\
RIG_OP_TO_VFO|RIG_OP_FROM_VFO|RIG_OP_TOGGLE)
// Borrowed from FLRig -- Thanks to Dave W1HKJ
#define FTDX101D_RFPOWER_METER_CAL \
{ \
6, \
{ \
{0, 0.0f}, \
{35, 5.0f}, \
{94, 25.0f}, \
{0, 0.0f}, \
{35, 0.5f}, \
{94, 0.25f}, \
{147, 0.50f}, \
{176, 0.75f}, \
{205, 1.0f}, \
} \
}
#define FTDX101D_RFPOWER_METER_WATTS_CAL \
{ \
6, \
{ \
{0, 0.0f}, \
{35, 5.0f}, \
{94, 25.0f}, \
{147, 50.0f}, \
{176, 75.0f}, \
{205, 100.0f}, \
@ -86,6 +98,23 @@
}
#define FTDX101MP_RFPOWER_METER_CAL \
{ \
11, \
{ \
{0, 0.0f}, \
{35, 0.25f}, \
{94, 0.125f}, \
{133, 0.25f}, \
{162, 0.375f}, \
{205, 0.5f}, \
{215, 0.6f}, \
{225, 0.7f}, \
{235, 0.8f}, \
{245, 0.9f}, \
{255, 1.0f}, \
} \
}
#define FTDX101MP_RFPOWER_METER_WATTS_CAL \
{ \
11, \
{ \

5
rigs/yaesu/ftdx101mp.c
Wyświetl plik

@ -77,7 +77,7 @@ const struct rig_caps ftdx101mp_caps =
RIG_MODEL(RIG_MODEL_FTDX101MP),
.model_name = "FTDX-101MP",
.mfg_name = "Yaesu",
.version = NEWCAT_VER ".0",
.version = NEWCAT_VER ".1",
.copyright = "LGPL",
.status = RIG_STATUS_STABLE,
.rig_type = RIG_TYPE_TRANSCEIVER,
@ -118,7 +118,8 @@ const struct rig_caps ftdx101mp_caps =
.transceive = RIG_TRN_OFF, /* May enable later as the FTDX101 has an Auto Info command */
.bank_qty = 0,
.chan_desc_sz = 0,
.rfpower_meter_cal = FTDX101MP_RFPOWER_METER_CAL,
.rfpower_meter_cal = FTDX101MP_RFPOWER_METER_WATTS_CAL,
.str_cal = FTDX101MP_RFPOWER_METER_CAL,
.swr_cal = FTDX101D_SWR_CAL,
.chan_list = {
{ 1, 99, RIG_MTYPE_MEM, NEWCAT_MEM_CAP },