From 3f90a9323eb3b477fbc92308dee131221a7cac90 Mon Sep 17 00:00:00 2001 From: Michael Black W9MDB Date: Wed, 27 Nov 2024 12:07:03 -0600 Subject: [PATCH] Update POWER_METER values for IC7700 and IC7760 --- rigs/icom/ic7700.c | 19 +++++-------------- rigs/icom/ic7760.c | 20 +++++--------------- 2 files changed, 10 insertions(+), 29 deletions(-) diff --git a/rigs/icom/ic7700.c b/rigs/icom/ic7700.c index 700da9a4e..3d1a2f576 100644 --- a/rigs/icom/ic7700.c +++ b/rigs/icom/ic7700.c @@ -72,21 +72,12 @@ { 120, 1.0f } \ } } -#define IC7700_RFPOWER_METER_CAL { 13, \ +#define IC7700_RFPOWER_METER_CAL { 4, \ { \ { 0, 0.0f }, \ - { 21, 5.0f }, \ - { 43, 10.0f }, \ - { 65, 15.0f }, \ - { 83, 20.0f }, \ - { 95, 25.0f }, \ - { 105, 30.0f }, \ - { 114, 35.0f }, \ - { 124, 40.0f }, \ - { 143, 50.0f }, \ - { 183, 75.0f }, \ - { 213, 100.0f }, \ - { 255, 120.0f } \ + { 143, 100.0f }, \ + { 212, 200.0f }, \ + { 255, 250.0f }, \ } } @@ -277,7 +268,7 @@ struct rig_caps ic7700_caps = RIG_MODEL(RIG_MODEL_IC7700), .model_name = "IC-7700", .mfg_name = "Icom", - .version = BACKEND_VER ".5", + .version = BACKEND_VER ".6", .copyright = "LGPL", .status = RIG_STATUS_STABLE, .rig_type = RIG_TYPE_TRANSCEIVER, diff --git a/rigs/icom/ic7760.c b/rigs/icom/ic7760.c index dd03adf8b..438ae191f 100644 --- a/rigs/icom/ic7760.c +++ b/rigs/icom/ic7760.c @@ -49,7 +49,7 @@ #define IC7760_ANTS (RIG_ANT_1|RIG_ANT_2|RIG_ANT_3|RIG_ANT_4) -// IC-7760 S-meter calibration data based on manual +// IC-7760 calibration data based on manual #define IC7760_STR_CAL { 3, \ { \ { 0,-54 }, \ @@ -72,24 +72,14 @@ { 120, 1.0f } \ } } -#define IC7760_RFPOWER_METER_CAL { 13, \ +#define IC7760_RFPOWER_METER_CAL { 4, \ { \ { 0, 0.0f }, \ - { 21, 5.0f }, \ - { 43, 10.0f }, \ - { 65, 15.0f }, \ - { 83, 20.0f }, \ - { 95, 25.0f }, \ - { 105, 30.0f }, \ - { 114, 35.0f }, \ - { 124, 40.0f }, \ - { 143, 50.0f }, \ - { 183, 75.0f }, \ - { 213, 100.0f }, \ - { 255, 120.0f } \ + { 143, 100.0f }, \ + { 212, 200.0f }, \ + { 255, 250.0f }, \ } } - #define IC7760_COMP_METER_CAL { 3, \ { \ { 0, 0.0f }, \