From 901cea8944f86c65cf5319555747f6d14192ffd6 Mon Sep 17 00:00:00 2001 From: Mike Black W9MDB Date: Sun, 29 May 2022 22:53:30 -0500 Subject: [PATCH] Add wait_morse to rigs that had send_morse but missing wait_morse wait_morse only works on full break-in https://github.com/Hamlib/Hamlib/issues/1043 --- rigs/icom/ic7600.c | 3 ++- rigs/kenwood/ts480.c | 6 ++++-- rigs/kenwood/ts890s.c | 1 + rigs/tentec/orion.h | 3 ++- rigs/yaesu/ft1200.c | 1 + rigs/yaesu/ft2000.c | 1 + rigs/yaesu/ft3000.c | 1 + rigs/yaesu/ft450.c | 3 ++- rigs/yaesu/ft5000.c | 3 ++- rigs/yaesu/ft891.c | 3 ++- rigs/yaesu/ft9000.c | 3 ++- rigs/yaesu/ft920.c | 2 +- rigs/yaesu/ft950.c | 3 ++- rigs/yaesu/ft991.c | 3 ++- rigs/yaesu/ftdx10.c | 3 ++- rigs/yaesu/ftdx101.c | 3 ++- rigs/yaesu/ftdx101mp.c | 3 ++- 17 files changed, 31 insertions(+), 14 deletions(-) diff --git a/rigs/icom/ic7600.c b/rigs/icom/ic7600.c index cd461c0bd..3dbc2488b 100644 --- a/rigs/icom/ic7600.c +++ b/rigs/icom/ic7600.c @@ -270,7 +270,7 @@ const struct rig_caps ic7600_caps = RIG_MODEL(RIG_MODEL_IC7600), .model_name = "IC-7600", .mfg_name = "Icom", - .version = BACKEND_VER ".2", + .version = BACKEND_VER ".3", .copyright = "LGPL", .status = RIG_STATUS_STABLE, .rig_type = RIG_TYPE_TRANSCEIVER, @@ -446,6 +446,7 @@ const struct rig_caps ic7600_caps = .set_powerstat = icom_set_powerstat, .get_powerstat = icom_get_powerstat, .send_morse = icom_send_morse, + .wait_morse = rig_wait_morse, .set_clock = ic7600_set_clock, .get_clock = ic7600_get_clock, .hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS diff --git a/rigs/kenwood/ts480.c b/rigs/kenwood/ts480.c index edbaa5538..cfa38faed 100644 --- a/rigs/kenwood/ts480.c +++ b/rigs/kenwood/ts480.c @@ -1256,7 +1256,7 @@ const struct rig_caps ts480_caps = RIG_MODEL(RIG_MODEL_TS480), .model_name = "TS-480", .mfg_name = "Kenwood", - .version = BACKEND_VER ".1", + .version = BACKEND_VER ".2", .copyright = "LGPL", .status = RIG_STATUS_STABLE, .rig_type = RIG_TYPE_TRANSCEIVER, @@ -1435,6 +1435,7 @@ const struct rig_caps ts480_caps = .set_ext_func = ts480_set_ext_func, .get_ext_func = ts480_get_ext_func, .send_morse = kenwood_send_morse, + .wait_morse = rig_wait_morse, .vfo_op = kenwood_vfo_op, .hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS }; @@ -1608,7 +1609,7 @@ const struct rig_caps sdruno_caps = RIG_MODEL(RIG_MODEL_SDRUNO), .model_name = "SDRUno", .mfg_name = "SDRPlay", - .version = BACKEND_VER ".1", + .version = BACKEND_VER ".2", .copyright = "LGPL", .status = RIG_STATUS_STABLE, .rig_type = RIG_TYPE_TRANSCEIVER, @@ -1788,6 +1789,7 @@ const struct rig_caps sdruno_caps = .set_ext_func = ts480_set_ext_func, .get_ext_func = ts480_get_ext_func, .send_morse = kenwood_send_morse, + .wait_morse = rig_wait_morse, .vfo_op = kenwood_vfo_op, .hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS }; diff --git a/rigs/kenwood/ts890s.c b/rigs/kenwood/ts890s.c index c73066ff9..c41217d83 100644 --- a/rigs/kenwood/ts890s.c +++ b/rigs/kenwood/ts890s.c @@ -376,6 +376,7 @@ const struct rig_caps ts890s_caps = .set_ant = kenwood_set_ant, .get_ant = kenwood_get_ant, .send_morse = kenwood_send_morse, + .wait_morse = rig_wait_morse, .scan = kenwood_scan, /* not working, invalid arguments using rigctl; kenwood_scan does only support on/off and not tone and CTCSS scan */ .has_set_level = TS890_LEVEL_ALL, .has_get_level = TS890_LEVEL_ALL, diff --git a/rigs/tentec/orion.h b/rigs/tentec/orion.h index baa7dc5ea..cbe242e89 100644 --- a/rigs/tentec/orion.h +++ b/rigs/tentec/orion.h @@ -196,7 +196,7 @@ const struct rig_caps tt565_caps = { RIG_MODEL(RIG_MODEL_TT565), .model_name = "TT-565 Orion", .mfg_name = "Ten-Tec", -.version = BACKEND_VER ".0", +.version = BACKEND_VER ".1", .copyright = "LGPL", .status = RIG_STATUS_STABLE, .rig_type = RIG_TYPE_TRANSCEIVER, @@ -358,6 +358,7 @@ RIG_MODEL(RIG_MODEL_TT565), .reset = tt565_reset, .get_info = tt565_get_info, .send_morse = tt565_send_morse, +.wait_morse = rig_wait_morse, .get_func = tt565_get_func, .set_func = tt565_set_func, .get_ant = tt565_get_ant, diff --git a/rigs/yaesu/ft1200.c b/rigs/yaesu/ft1200.c index 36505854c..9ba50b220 100644 --- a/rigs/yaesu/ft1200.c +++ b/rigs/yaesu/ft1200.c @@ -320,6 +320,7 @@ const struct rig_caps ftdx1200_caps = .set_ext_level = newcat_set_ext_level, .get_ext_level = newcat_get_ext_level, .send_morse = newcat_send_morse, + .wait_morse = rig_wait_morse, .set_clock = newcat_set_clock, .get_clock = newcat_get_clock, .hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS diff --git a/rigs/yaesu/ft2000.c b/rigs/yaesu/ft2000.c index afc022862..268586b51 100644 --- a/rigs/yaesu/ft2000.c +++ b/rigs/yaesu/ft2000.c @@ -307,5 +307,6 @@ const struct rig_caps ft2000_caps = .set_ext_level = newcat_set_ext_level, .get_ext_level = newcat_get_ext_level, .send_morse = newcat_send_morse, + .wait_morse = rig_wait_morse, .hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS }; diff --git a/rigs/yaesu/ft3000.c b/rigs/yaesu/ft3000.c index a338605f9..dd359b68d 100644 --- a/rigs/yaesu/ft3000.c +++ b/rigs/yaesu/ft3000.c @@ -413,6 +413,7 @@ const struct rig_caps ftdx3000_caps = .set_ext_level = newcat_set_ext_level, .get_ext_level = newcat_get_ext_level, .send_morse = newcat_send_morse, + .wait_morse = rig_wait_morse, .hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS }; diff --git a/rigs/yaesu/ft450.c b/rigs/yaesu/ft450.c index dc6932c8d..f157b24ff 100644 --- a/rigs/yaesu/ft450.c +++ b/rigs/yaesu/ft450.c @@ -42,7 +42,7 @@ const struct rig_caps ft450_caps = RIG_MODEL(RIG_MODEL_FT450), .model_name = "FT-450", .mfg_name = "Yaesu", - .version = NEWCAT_VER ".1", + .version = NEWCAT_VER ".2", .copyright = "LGPL", .status = RIG_STATUS_STABLE, .rig_type = RIG_TYPE_TRANSCEIVER, @@ -202,6 +202,7 @@ const struct rig_caps ft450_caps = .set_channel = newcat_set_channel, .get_channel = newcat_get_channel, .send_morse = newcat_send_morse, + .wait_morse = rig_wait_morse, .hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS }; diff --git a/rigs/yaesu/ft5000.c b/rigs/yaesu/ft5000.c index 22dc60d61..6e51b73c0 100644 --- a/rigs/yaesu/ft5000.c +++ b/rigs/yaesu/ft5000.c @@ -140,7 +140,7 @@ const struct rig_caps ftdx5000_caps = RIG_MODEL(RIG_MODEL_FTDX5000), .model_name = "FTDX-5000", .mfg_name = "Yaesu", - .version = NEWCAT_VER ".2", + .version = NEWCAT_VER ".3", .copyright = "LGPL", .status = RIG_STATUS_STABLE, .rig_type = RIG_TYPE_TRANSCEIVER, @@ -309,5 +309,6 @@ const struct rig_caps ftdx5000_caps = .set_ext_level = newcat_set_ext_level, .get_ext_level = newcat_get_ext_level, .send_morse = newcat_send_morse, + .wait_morse = rig_wait_morse, .hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS }; diff --git a/rigs/yaesu/ft891.c b/rigs/yaesu/ft891.c index 8124d6c2a..b82470801 100644 --- a/rigs/yaesu/ft891.c +++ b/rigs/yaesu/ft891.c @@ -133,7 +133,7 @@ const struct rig_caps ft891_caps = RIG_MODEL(RIG_MODEL_FT891), .model_name = "FT-891", .mfg_name = "Yaesu", - .version = NEWCAT_VER ".6", + .version = NEWCAT_VER ".7", .copyright = "LGPL", .status = RIG_STATUS_STABLE, .rig_type = RIG_TYPE_TRANSCEIVER, @@ -320,6 +320,7 @@ const struct rig_caps ft891_caps = .set_ext_level = newcat_set_ext_level, .get_ext_level = newcat_get_ext_level, .send_morse = newcat_send_morse, + .wait_morse = rig_wait_morse, .set_clock = newcat_set_clock, .get_clock = newcat_get_clock, .hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS diff --git a/rigs/yaesu/ft9000.c b/rigs/yaesu/ft9000.c index 78ca77ec8..43fe7f4d7 100644 --- a/rigs/yaesu/ft9000.c +++ b/rigs/yaesu/ft9000.c @@ -49,7 +49,7 @@ const struct rig_caps ft9000_caps = RIG_MODEL(RIG_MODEL_FT9000), .model_name = "FTDX-9000", .mfg_name = "Yaesu", - .version = NEWCAT_VER ".1", + .version = NEWCAT_VER ".2", .copyright = "LGPL", .status = RIG_STATUS_STABLE, .rig_type = RIG_TYPE_TRANSCEIVER, @@ -212,5 +212,6 @@ const struct rig_caps ft9000_caps = .set_channel = newcat_set_channel, .get_channel = newcat_get_channel, .send_morse = newcat_send_morse, + .wait_morse = rig_wait_morse, .hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS }; diff --git a/rigs/yaesu/ft920.c b/rigs/yaesu/ft920.c index a4327c85f..e0ca52e2a 100644 --- a/rigs/yaesu/ft920.c +++ b/rigs/yaesu/ft920.c @@ -410,7 +410,7 @@ const struct rig_caps ft920_caps = RIG_MODEL(RIG_MODEL_FT920), .model_name = "FT-920", .mfg_name = "Yaesu", - .version = "20210221.0", /* YYYYMMDD */ + .version = "20220529.0", /* YYYYMMDD */ .copyright = "LGPL", .status = RIG_STATUS_STABLE, .rig_type = RIG_TYPE_TRANSCEIVER, diff --git a/rigs/yaesu/ft950.c b/rigs/yaesu/ft950.c index b06a0b329..b9b46ea05 100644 --- a/rigs/yaesu/ft950.c +++ b/rigs/yaesu/ft950.c @@ -87,7 +87,7 @@ const struct rig_caps ft950_caps = RIG_MODEL(RIG_MODEL_FT950), .model_name = "FT-950", .mfg_name = "Yaesu", - .version = NEWCAT_VER ".2", + .version = NEWCAT_VER ".3", .copyright = "LGPL", .status = RIG_STATUS_STABLE, .rig_type = RIG_TYPE_TRANSCEIVER, @@ -284,5 +284,6 @@ const struct rig_caps ft950_caps = .set_ext_level = newcat_set_ext_level, .get_ext_level = newcat_get_ext_level, .send_morse = newcat_send_morse, + .wait_morse = rig_wait_morse, .hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS }; diff --git a/rigs/yaesu/ft991.c b/rigs/yaesu/ft991.c index 8ab228804..433569f91 100644 --- a/rigs/yaesu/ft991.c +++ b/rigs/yaesu/ft991.c @@ -141,7 +141,7 @@ const struct rig_caps ft991_caps = RIG_MODEL(RIG_MODEL_FT991), .model_name = "FT-991", .mfg_name = "Yaesu", - .version = NEWCAT_VER ".10", + .version = NEWCAT_VER ".11", .copyright = "LGPL", .status = RIG_STATUS_STABLE, .rig_type = RIG_TYPE_TRANSCEIVER, @@ -353,6 +353,7 @@ const struct rig_caps ft991_caps = .set_ext_level = newcat_set_ext_level, .get_ext_level = newcat_get_ext_level, .send_morse = newcat_send_morse, + .wait_morse = rig_wait_morse, .send_voice_mem = newcat_send_voice_mem, .set_clock = newcat_set_clock, .get_clock = newcat_get_clock, diff --git a/rigs/yaesu/ftdx10.c b/rigs/yaesu/ftdx10.c index 83bd296ef..3ef3876d3 100644 --- a/rigs/yaesu/ftdx10.c +++ b/rigs/yaesu/ftdx10.c @@ -137,7 +137,7 @@ const struct rig_caps ftdx10_caps = RIG_MODEL(RIG_MODEL_FTDX10), .model_name = "FTDX-10", .mfg_name = "Yaesu", - .version = NEWCAT_VER ".2", + .version = NEWCAT_VER ".3", .copyright = "LGPL", .status = RIG_STATUS_STABLE, .rig_type = RIG_TYPE_TRANSCEIVER, @@ -308,6 +308,7 @@ const struct rig_caps ftdx10_caps = .set_ext_level = newcat_set_ext_level, .get_ext_level = newcat_get_ext_level, .send_morse = newcat_send_morse, + .wait_morse = rig_wait_morse, .set_clock = newcat_set_clock, .get_clock = newcat_get_clock, .hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS diff --git a/rigs/yaesu/ftdx101.c b/rigs/yaesu/ftdx101.c index 3d8d049f4..76b97e7ca 100644 --- a/rigs/yaesu/ftdx101.c +++ b/rigs/yaesu/ftdx101.c @@ -137,7 +137,7 @@ const struct rig_caps ftdx101d_caps = RIG_MODEL(RIG_MODEL_FTDX101D), .model_name = "FTDX-101D", .mfg_name = "Yaesu", - .version = NEWCAT_VER ".15", + .version = NEWCAT_VER ".16", .copyright = "LGPL", .status = RIG_STATUS_STABLE, .rig_type = RIG_TYPE_TRANSCEIVER, @@ -309,6 +309,7 @@ const struct rig_caps ftdx101d_caps = .set_ext_level = newcat_set_ext_level, .get_ext_level = newcat_get_ext_level, .send_morse = newcat_send_morse, + .wait_morse = rig_wait_morse, .set_clock = newcat_set_clock, .get_clock = newcat_get_clock, .hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS diff --git a/rigs/yaesu/ftdx101mp.c b/rigs/yaesu/ftdx101mp.c index cf8ea3f7d..349bda879 100644 --- a/rigs/yaesu/ftdx101mp.c +++ b/rigs/yaesu/ftdx101mp.c @@ -75,7 +75,7 @@ const struct rig_caps ftdx101mp_caps = RIG_MODEL(RIG_MODEL_FTDX101MP), .model_name = "FTDX-101MP", .mfg_name = "Yaesu", - .version = NEWCAT_VER ".6", + .version = NEWCAT_VER ".7", .copyright = "LGPL", .status = RIG_STATUS_STABLE, .rig_type = RIG_TYPE_TRANSCEIVER, @@ -246,6 +246,7 @@ const struct rig_caps ftdx101mp_caps = .set_ext_level = newcat_set_ext_level, .get_ext_level = newcat_get_ext_level, .send_morse = newcat_send_morse, + .wait_morse = rig_wait_morse, .set_clock = newcat_set_clock, .get_clock = newcat_get_clock, .hamlib_check_rig_caps = HAMLIB_CHECK_RIG_CAPS