From 280664b02e6001c7f9fcdfdc7d30a4600a26c534 Mon Sep 17 00:00:00 2001 From: KJ5HST <62bk8cwjjs@privaterelay.appleid.com> Date: Tue, 10 Mar 2026 01:27:55 -0400 Subject: [PATCH] fix: use calibration tables for SWR and ALC meter scaling Replace naive /100.0f divisor with rig_raw2val_float() using the FTX1_SWR_CAL and FTX1_ALC_CAL calibration tables added in the previous commit. This matches how newcat handles meter values for other Yaesu radios and produces correct SWR ratios and 0.0-1.0 normalized ALC values from raw 0-255 RM readings. --- rigs/yaesu/ftx1/ftx1_func.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/rigs/yaesu/ftx1/ftx1_func.c b/rigs/yaesu/ftx1/ftx1_func.c index 423674ad4..a8e21e175 100644 --- a/rigs/yaesu/ftx1/ftx1_func.c +++ b/rigs/yaesu/ftx1/ftx1_func.c @@ -479,11 +479,11 @@ int ftx1_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) return ret; case RIG_LEVEL_SWR: ret = ftx1_get_meter(rig, 6, &ival); /* RM6=SWR */ - if (ret == RIG_OK) val->f = (float)ival / 100.0f; + if (ret == RIG_OK) val->f = rig_raw2val_float(ival, &rig->caps->swr_cal); return ret; case RIG_LEVEL_ALC: ret = ftx1_get_meter(rig, 4, &ival); /* RM4=ALC */ - if (ret == RIG_OK) val->f = (float)ival / 100.0f; + if (ret == RIG_OK) val->f = rig_raw2val_float(ival, &rig->caps->alc_cal); return ret; case RIG_LEVEL_IF: {