From 8533002f8e5e6943afe810ebd6aed818470c37ae Mon Sep 17 00:00:00 2001 From: PianetaRadio <78976006+PianetaRadio@users.noreply.github.com> Date: Mon, 14 Nov 2022 10:33:40 +0100 Subject: [PATCH 1/5] Update ft991.c LVL_NR --- rigs/yaesu/ft991.c | 1 + 1 file changed, 1 insertion(+) diff --git a/rigs/yaesu/ft991.c b/rigs/yaesu/ft991.c index 678087eb4..1f272348d 100644 --- a/rigs/yaesu/ft991.c +++ b/rigs/yaesu/ft991.c @@ -166,6 +166,7 @@ const struct rig_caps ft991_caps = .has_set_parm = RIG_PARM_NONE, .level_gran = { #include "level_gran_yaesu.h" + [LVL_NR] = { .min = { .f = 0 }, .max = { .f = 0.15 }, .step = { .f = 1.0f/10.0f } }, }, .ctcss_list = common_ctcss_list, .dcs_list = common_dcs_list, From 4bede074fc0e1b5ca0fb22c1e8f348e6e4118580 Mon Sep 17 00:00:00 2001 From: PianetaRadio <78976006+PianetaRadio@users.noreply.github.com> Date: Mon, 14 Nov 2022 10:42:07 +0100 Subject: [PATCH 2/5] Update newcat.c Fix NR level for FT-991, according to manual range is 1...15 --- rigs/yaesu/newcat.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c index c2ed5915a..f4941acce 100644 --- a/rigs/yaesu/newcat.c +++ b/rigs/yaesu/newcat.c @@ -4190,7 +4190,8 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val) if (is_ft991) { fpf = newcat_scale_float(10, val.f); - if (fpf > 10) fpf=10; + if (fpf > 15) fpf=15; + if (fpf < 1) fpf=1; } else { From 7bcf599afc47c791da994042ad785dbee08026d7 Mon Sep 17 00:00:00 2001 From: PianetaRadio <78976006+PianetaRadio@users.noreply.github.com> Date: Mon, 14 Nov 2022 10:43:07 +0100 Subject: [PATCH 3/5] Update ft991.c NR level range --- rigs/yaesu/ft991.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rigs/yaesu/ft991.c b/rigs/yaesu/ft991.c index 1f272348d..ded55553d 100644 --- a/rigs/yaesu/ft991.c +++ b/rigs/yaesu/ft991.c @@ -166,7 +166,7 @@ const struct rig_caps ft991_caps = .has_set_parm = RIG_PARM_NONE, .level_gran = { #include "level_gran_yaesu.h" - [LVL_NR] = { .min = { .f = 0 }, .max = { .f = 0.15 }, .step = { .f = 1.0f/10.0f } }, + [LVL_NR] = { .min = { .f = 0.1 }, .max = { .f = 0.15 }, .step = { .f = 1.0f/10.0f } }, }, .ctcss_list = common_ctcss_list, .dcs_list = common_dcs_list, From 20ce6004485ae1d8910ff032cd9d826f8933a795 Mon Sep 17 00:00:00 2001 From: PianetaRadio <78976006+PianetaRadio@users.noreply.github.com> Date: Mon, 14 Nov 2022 16:14:28 +0100 Subject: [PATCH 4/5] Update ft991.c Correct NR level --- rigs/yaesu/ft991.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rigs/yaesu/ft991.c b/rigs/yaesu/ft991.c index ded55553d..bf1d7f474 100644 --- a/rigs/yaesu/ft991.c +++ b/rigs/yaesu/ft991.c @@ -166,7 +166,7 @@ const struct rig_caps ft991_caps = .has_set_parm = RIG_PARM_NONE, .level_gran = { #include "level_gran_yaesu.h" - [LVL_NR] = { .min = { .f = 0.1 }, .max = { .f = 0.15 }, .step = { .f = 1.0f/10.0f } }, + [LVL_NR] = { .min = { .f = 0 }, .max = { .f = 1 }, .step = { .f = 1.0f/15.0f } }, }, .ctcss_list = common_ctcss_list, .dcs_list = common_dcs_list, From a563c749f4a582ca43624e8d1d4113a2314057c6 Mon Sep 17 00:00:00 2001 From: PianetaRadio <78976006+PianetaRadio@users.noreply.github.com> Date: Mon, 14 Nov 2022 16:26:53 +0100 Subject: [PATCH 5/5] Update newcat.c Fix FT991 NR level --- rigs/yaesu/newcat.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c index f4941acce..be2e51c3b 100644 --- a/rigs/yaesu/newcat.c +++ b/rigs/yaesu/newcat.c @@ -4189,7 +4189,7 @@ int newcat_set_level(RIG *rig, vfo_t vfo, setting_t level, value_t val) { if (is_ft991) { - fpf = newcat_scale_float(10, val.f); + fpf = newcat_scale_float(15, val.f); if (fpf > 15) fpf=15; if (fpf < 1) fpf=1; }