From d3e191101f3603cc534549cfa4dd952d118a9e35 Mon Sep 17 00:00:00 2001 From: Mike Black W9MDB Date: Fri, 9 Aug 2024 11:43:28 -0500 Subject: [PATCH] Revert "Merge pull request #1592 from chrbayer84/cbayer-857-pwr-levels-cal" This reverts commit 15dc3ae8be03814b708b744f4df19415918a90d3, reversing changes made to 3b1283496cdb89d3d43d0354216e8dfa0a8b8d00. --- rigs/yaesu/ft857.c | 40 ++++++---------------------------------- 1 file changed, 6 insertions(+), 34 deletions(-) diff --git a/rigs/yaesu/ft857.c b/rigs/yaesu/ft857.c index 1f1471ae4..8456e4811 100644 --- a/rigs/yaesu/ft857.c +++ b/rigs/yaesu/ft857.c @@ -225,19 +225,6 @@ enum ft857_digi FT857_DIGI_USER_U, }; -#define FT857_PWR_CAL { 9, \ - { \ - { 0x00, 0.0f }, \ - { 0x01, 10.0f }, \ - { 0x02, 15.0f }, \ - { 0x03, 20.0f }, \ - { 0x04, 34.0f }, \ - { 0x05, 50.0f }, \ - { 0x06, 66.0f }, \ - { 0x07, 82.f }, \ - { 0x08, 100.0f } \ - } } - #define FT857_ALL_RX_MODES (RIG_MODE_AM|RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_USB|\ RIG_MODE_LSB|RIG_MODE_RTTY|RIG_MODE_FM|RIG_MODE_PKTUSB) #define FT857_SSB_CW_RX_MODES (RIG_MODE_CW|RIG_MODE_CWR|RIG_MODE_USB|RIG_MODE_LSB) @@ -276,7 +263,7 @@ struct rig_caps ft857_caps = .retry = 0, .has_get_func = RIG_FUNC_NONE, .has_set_func = RIG_FUNC_LOCK | RIG_FUNC_TONE | RIG_FUNC_TSQL | RIG_FUNC_CSQL | RIG_FUNC_RIT, - .has_get_level = RIG_LEVEL_STRENGTH | RIG_LEVEL_RFPOWER | RIG_LEVEL_RFPOWER_METER_WATTS, + .has_get_level = RIG_LEVEL_STRENGTH | RIG_LEVEL_RFPOWER, .has_set_level = RIG_LEVEL_BAND_SELECT, .has_get_parm = RIG_PARM_NONE, .has_set_parm = RIG_PARM_NONE, @@ -367,7 +354,7 @@ struct rig_caps ft857_caps = // {RIG_MODE_WFM, kHz(230)}, /* ?? */ RIG_FLT_END, }, - .rfpower_meter_cal = FT857_PWR_CAL, + .rig_init = ft857_init, .rig_cleanup = ft857_cleanup, .rig_open = ft857_open, @@ -854,7 +841,7 @@ int ft857_get_ptt(RIG *rig, vfo_t vfo, ptt_t *ptt) return RIG_OK; } -static int ft857_get_pometer_level(RIG *rig, value_t *val, const cal_table_float_t *cal, float divider) +static int ft857_get_pometer_level(RIG *rig, value_t *val) { struct ft857_priv_data *p = (struct ft857_priv_data *) STATE(rig)->priv; rig_debug(RIG_DEBUG_VERBOSE, "%s: called \n", __func__); @@ -874,7 +861,7 @@ static int ft857_get_pometer_level(RIG *rig, value_t *val, const cal_table_float { rig_debug(RIG_DEBUG_TRACE, "%s: bars=%d\n", __func__, p->tx_status & 0x0F); // does rig have 10 bars or 15? - val->f = (p->tx_status & 0x0F) / divider; + val->f = (p->tx_status & 0x0F) / 10.0; } else { @@ -915,23 +902,8 @@ int ft857_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) return ft857_get_smeter_level(rig, val); case RIG_LEVEL_RFPOWER: - if (144000000 >= vfo && 148000000 <= vfo) { - return ft857_get_pometer_level(rig, val, &rig->caps->rfpower_meter_cal, 2.0); - } - else if (420000000 >= vfo && 450000000 <= vfo) { - return ft857_get_pometer_level(rig, val, &rig->caps->rfpower_meter_cal, 5.0); - } - return ft857_get_pometer_level(rig, val, &rig->caps->rfpower_meter_cal, 1.0); - - case RIG_LEVEL_RFPOWER_METER_WATTS: - if (144000000 >= vfo && 148000000 <= vfo) { - return ft857_get_pometer_level(rig, val, &rig->caps->rfpower_meter_cal, 2.0); - } - else if (420000000 >= vfo && 450000000 <= vfo) { - return ft857_get_pometer_level(rig, val, &rig->caps->rfpower_meter_cal, 5.0); - } - return ft857_get_pometer_level(rig, val, &rig->caps->rfpower_meter_cal, 1.0); - + return ft857_get_pometer_level(rig, val); + default: return -RIG_EINVAL; }