From 8fda0436a1a19863060bd1117bbffa61ed815443 Mon Sep 17 00:00:00 2001 From: Mikael Nousiainen Date: Sun, 8 Nov 2020 00:15:48 +0200 Subject: [PATCH] Allow AMN mode on FTDX 5000 and FTDX 3000 -- the rig seems to return it regardless of documentation (cherry picked from commit 8f3d5b5a850488b8aeed8deac9fe3dcc955bd022) --- rigs/yaesu/newcat.c | 20 ++++++++++++++------ 1 file changed, 14 insertions(+), 6 deletions(-) diff --git a/rigs/yaesu/newcat.c b/rigs/yaesu/newcat.c index c630173f5..e58f055aa 100644 --- a/rigs/yaesu/newcat.c +++ b/rigs/yaesu/newcat.c @@ -6573,6 +6573,7 @@ int newcat_set_rx_bandwidth(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) break; case RIG_MODE_AM: + case RIG_MODE_AMN: case RIG_MODE_FM: case RIG_MODE_PKTFM: case RIG_MODE_FMN: @@ -6591,8 +6592,10 @@ int newcat_set_rx_bandwidth(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) switch (mode) { case RIG_MODE_AM: + case RIG_MODE_AMN: case RIG_MODE_FM: case RIG_MODE_PKTFM: + case RIG_MODE_FMN: if (width < rig_passband_normal(rig, mode)) { err = newcat_set_narrow(rig, vfo, TRUE); @@ -6602,9 +6605,6 @@ int newcat_set_rx_bandwidth(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) err = newcat_set_narrow(rig, vfo, FALSE); } return err; - - case RIG_MODE_FMN: - return RIG_OK; } } // end is_ftdx1200 and is_ftdx3000 else if (is_ftdx5000) @@ -6680,6 +6680,7 @@ int newcat_set_rx_bandwidth(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) break; case RIG_MODE_AM: + case RIG_MODE_AMN: case RIG_MODE_FM: case RIG_MODE_PKTFM: case RIG_MODE_FMN: @@ -6698,8 +6699,10 @@ int newcat_set_rx_bandwidth(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) switch (mode) { case RIG_MODE_AM: + case RIG_MODE_AMN: case RIG_MODE_FM: case RIG_MODE_PKTFM: + case RIG_MODE_FMN: if (width < rig_passband_normal(rig, mode)) { err = newcat_set_narrow(rig, vfo, TRUE); @@ -6709,9 +6712,6 @@ int newcat_set_rx_bandwidth(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) err = newcat_set_narrow(rig, vfo, FALSE); } return err; - - case RIG_MODE_FMN: - return RIG_OK; } } // end is_ftdx5000 else if (is_ftdx101) @@ -7661,6 +7661,10 @@ int newcat_get_rx_bandwidth(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t *width) *width = 9000; break; + case RIG_MODE_AMN: + *width = 6000; + break; + default: return -RIG_EINVAL; } /* end switch(mode) */ @@ -7801,6 +7805,10 @@ int newcat_get_rx_bandwidth(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t *width) *width = 9000; break; + case RIG_MODE_AMN: + *width = 6000; + break; + default: return -RIG_EINVAL; } /* end switch(mode) */