diff --git a/include/hamlib/riglist.h b/include/hamlib/riglist.h index c424e3a34..6161bc05a 100644 --- a/include/hamlib/riglist.h +++ b/include/hamlib/riglist.h @@ -120,6 +120,7 @@ #define RIG_MODEL_FT818 RIG_MAKE_MODEL(RIG_YAESU, 41) #define RIG_MODEL_FTDX10 RIG_MAKE_MODEL(RIG_YAESU, 42) #define RIG_MODEL_FT897D RIG_MAKE_MODEL(RIG_YAESU, 43) +#define RIG_MODEL_FTDX101MP RIG_MAKE_MODEL(RIG_YAESU, 44) /* diff --git a/rigs/yaesu/Makefile.am b/rigs/yaesu/Makefile.am index e175f82c2..ad71aec06 100644 --- a/rigs/yaesu/Makefile.am +++ b/rigs/yaesu/Makefile.am @@ -11,7 +11,7 @@ YAESUSRC = ft100.c ft100.h ft747.c ft747.h ft817.c ft817.h ft847.c ft847.h \ ## Yaesu radios that use the new Kenwood style CAT commands NEWCATSRC = newcat.c newcat.h ft450.c ft450.h ft950.c ft950.h ft991.c ft991.h \ ft2000.c ft2000.h ft9000.c ft9000.h ft5000.c ft5000.h ft1200.c ft1200.h \ - ft891.c ft891.h ftdx101.c ftdx101.h ft3000.c ftdx10.c + ft891.c ft891.h ftdx101.c ftdx101.h ftdx101mp.c ft3000.c ftdx10.c noinst_LTLIBRARIES = libhamlib-yaesu.la libhamlib_yaesu_la_SOURCES = $(YAESUSRC) $(NEWCATSRC) yaesu.c yaesu.h diff --git a/rigs/yaesu/ftdx101.c b/rigs/yaesu/ftdx101.c index 3bb1eeaf2..bd024809a 100644 --- a/rigs/yaesu/ftdx101.c +++ b/rigs/yaesu/ftdx101.c @@ -131,10 +131,10 @@ const struct rig_caps ftdx101d_caps = }, .tx_range_list1 = { /* the 101DX is 100W and the MP is 200W */ - FRQ_RNG_HF(1, FTDX101_OTHER_TX_MODES, W(5), W(200), FTDX101_VFO_ALL, FTDX101_TX_ANTS), - FRQ_RNG_HF(1, FTDX101_AM_TX_MODES, W(2), W(75), FTDX101_VFO_ALL, FTDX101_TX_ANTS), /* AM class */ - FRQ_RNG_6m(1, FTDX101_OTHER_TX_MODES, W(5), W(200), FTDX101_VFO_ALL, FTDX101_TX_ANTS), - FRQ_RNG_6m(1, FTDX101_AM_TX_MODES, W(2), W(75), FTDX101_VFO_ALL, FTDX101_TX_ANTS), /* AM class */ + FRQ_RNG_HF(1, FTDX101_OTHER_TX_MODES, W(5), W(100), FTDX101_VFO_ALL, FTDX101_TX_ANTS), + FRQ_RNG_HF(1, FTDX101_AM_TX_MODES, W(5), W(25), FTDX101_VFO_ALL, FTDX101_TX_ANTS), /* AM class */ + FRQ_RNG_6m(1, FTDX101_OTHER_TX_MODES, W(5), W(100), FTDX101_VFO_ALL, FTDX101_TX_ANTS), + FRQ_RNG_6m(1, FTDX101_AM_TX_MODES, W(5), W(25), FTDX101_VFO_ALL, FTDX101_TX_ANTS), /* AM class */ RIG_FRNG_END, }, @@ -145,12 +145,12 @@ const struct rig_caps ftdx101d_caps = }, .tx_range_list2 = { - FRQ_RNG_HF(2, FTDX101_OTHER_TX_MODES, W(5), W(200), FTDX101_VFO_ALL, FTDX101_TX_ANTS), - FRQ_RNG_HF(2, FTDX101_AM_TX_MODES, W(2), W(75), FTDX101_VFO_ALL, FTDX101_TX_ANTS), /* AM class */ - FRQ_RNG_6m(2, FTDX101_OTHER_TX_MODES, W(5), W(200), FTDX101_VFO_ALL, FTDX101_TX_ANTS), - FRQ_RNG_6m(2, FTDX101_AM_TX_MODES, W(2), W(75), FTDX101_VFO_ALL, FTDX101_TX_ANTS), /* AM class */ - FRQ_RNG_4m_REGION2(FTDX101_OTHER_TX_MODES, W(5), W(200), FTDX101_VFO_ALL, FTDX101_TX_ANTS), - FRQ_RNG_4m_REGION2(FTDX101_AM_TX_MODES, W(2), W(75), FTDX101_VFO_ALL, FTDX101_TX_ANTS), /* AM class */ + FRQ_RNG_HF(2, FTDX101_OTHER_TX_MODES, W(5), W(100), FTDX101_VFO_ALL, FTDX101_TX_ANTS), + FRQ_RNG_HF(2, FTDX101_AM_TX_MODES, W(5), W(25), FTDX101_VFO_ALL, FTDX101_TX_ANTS), /* AM class */ + FRQ_RNG_6m(2, FTDX101_OTHER_TX_MODES, W(5), W(100), FTDX101_VFO_ALL, FTDX101_TX_ANTS), + FRQ_RNG_6m(2, FTDX101_AM_TX_MODES, W(5), W(25), FTDX101_VFO_ALL, FTDX101_TX_ANTS), /* AM class */ + FRQ_RNG_4m_REGION2(FTDX101_OTHER_TX_MODES, W(5), W(100), FTDX101_VFO_ALL, FTDX101_TX_ANTS), + FRQ_RNG_4m_REGION2(FTDX101_AM_TX_MODES, W(5), W(25), FTDX101_VFO_ALL, FTDX101_TX_ANTS), /* AM class */ RIG_FRNG_END, }, diff --git a/rigs/yaesu/ftdx101.h b/rigs/yaesu/ftdx101.h index c13d2d039..14c170bed 100644 --- a/rigs/yaesu/ftdx101.h +++ b/rigs/yaesu/ftdx101.h @@ -85,6 +85,24 @@ } \ } +#define FTDX101MP_RFPOWER_METER_CAL \ + { \ + 11, \ + { \ + {0, 0.0f}, \ + {35, 5.0f}, \ + {94, 25.0f}, \ + {133, 50.0f}, \ + {162, 75.0f}, \ + {205, 100.0f}, \ + {215, 120.0f}, \ + {225, 140.0f}, \ + {235, 160.0f}, \ + {245, 180.0f}, \ + {255, 200.0f}, \ + } \ + } + // Based on testing with G3VPX Ian Sumner #define FTDX101D_SWR_CAL \ { \ diff --git a/rigs/yaesu/yaesu.c b/rigs/yaesu/yaesu.c index c421f430e..09296e001 100644 --- a/rigs/yaesu/yaesu.c +++ b/rigs/yaesu/yaesu.c @@ -115,6 +115,7 @@ DECLARE_INITRIG_BACKEND(yaesu) rig_register(&ft818_caps); rig_register(&ftdx10_caps); rig_register(&ft897d_caps); + rig_register(&ftdx101mp_caps); return RIG_OK; } diff --git a/rigs/yaesu/yaesu.h b/rigs/yaesu/yaesu.h index 2392d6dd7..7fe45a72e 100644 --- a/rigs/yaesu/yaesu.h +++ b/rigs/yaesu/yaesu.h @@ -84,5 +84,6 @@ extern const struct rig_caps ft847uni_caps; extern const struct rig_caps ftdx101d_caps; extern const struct rig_caps ft818_caps; extern const struct rig_caps ftdx10_caps; +extern const struct rig_caps ftdx101mp_caps; #endif /* _YAESU_H */