From ec15323293cc5633e2c7421d6093d0f8176199e3 Mon Sep 17 00:00:00 2001 From: Michael Black W9MDB Date: Thu, 18 Jun 2020 17:08:12 -0500 Subject: [PATCH] Adjust time values in ft1000mp.c based on testing with user https://github.com/Hamlib/Hamlib/issues/308 --- rigs/yaesu/ft1000mp.c | 12 ++++++------ rigs/yaesu/ft1000mp.h | 4 +++- 2 files changed, 9 insertions(+), 7 deletions(-) diff --git a/rigs/yaesu/ft1000mp.c b/rigs/yaesu/ft1000mp.c index 911e28797..fe7e11ebb 100644 --- a/rigs/yaesu/ft1000mp.c +++ b/rigs/yaesu/ft1000mp.c @@ -230,8 +230,8 @@ const struct rig_caps ft1000mp_caps = .serial_handshake = RIG_HANDSHAKE_NONE, .write_delay = FT1000MP_WRITE_DELAY, .post_write_delay = FT1000MP_POST_WRITE_DELAY, - .timeout = 500, // was 2000 -- see https://github.com/Hamlib/Hamlib/issues/308 - .retry = 1, + .timeout = 400, // was 2000 -- see https://github.com/Hamlib/Hamlib/issues/308 + .retry = 6, .has_get_func = FT1000MP_FUNC_ALL, .has_set_func = FT1000MP_FUNC_ALL, .has_get_level = FT1000MP_LEVEL_GET, @@ -358,8 +358,8 @@ const struct rig_caps ft1000mpmkv_caps = .serial_handshake = RIG_HANDSHAKE_NONE, .write_delay = FT1000MP_WRITE_DELAY, .post_write_delay = FT1000MP_POST_WRITE_DELAY, - .timeout = 1000, - .retry = 1, + .timeout = 400, + .retry = 6, .has_get_func = FT1000MP_FUNC_ALL, .has_set_func = FT1000MP_FUNC_ALL, .has_get_level = FT1000MP_LEVEL_GET, @@ -486,8 +486,8 @@ const struct rig_caps ft1000mpmkvfld_caps = .serial_handshake = RIG_HANDSHAKE_NONE, .write_delay = FT1000MP_WRITE_DELAY, .post_write_delay = FT1000MP_POST_WRITE_DELAY, - .timeout = 1000, - .retry = 1, + .timeout = 400, + .retry = 6, .has_get_func = FT1000MP_FUNC_ALL, .has_set_func = FT1000MP_FUNC_ALL, .has_get_level = FT1000MP_LEVEL_GET, diff --git a/rigs/yaesu/ft1000mp.h b/rigs/yaesu/ft1000mp.h index b7838b8c7..f04cc18bc 100644 --- a/rigs/yaesu/ft1000mp.h +++ b/rigs/yaesu/ft1000mp.h @@ -30,7 +30,7 @@ #define FT1000MP_PACING_INTERVAL 5 #define FT1000MP_PACING_DEFAULT_VALUE 0 -#define FT1000MP_WRITE_DELAY 50 +#define FT1000MP_WRITE_DELAY 5 /* Delay sequential fast writes */ @@ -202,6 +202,8 @@ int ft1000mp_close(RIG *rig); int ft1000mp_set_freq(RIG *rig, vfo_t vfo, freq_t freq); int ft1000mp_get_freq(RIG *rig, vfo_t vfo, freq_t *freq); +int ft1000mp_set_split_vfo(RIG *rig, vfo_t vfo, split_t split, vfo_t tx_vfo); + int ft1000mp_set_mode(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width); /* select mode */ int ft1000mp_get_mode(RIG *rig, vfo_t vfo, rmode_t *mode, pbwidth_t *width); /* get mode */