From 0063cb7549a7393957a80bb4010864adda88b727 Mon Sep 17 00:00:00 2001 From: Michael Black W9MDB Date: Tue, 30 Mar 2021 10:53:47 -0500 Subject: [PATCH 1/2] In ft857.c add a 200ms delay during set_ptt OFF -- seems to take a while to come out of TX https://github.com/Hamlib/Hamlib/issues/636 --- rigs/yaesu/ft857.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/rigs/yaesu/ft857.c b/rigs/yaesu/ft857.c index 0ed04f5e8..eb133ba9e 100644 --- a/rigs/yaesu/ft857.c +++ b/rigs/yaesu/ft857.c @@ -155,7 +155,7 @@ const struct rig_caps ft857_caps = RIG_MODEL(RIG_MODEL_FT857), .model_name = "FT-857", .mfg_name = "Yaesu", - .version = "20210221.0", + .version = "20210330.0", .copyright = "LGPL", .status = RIG_STATUS_STABLE, .rig_type = RIG_TYPE_TRANSCEIVER, @@ -1083,6 +1083,7 @@ int ft857_set_ptt(RIG *rig, vfo_t vfo, ptt_t ptt) } n = ft857_send_cmd(rig, index); + if (ptt == RIG_PTT_OFF) hl_usleep(200*1000); // FT857 takes a bit to come out of PTT rig_force_cache_timeout(&((struct ft857_priv_data *) rig->state.priv)->tx_status_tv); From 91527ccd54b85d6db4bee71b47728c7dec60f816 Mon Sep 17 00:00:00 2001 From: Michael Black W9MDB Date: Tue, 30 Mar 2021 11:25:13 -0500 Subject: [PATCH 2/2] Fix merge error in ft857.c https://github.com/Hamlib/Hamlib/issues/636 --- rigs/yaesu/ft857.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/rigs/yaesu/ft857.c b/rigs/yaesu/ft857.c index b4d6df76a..3b0768ef5 100644 --- a/rigs/yaesu/ft857.c +++ b/rigs/yaesu/ft857.c @@ -155,11 +155,7 @@ const struct rig_caps ft857_caps = RIG_MODEL(RIG_MODEL_FT857), .model_name = "FT-857", .mfg_name = "Yaesu", -<<<<<<< HEAD .version = "20210330.0", -======= - .version = "20210329.0", ->>>>>>> e70d33f59db41d586d76a7db2d6a3427019f7325 .copyright = "LGPL", .status = RIG_STATUS_STABLE, .rig_type = RIG_TYPE_TRANSCEIVER,