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

Add MEM VFO for new Yaesu rigs. Use FTDX101 SWR cal table that was left unused.

pull/426/head
Mikael Nousiainen 2020-10-24 10:55:11 +03:00
rodzic 1c34b044dd
commit 3a49428f58
8 zmienionych plików z 39 dodań i 60 usunięć
Pokaż statystyki Ściągnij plik aktualizacji Ściągnij plik porównania Expand all files Collapse all files

2
rigs/yaesu/ft1200.h
Wyświetl plik

@ -29,7 +29,7 @@
#ifndef _FT1200_H #ifndef _FT1200_H
#define _FT1200_H 1 #define _FT1200_H 1
#define FT1200_VFO_ALL (RIG_VFO_A|RIG_VFO_B) #define FT1200_VFO_ALL (RIG_VFO_A|RIG_VFO_B|RIG_VFO_MEM)
/* Receiver caps */ /* Receiver caps */

2
rigs/yaesu/ft5000.h
Wyświetl plik

@ -28,7 +28,7 @@
#ifndef _FT5000_H #ifndef _FT5000_H
#define _FT5000_H 1 #define _FT5000_H 1
#define FTDX5000_VFO_ALL (RIG_VFO_MAIN|RIG_VFO_SUB) #define FTDX5000_VFO_ALL (RIG_VFO_MAIN|RIG_VFO_SUB|RIG_VFO_MEM)
/* Receiver caps */ /* Receiver caps */

1
rigs/yaesu/ft891.c
Wyświetl plik

@ -98,7 +98,6 @@ const struct rig_caps ft891_caps =
.str_cal = FT891_STR_CAL, .str_cal = FT891_STR_CAL,
.chan_list = { .chan_list = {
{ 1, 99, RIG_MTYPE_MEM, NEWCAT_MEM_CAP }, { 1, 99, RIG_MTYPE_MEM, NEWCAT_MEM_CAP },
{ 100, 117, RIG_MTYPE_EDGE, NEWCAT_MEM_CAP }, /* two by two */
RIG_CHAN_END, RIG_CHAN_END,
}, },

2
rigs/yaesu/ft891.h
Wyświetl plik

@ -28,7 +28,7 @@
#ifndef _FT891_H #ifndef _FT891_H
#define _FT891_H 1 #define _FT891_H 1
#define FT891_VFO_ALL (RIG_VFO_A|RIG_VFO_B) #define FT891_VFO_ALL (RIG_VFO_A|RIG_VFO_B|RIG_VFO_MEM)
/* Receiver caps */ /* Receiver caps */

2
rigs/yaesu/ft991.h
Wyświetl plik

@ -28,7 +28,7 @@
#ifndef _FT991_H #ifndef _FT991_H
#define _FT991_H 1 #define _FT991_H 1
#define FT991_VFO_ALL (RIG_VFO_A|RIG_VFO_B) #define FT991_VFO_ALL (RIG_VFO_A|RIG_VFO_B|RIG_VFO_MEM)
/* Receiver caps */ /* Receiver caps */

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

@ -37,6 +37,8 @@
#include "newcat.h" #include "newcat.h"
#include "ftdx101.h" #include "ftdx101.h"
cal_table_float_t yaesu_ftdx101d_swr_cal = FTDX101D_SWR_CAL;
const struct rig_caps ftdx101d_caps = const struct rig_caps ftdx101d_caps =
{ {
RIG_MODEL(RIG_MODEL_FTDX101D), RIG_MODEL(RIG_MODEL_FTDX101D),
@ -81,10 +83,9 @@ const struct rig_caps ftdx101d_caps =
.transceive = RIG_TRN_OFF, /* May enable later as the FTDX101 has an Auto Info command */ .transceive = RIG_TRN_OFF, /* May enable later as the FTDX101 has an Auto Info command */
.bank_qty = 0, .bank_qty = 0,
.chan_desc_sz = 0, .chan_desc_sz = 0,
.str_cal = FTDX101_STR_CAL, .swr_cal = FTDX101D_SWR_CAL,
.chan_list = { .chan_list = {
{ 1, 99, RIG_MTYPE_MEM, NEWCAT_MEM_CAP }, { 1, 99, RIG_MTYPE_MEM, NEWCAT_MEM_CAP },
{ 100, 117, RIG_MTYPE_EDGE, NEWCAT_MEM_CAP }, /* two by two */
RIG_CHAN_END, RIG_CHAN_END,
}, },

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

@ -29,7 +29,7 @@
#ifndef _FTDX101_H #ifndef _FTDX101_H
#define _FTDX101_H 1 #define _FTDX101_H 1
#define FTDX101_VFO_ALL (RIG_VFO_MAIN|RIG_VFO_SUB) #define FTDX101_VFO_ALL (RIG_VFO_MAIN|RIG_VFO_SUB|RIG_VFO_MEM)
/* Receiver caps */ /* Receiver caps */
@ -71,26 +71,20 @@
RIG_OP_UP|RIG_OP_DOWN|RIG_OP_BAND_UP|RIG_OP_BAND_DOWN|\ 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) RIG_OP_TO_VFO|RIG_OP_FROM_VFO|RIG_OP_TOGGLE)
/* TBC */ #define FTDX101D_SWR_CAL \
#define FTDX101_STR_CAL { 16, \ { \
{ \ 8, \
{ 0, -54 }, /* S0 */ \ { \
{ 12, -48 }, /* S1 */ \ {0, 1.0f}, \
{ 27, -42 }, /* S2 */ \ {26, 1.2f}, \
{ 40, -36 }, /* S3 */ \ {52, 1.5f}, \
{ 55, -30 }, /* S4 */ \ {89, 2.0f}, \
{ 65, -24 }, /* S5 */ \ {126, 3.0f}, \
{ 80, -18 }, /* S6 */ \ {173, 4.0f}, \
{ 95, -12 }, /* S7 */ \ {236, 5.0f}, \
{ 112, -6 }, /* S8 */ \ {255, 25.0f}, \
{ 130, 0 }, /* S9 */ \ } \
{ 150, 10 }, /* +10 */ \ }
{ 172, 20 }, /* +20 */ \
{ 190, 30 }, /* +30 */ \
{ 220, 40 }, /* +40 */ \
{ 240, 50 }, /* +50 */ \
{ 255, 60 }, /* +60 */ \
} }
/* /*
* Other features (used by rig_caps) * Other features (used by rig_caps)

49
rigs/yaesu/newcat.c
Wyświetl plik

@ -130,12 +130,14 @@ const cal_table_t yaesu_default_str_cal =
} }
}; };
/**
* First cut at generic Yaesu table, need more points probably
* based on testing by Adam M7OTP on FT-991
*/
const cal_table_float_t yaesu_default_swr_cal = const cal_table_float_t yaesu_default_swr_cal =
{ {
5, 5,
{ {
// first cut at generic Yaesu table, need more points probably
// based on testing by Adam M7OTP on FT-991
{12, 1.0f}, {12, 1.0f},
{39, 1.35f}, {39, 1.35f},
{65, 1.5f}, {65, 1.5f},
@ -144,24 +146,7 @@ const cal_table_float_t yaesu_default_swr_cal =
} }
}; };
const cal_table_float_t yaesu_ftdx101d_swr_cal = // TODO: Provide sane defaults
{
8,
{
// first cut at generic Yaesu table, need more points probably
// based on testing by Adam M7OTP on FT-991
{0, 1.0f},
{26, 1.2f},
{52, 1.5f},
{89, 2.0f},
{126, 3.0f},
{173, 4.0f},
{236, 5.0f},
{255, 25.0f},
}
};
// TBC
const cal_table_float_t yaesu_default_alc_cal = const cal_table_float_t yaesu_default_alc_cal =
{ {
3, 3,
@ -172,7 +157,7 @@ const cal_table_float_t yaesu_default_alc_cal =
} }
}; };
// TBC // TODO: Provide sane defaults
const cal_table_float_t yaesu_default_comp_meter_cal = const cal_table_float_t yaesu_default_comp_meter_cal =
{ {
2, 2,
@ -182,7 +167,7 @@ const cal_table_float_t yaesu_default_comp_meter_cal =
} }
}; };
// TBC // TODO: Provide sane defaults
const cal_table_float_t yaesu_default_rfpower_meter_cal = const cal_table_float_t yaesu_default_rfpower_meter_cal =
{ {
2, 2,
@ -192,7 +177,7 @@ const cal_table_float_t yaesu_default_rfpower_meter_cal =
} }
}; };
// TBC // TODO: Provide sane defaults
const cal_table_float_t yaesu_default_vd_meter_cal = const cal_table_float_t yaesu_default_vd_meter_cal =
{ {
2, 2,
@ -202,7 +187,7 @@ const cal_table_float_t yaesu_default_vd_meter_cal =
} }
}; };
// TBC // TODO: Provide sane defaults
const cal_table_float_t yaesu_default_id_meter_cal = const cal_table_float_t yaesu_default_id_meter_cal =
{ {
2, 2,
@ -1711,13 +1696,13 @@ int newcat_set_rit(RIG *rig, vfo_t vfo, shortfreq_t rit)
} }
else if (rit < 0) else if (rit < 0)
{ {
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "RC%cRD%04ld%cRT1%c", cat_term, snprintf(priv->cmd_str, sizeof(priv->cmd_str), "RC%cRD%04ld%c", cat_term,
labs(rit), cat_term, cat_term); labs(rit), cat_term);
} }
else else
{ {
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "RC%cRU%04ld%cRT1%c", cat_term, snprintf(priv->cmd_str, sizeof(priv->cmd_str), "RC%cRU%04ld%c", cat_term,
labs(rit), cat_term, cat_term); labs(rit), cat_term);
} }
return newcat_set_cmd(rig); return newcat_set_cmd(rig);
@ -1806,13 +1791,13 @@ int newcat_set_xit(RIG *rig, vfo_t vfo, shortfreq_t xit)
} }
else if (xit < 0) else if (xit < 0)
{ {
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "RC%cRD%04ld%cXT1%c", cat_term, snprintf(priv->cmd_str, sizeof(priv->cmd_str), "RC%cRD%04ld%c", cat_term,
labs(xit), cat_term, cat_term); labs(xit), cat_term);
} }
else else
{ {
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "RC%cRU%04ld%cXT1%c", cat_term, snprintf(priv->cmd_str, sizeof(priv->cmd_str), "RC%cRU%04ld%c", cat_term,
labs(xit), cat_term, cat_term); labs(xit), cat_term);
} }
return newcat_set_cmd(rig); return newcat_set_cmd(rig);