From 29c57bc5a7d8caa2a2c8d2a39f75e98accd34232 Mon Sep 17 00:00:00 2001 From: Michael Black W9MDB Date: Thu, 17 Dec 2020 16:51:19 -0600 Subject: [PATCH] Add powermeter_scale to flrig --- rigs/dummy/flrig.c | 6 +++--- rigs/dummy/flrig.h | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/rigs/dummy/flrig.c b/rigs/dummy/flrig.c index a6ce6d93f..668fd5eff 100644 --- a/rigs/dummy/flrig.c +++ b/rigs/dummy/flrig.c @@ -1923,7 +1923,7 @@ static int flrig_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) char value[MAXARGLEN]; char *cmd; int retval; - //struct flrig_priv_data *priv = (struct flrig_priv_data *) rig->state.priv; + struct flrig_priv_data *priv = (struct flrig_priv_data *) rig->state.priv; rig_debug(RIG_DEBUG_TRACE, "%s: vfo=%s\n", __func__, rig_strvfo(vfo)); @@ -1964,12 +1964,12 @@ static int flrig_get_level(RIG *rig, vfo_t vfo, setting_t level, value_t *val) rig_debug(RIG_DEBUG_TRACE, "%s: val.i='%s'(%d)\n", __func__, value, val->i); case RIG_LEVEL_RFPOWER_METER: - val->f = atof(value) / 100.0; + val->f = atof(value) / 100.0 * priv->powermeter_scale; rig_debug(RIG_DEBUG_TRACE, "%s: val.f='%s'(%g)\n", __func__, value, val->f); break; case RIG_LEVEL_RFPOWER_METER_WATTS: - val->f = atof(value); + val->f = atof(value) * priv->powermeter_scale; rig_debug(RIG_DEBUG_TRACE, "%s: val.f='%s'(%g)\n", __func__, value, val->f); break; diff --git a/rigs/dummy/flrig.h b/rigs/dummy/flrig.h index 5eac365bc..ad0e0f746 100644 --- a/rigs/dummy/flrig.h +++ b/rigs/dummy/flrig.h @@ -28,7 +28,7 @@ #include #endif -#define BACKEND_VER "20201216" +#define BACKEND_VER "20201217" #define EOM "\r" #define TRUE 1