From 2a852aee1b8d8c0bd7972065717c6b642b2318d9 Mon Sep 17 00:00:00 2001 From: Mike Black W9MDB Date: Sun, 13 Feb 2022 17:25:57 -0600 Subject: [PATCH] Fix TS-590/950 PKTMODE setting https://github.com/Hamlib/Hamlib/issues/958 --- rigs/kenwood/kenwood.c | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) diff --git a/rigs/kenwood/kenwood.c b/rigs/kenwood/kenwood.c index e1e895521..fb1f5e700 100644 --- a/rigs/kenwood/kenwood.c +++ b/rigs/kenwood/kenwood.c @@ -2258,7 +2258,7 @@ int kenwood_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) c = 'A' + kmode - 10; } - rig_debug(RIG_DEBUG_VERBOSE, "%s: kmode=%d, cmode=%c\n", __func__, kmode, c); + rig_debug(RIG_DEBUG_VERBOSE, "%s: kmode=%d, cmode=%c, datamode=%c\n", __func__, kmode, c, data_mode); if (RIG_IS_TS990S) { @@ -2299,23 +2299,13 @@ int kenwood_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width) if (err != RIG_OK) { RETURNFUNC(err); } - if (RIG_IS_TS590S || RIG_IS_TS590SG || RIG_IS_TS950S || RIG_IS_TS950SDX) + if (data_mode == '1' && (RIG_IS_TS590S || RIG_IS_TS590SG || RIG_IS_TS950S || RIG_IS_TS950SDX)) { - if (!(RIG_MODE_CW == mode - || RIG_MODE_CWR == mode - || RIG_MODE_AM == mode - || RIG_MODE_USB == mode - || RIG_MODE_LSB == mode - || RIG_MODE_RTTY == mode - || RIG_MODE_RTTYR == mode)) + if (RIG_IS_TS950S || RIG_IS_TS950SDX) { - if (RIG_IS_TS950S || RIG_IS_TS950SDX) - { - data_cmd = "DT"; - } - - datamode = 1; + data_cmd = "DT"; } + datamode = 1; } rig_debug(RIG_DEBUG_VERBOSE, "%s: vfo=%s, curr_mode=%s, new_mode=%s, datamode=%d\n",