From 7911fd1d4bd04df0a1d9d737b4817653feca75b2 Mon Sep 17 00:00:00 2001 From: Michael Black W9MDB Date: Fri, 11 Dec 2020 16:38:02 -0600 Subject: [PATCH] Add power level to ft991 and fix ft1200 table https://github.com/Hamlib/Hamlib/issues/462 --- rigs/yaesu/ft1200.h | 13 +++++++------ rigs/yaesu/ft991.c | 1 + rigs/yaesu/ft991.h | 14 ++++++++++++++ 3 files changed, 22 insertions(+), 6 deletions(-) diff --git a/rigs/yaesu/ft1200.h b/rigs/yaesu/ft1200.h index 3b1a93892..535bee438 100644 --- a/rigs/yaesu/ft1200.h +++ b/rigs/yaesu/ft1200.h @@ -76,13 +76,14 @@ // Borrowed from FLRig -- Thanks to Dave W1HKJ #define FTDX1200_RFPOWER_METER_CAL \ { \ - 5, \ + 6, \ { \ - {35, 5.0f}, \ - {94, 25.0f}, \ - {147, 50.0f}, \ - {176, 75.0f}, \ - {205, 100.0f}, \ + {10, 0.8f}, \ + {50, 8.0f}, \ + {100, 26.0f}, \ + {150, 54.0f}, \ + {200, 92.0f}, \ + {250, 140.0f}, \ } \ } diff --git a/rigs/yaesu/ft991.c b/rigs/yaesu/ft991.c index 605681970..ecf672994 100644 --- a/rigs/yaesu/ft991.c +++ b/rigs/yaesu/ft991.c @@ -91,6 +91,7 @@ const struct rig_caps ft991_caps = .transceive = RIG_TRN_OFF, /* May enable later as the 950 has an Auto Info command */ .bank_qty = 0, .chan_desc_sz = 0, + .rfpower_meter_cal = FT991_RFPOWER_METER_CAL, .str_cal = FT991_STR_CAL, .chan_list = { { 1, 99, RIG_MTYPE_MEM, NEWCAT_MEM_CAP }, diff --git a/rigs/yaesu/ft991.h b/rigs/yaesu/ft991.h index 159aeeac0..97ee43be0 100644 --- a/rigs/yaesu/ft991.h +++ b/rigs/yaesu/ft991.h @@ -71,6 +71,20 @@ RIG_OP_UP|RIG_OP_DOWN|RIG_OP_BAND_UP|RIG_OP_BAND_DOWN|\ RIG_OP_TO_VFO|RIG_OP_FROM_VFO) +// Borrowed from FLRig -- Thanks to Dave W1HKJ +#define FT991_RFPOWER_METER_CAL \ + { \ + 6, \ + { \ + {10, 0.8f}, \ + {50, 8.0f}, \ + {100, 26.0f}, \ + {150, 54.0f}, \ + {200, 92.0f}, \ + {250, 140.0f}, \ + } \ + } + /* TBC */ #define FT991_STR_CAL { 16, \ { \