From 528da5dc9ab4d0d2459256add58f4e2e0683f175 Mon Sep 17 00:00:00 2001 From: PianetaRadio <78976006+PianetaRadio@users.noreply.github.com> Date: Sat, 19 Mar 2022 17:12:12 +0100 Subject: [PATCH 1/4] Update ft991.c Filter bandwidth list --- rigs/yaesu/ft991.c | 57 +++++++++++++++++++++++++++++++++------------- 1 file changed, 41 insertions(+), 16 deletions(-) diff --git a/rigs/yaesu/ft991.c b/rigs/yaesu/ft991.c index e14a6d49e..a02a2b14c 100644 --- a/rigs/yaesu/ft991.c +++ b/rigs/yaesu/ft991.c @@ -228,27 +228,53 @@ const struct rig_caps ft991_caps = /* mode/filter list, .remember = order matters! */ .filters = { - {FT991_CW_RTTY_PKT_RX_MODES, Hz(1700)}, /* Normal CW, RTTY, PKT */ - {FT991_CW_RTTY_PKT_RX_MODES, Hz(500)}, /* Narrow CW, RTTY, PKT */ - {FT991_CW_RTTY_PKT_RX_MODES, Hz(2400)}, /* Wide CW, RTTY, PKT */ - {FT991_CW_RTTY_PKT_RX_MODES, Hz(2000)}, /* CW, RTTY, PKT */ - {FT991_CW_RTTY_PKT_RX_MODES, Hz(1400)}, /* CW, RTTY, PKT */ - {FT991_CW_RTTY_PKT_RX_MODES, Hz(1200)}, /* CW, RTTY, PKT */ - {FT991_CW_RTTY_PKT_RX_MODES, Hz(800)}, /* CW, RTTY, PKT */ - {FT991_CW_RTTY_PKT_RX_MODES, Hz(400)}, /* CW, RTTY, PKT */ - {FT991_CW_RTTY_PKT_RX_MODES, Hz(300)}, /* CW, RTTY, PKT */ - {FT991_CW_RTTY_PKT_RX_MODES, Hz(200)}, /* CW, RTTY, PKT */ - {FT991_CW_RTTY_PKT_RX_MODES, Hz(100)}, /* CW, RTTY, PKT */ + {FT991_RTTY_DATA_RX_MODES, Hz(500)}, /* Normal RTTY, DATA */ + {FT991_RTTY_DATA_RX_MODES, Hz(300)}, /* Narrow RTTY, DATA */ + {FT991_RTTY_DATA_RX_MODES, Hz(3000)}, /* Wide RTTY, DATA */ + {FT991_RTTY_DATA_RX_MODES, Hz(2400)}, /* RTTY, DATA */ + {FT991_RTTY_DATA_RX_MODES, Hz(2000)}, /* RTTY, DATA */ + {FT991_RTTY_DATA_RX_MODES, Hz(1700)}, /* RTTY, DATA */ + {FT991_RTTY_DATA_RX_MODES, Hz(1400)}, /* RTTY, DATA */ + {FT991_RTTY_DATA_RX_MODES, Hz(1200)}, /* RTTY, DATA */ + {FT991_RTTY_DATA_RX_MODES, Hz(800)}, /* RTTY, DATA */ + {FT991_RTTY_DATA_RX_MODES, Hz(450)}, /* RTTY, DATA */ + {FT991_RTTY_DATA_RX_MODES, Hz(400)}, /* RTTY, DATA */ + {FT991_RTTY_DATA_RX_MODES, Hz(350)}, /* RTTY, DATA */ + {FT991_RTTY_DATA_RX_MODES, Hz(300)}, /* RTTY, DATA */ + {FT991_RTTY_DATA_RX_MODES, Hz(250)}, /* RTTY, DATA */ + {FT991_RTTY_DATA_RX_MODES, Hz(200)}, /* RTTY, DATA */ + {FT991_RTTY_DATA_RX_MODES, Hz(150)}, /* RTTY, DATA */ + {FT991_RTTY_DATA_RX_MODES, Hz(100)}, /* RTTY, DATA */ + {FT991_RTTY_DATA_RX_MODES, Hz(50)}, /* RTTY, DATA */ + {FT991_CW_RX_MODES, Hz(2400)}, /* Normal CW */ + {FT991_CW_RX_MODES, Hz(500)}, /* Narrow CW */ + {FT991_CW_RX_MODES, Hz(3000)}, /* Wide CW */ + {FT991_CW_RX_MODES, Hz(2000)}, /* CW */ + {FT991_CW_RX_MODES, Hz(1700)}, /* CW */ + {FT991_CW_RX_MODES, Hz(1400)}, /* CW */ + {FT991_CW_RX_MODES, Hz(1200)}, /* CW */ + {FT991_CW_RX_MODES, Hz(800)}, /* CW */ + {FT991_CW_RX_MODES, Hz(450)}, /* CW */ + {FT991_CW_RX_MODES, Hz(400)}, /* CW */ + {FT991_CW_RX_MODES, Hz(350)}, /* CW */ + {FT991_CW_RX_MODES, Hz(300)}, /* CW */ + {FT991_CW_RX_MODES, Hz(250)}, /* CW */ + {FT991_CW_RX_MODES, Hz(200)}, /* CW */ + {FT991_CW_RX_MODES, Hz(150)}, /* CW */ + {FT991_CW_RX_MODES, Hz(100)}, /* CW */ + {FT991_CW_RX_MODES, Hz(50)}, /* CW */ {RIG_MODE_SSB, Hz(2400)}, /* Normal SSB */ - {RIG_MODE_SSB, Hz(1800)}, /* Narrow SSB */ + {RIG_MODE_SSB, Hz(1500)}, /* Narrow SSB */ {RIG_MODE_SSB, Hz(3200)}, /* Wide SSB */ - {RIG_MODE_SSB, Hz(3000)}, /* Wide SSB */ + {RIG_MODE_SSB, Hz(3000)}, /* SSB */ {RIG_MODE_SSB, Hz(2900)}, /* SSB */ {RIG_MODE_SSB, Hz(2800)}, /* SSB */ {RIG_MODE_SSB, Hz(2700)}, /* SSB */ {RIG_MODE_SSB, Hz(2600)}, /* SSB */ {RIG_MODE_SSB, Hz(2500)}, /* SSB */ - {RIG_MODE_SSB, Hz(2250)}, /* SSB */ + {RIG_MODE_SSB, Hz(2400)}, /* SSB */ + {RIG_MODE_SSB, Hz(2300)}, /* SSB */ + {RIG_MODE_SSB, Hz(2200)}, /* SSB */ {RIG_MODE_SSB, Hz(2100)}, /* SSB */ {RIG_MODE_SSB, Hz(1950)}, /* SSB */ {RIG_MODE_SSB, Hz(1650)}, /* SSB */ @@ -259,10 +285,9 @@ const struct rig_caps ft991_caps = {RIG_MODE_SSB, Hz(600)}, /* SSB */ {RIG_MODE_SSB, Hz(400)}, /* SSB */ {RIG_MODE_SSB, Hz(200)}, /* SSB */ - {FT991_CW_RTTY_PKT_RX_MODES | RIG_MODE_SSB, RIG_FLT_ANY }, {RIG_MODE_AM, Hz(9000)}, /* Normal AM */ {RIG_MODE_AMN, Hz(6000)}, /* Narrow AM */ - {FT991_FM_WIDE_RX_MODES, Hz(16000)}, /* Normal FM */ + {FT991_FM_WIDE_RX_MODES, Hz(16000)}, /* Normal FM, PKTFM, C4FM */ {RIG_MODE_FMN, Hz(9000)}, /* Narrow FM */ RIG_FLT_END, From 14b6941a01e86a53f4cdce81dd6e82a9aa651d17 Mon Sep 17 00:00:00 2001 From: PianetaRadio <78976006+PianetaRadio@users.noreply.github.com> Date: Sat, 19 Mar 2022 17:18:32 +0100 Subject: [PATCH 2/4] Modes macro updated To meet update of ft991.c --- rigs/yaesu/ft991.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/rigs/yaesu/ft991.h b/rigs/yaesu/ft991.h index 78b3c14a2..ec126988b 100644 --- a/rigs/yaesu/ft991.h +++ b/rigs/yaesu/ft991.h @@ -41,8 +41,7 @@ #define FT991_FM_WIDE_RX_MODES (RIG_MODE_FM|RIG_MODE_PKTFM|RIG_MODE_C4FM) #define FT991_FM_RX_MODES (FT991_FM_WIDE_RX_MODES|RIG_MODE_FMN) #define FT991_CW_RX_MODES (RIG_MODE_CW|RIG_MODE_CWR) -#define FT991_CW_RTTY_PKT_RX_MODES (RIG_MODE_RTTY|RIG_MODE_RTTYR|\ - RIG_MODE_PKTUSB|RIG_MODE_PKTLSB|RIG_MODE_CW|RIG_MODE_CWR) +#define FT991_RTTY_DATA_RX_MODES (RIG_MODE_RTTY|RIG_MODE_RTTYR|RIG_MODE_PKTUSB|RIG_MODE_PKTLSB) /* TRX caps */ From 2f8d6e0f19c8f6470f3a4d82477a1d82fbb667c1 Mon Sep 17 00:00:00 2001 From: PianetaRadio <78976006+PianetaRadio@users.noreply.github.com> Date: Sat, 19 Mar 2022 17:30:13 +0100 Subject: [PATCH 3/4] newcat_set_rx_bandwidth Typo correction in the list for Yaesu FT-991 --- 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 9c4c59d3c..093b0e38e 100644 --- a/rigs/yaesu/newcat.c +++ b/rigs/yaesu/newcat.c @@ -7928,7 +7928,7 @@ int newcat_set_rx_bandwidth(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) else if (width <= 150) { w = 3; } else if (width <= 200) { w = 4; } else if (width <= 250) { w = 5; } - else if (width <= 305) { w = 6; } + else if (width <= 300) { w = 6; } else if (width <= 350) { w = 7; } else if (width <= 400) { w = 8; } else if (width <= 450) { w = 9; } From 575d6dd1af6cef7104f0447576569d04901cd659 Mon Sep 17 00:00:00 2001 From: PianetaRadio <78976006+PianetaRadio@users.noreply.github.com> Date: Sat, 19 Mar 2022 17:32:48 +0100 Subject: [PATCH 4/4] Bandwidth list Updated according to CAT manual --- rigs/yaesu/ft991.c | 3 --- 1 file changed, 3 deletions(-) diff --git a/rigs/yaesu/ft991.c b/rigs/yaesu/ft991.c index a02a2b14c..b6e12cd8d 100644 --- a/rigs/yaesu/ft991.c +++ b/rigs/yaesu/ft991.c @@ -240,7 +240,6 @@ const struct rig_caps ft991_caps = {FT991_RTTY_DATA_RX_MODES, Hz(450)}, /* RTTY, DATA */ {FT991_RTTY_DATA_RX_MODES, Hz(400)}, /* RTTY, DATA */ {FT991_RTTY_DATA_RX_MODES, Hz(350)}, /* RTTY, DATA */ - {FT991_RTTY_DATA_RX_MODES, Hz(300)}, /* RTTY, DATA */ {FT991_RTTY_DATA_RX_MODES, Hz(250)}, /* RTTY, DATA */ {FT991_RTTY_DATA_RX_MODES, Hz(200)}, /* RTTY, DATA */ {FT991_RTTY_DATA_RX_MODES, Hz(150)}, /* RTTY, DATA */ @@ -272,13 +271,11 @@ const struct rig_caps ft991_caps = {RIG_MODE_SSB, Hz(2700)}, /* SSB */ {RIG_MODE_SSB, Hz(2600)}, /* SSB */ {RIG_MODE_SSB, Hz(2500)}, /* SSB */ - {RIG_MODE_SSB, Hz(2400)}, /* SSB */ {RIG_MODE_SSB, Hz(2300)}, /* SSB */ {RIG_MODE_SSB, Hz(2200)}, /* SSB */ {RIG_MODE_SSB, Hz(2100)}, /* SSB */ {RIG_MODE_SSB, Hz(1950)}, /* SSB */ {RIG_MODE_SSB, Hz(1650)}, /* SSB */ - {RIG_MODE_SSB, Hz(1500)}, /* SSB */ {RIG_MODE_SSB, Hz(1350)}, /* SSB */ {RIG_MODE_SSB, Hz(1100)}, /* SSB */ {RIG_MODE_SSB, Hz(850)}, /* SSB */