From 1a823ae44a6957aeba95f5badb7c4dfc8ee12db3 Mon Sep 17 00:00:00 2001 From: Michael Black W9MDB Date: Sun, 18 Oct 2020 15:58:44 -0500 Subject: [PATCH] Add wait_morse to kenwood rigs https://github.com/Hamlib/Hamlib/issues/422 --- rigs/kenwood/k2.c | 2 +- rigs/kenwood/k3.c | 9 +++++---- rigs/kenwood/pihpsdr.c | 1 + rigs/kenwood/ts2000.c | 1 + rigs/kenwood/ts570.c | 2 ++ rigs/kenwood/ts590.c | 2 ++ rigs/kenwood/ts870s.c | 1 + rigs/kenwood/ts990s.c | 1 + rigs/kenwood/xg3.c | 1 - 9 files changed, 14 insertions(+), 6 deletions(-) diff --git a/rigs/kenwood/k2.c b/rigs/kenwood/k2.c index fbbdef09f..268dc31d6 100644 --- a/rigs/kenwood/k2.c +++ b/rigs/kenwood/k2.c @@ -244,7 +244,7 @@ const struct rig_caps k2_caps = .set_ant = kenwood_set_ant, .get_ant = kenwood_get_ant, .send_morse = kenwood_send_morse, - + .wait_morse = rig_wait_morse }; diff --git a/rigs/kenwood/k3.c b/rigs/kenwood/k3.c index 76016dc83..8cdfe6281 100644 --- a/rigs/kenwood/k3.c +++ b/rigs/kenwood/k3.c @@ -323,6 +323,7 @@ const struct rig_caps k3_caps = .set_ant = kenwood_set_ant_no_ack, .get_ant = kenwood_get_ant, .send_morse = kenwood_send_morse, + .wait_morse = rig_wait_morse }; @@ -472,7 +473,7 @@ const struct rig_caps k3s_caps = .set_ant = kenwood_set_ant_no_ack, .get_ant = kenwood_get_ant, .send_morse = kenwood_send_morse, - + .wait_morse = rig_wait_morse }; // How similar is this to the K3S? @@ -622,7 +623,7 @@ const struct rig_caps k4_caps = .set_ant = kenwood_set_ant_no_ack, .get_ant = kenwood_get_ant, .send_morse = kenwood_send_morse, - + .wait_morse = rig_wait_morse }; const struct rig_caps kx3_caps = @@ -771,7 +772,7 @@ const struct rig_caps kx3_caps = .set_ant = kenwood_set_ant_no_ack, .get_ant = kenwood_get_ant, .send_morse = kenwood_send_morse, - + .wait_morse = rig_wait_morse }; const struct rig_caps kx2_caps = @@ -920,7 +921,7 @@ const struct rig_caps kx2_caps = .set_ant = kenwood_set_ant_no_ack, .get_ant = kenwood_get_ant, .send_morse = kenwood_send_morse, - + .wait_morse = rig_wait_morse }; /* diff --git a/rigs/kenwood/pihpsdr.c b/rigs/kenwood/pihpsdr.c index 3b69a69bb..ad9e61163 100644 --- a/rigs/kenwood/pihpsdr.c +++ b/rigs/kenwood/pihpsdr.c @@ -283,6 +283,7 @@ const struct rig_caps pihpsdr_caps = .set_ant = kenwood_set_ant, .get_ant = kenwood_get_ant, .send_morse = kenwood_send_morse, + .wait_morse = rig_wait_morse, .vfo_op = kenwood_vfo_op, .scan = kenwood_scan, .set_mem = kenwood_set_mem, diff --git a/rigs/kenwood/ts2000.c b/rigs/kenwood/ts2000.c index 3050e2cec..32e0c19c6 100644 --- a/rigs/kenwood/ts2000.c +++ b/rigs/kenwood/ts2000.c @@ -310,6 +310,7 @@ const struct rig_caps ts2000_caps = .set_ant = kenwood_set_ant, .get_ant = kenwood_get_ant, .send_morse = kenwood_send_morse, + .wait_morse = rig_stop_morse, .vfo_op = kenwood_vfo_op, .scan = kenwood_scan, .set_mem = kenwood_set_mem, diff --git a/rigs/kenwood/ts570.c b/rigs/kenwood/ts570.c index e1954625f..badf41db2 100644 --- a/rigs/kenwood/ts570.c +++ b/rigs/kenwood/ts570.c @@ -1094,6 +1094,7 @@ const struct rig_caps ts570s_caps = .set_level = ts570_set_level, .get_level = ts570_get_level, .send_morse = kenwood_send_morse, + .wait_morse = rig_wait_morse, .vfo_op = kenwood_vfo_op, .set_mem = kenwood_set_mem, .get_mem = kenwood_get_mem, @@ -1280,6 +1281,7 @@ const struct rig_caps ts570d_caps = .set_level = ts570_set_level, .get_level = ts570_get_level, .send_morse = kenwood_send_morse, + .wait_morse = rig_wait_morse, .vfo_op = kenwood_vfo_op, .set_mem = kenwood_set_mem, .get_mem = kenwood_get_mem, diff --git a/rigs/kenwood/ts590.c b/rigs/kenwood/ts590.c index e037c4265..61b9be1d2 100644 --- a/rigs/kenwood/ts590.c +++ b/rigs/kenwood/ts590.c @@ -248,6 +248,7 @@ const struct rig_caps ts590_caps = .set_trn = kenwood_set_trn, .get_trn = kenwood_get_trn, .send_morse = kenwood_send_morse, + .wait_morse = rig_wait_morse, .set_mem = kenwood_set_mem, .get_mem = kenwood_get_mem, .set_channel = kenwood_set_channel, @@ -417,6 +418,7 @@ const struct rig_caps ts590sg_caps = .set_trn = kenwood_set_trn, .get_trn = kenwood_get_trn, .send_morse = kenwood_send_morse, + .wait_morse = rig_wait_morse, .set_mem = kenwood_set_mem, .get_mem = kenwood_get_mem, .set_channel = kenwood_set_channel, diff --git a/rigs/kenwood/ts870s.c b/rigs/kenwood/ts870s.c index fa1dd9bac..92825811e 100644 --- a/rigs/kenwood/ts870s.c +++ b/rigs/kenwood/ts870s.c @@ -669,6 +669,7 @@ const struct rig_caps ts870s_caps = .set_ant = kenwood_set_ant, .get_ant = kenwood_get_ant, .send_morse = kenwood_send_morse, + .wait_morse = rig_wait_morse, .vfo_op = kenwood_vfo_op, .set_mem = kenwood_set_mem, .get_mem = kenwood_get_mem, diff --git a/rigs/kenwood/ts990s.c b/rigs/kenwood/ts990s.c index 7725a1aff..ad12b4ef3 100644 --- a/rigs/kenwood/ts990s.c +++ b/rigs/kenwood/ts990s.c @@ -340,6 +340,7 @@ const struct rig_caps ts990s_caps = .set_ant = kenwood_set_ant, .get_ant = kenwood_get_ant, .send_morse = kenwood_send_morse, + .wait_morse = rig_wait_morse, .vfo_op = kenwood_vfo_op, .scan = kenwood_scan, .set_mem = kenwood_set_mem, diff --git a/rigs/kenwood/xg3.c b/rigs/kenwood/xg3.c index eac10f408..c5bf0d189 100644 --- a/rigs/kenwood/xg3.c +++ b/rigs/kenwood/xg3.c @@ -166,7 +166,6 @@ const struct rig_caps xg3_caps = .get_powerstat = xg3_get_powerstat, .set_parm = xg3_set_parm, .get_parm = xg3_get_parm, -// .send_morse = kenwood_send_morse, // we could do this };