Merge branch 'master' of https://github.com/mdblack98/Hamlib

rigs/kenwood/flex6xxx.c

@@ -326,7 +326,7 @@ const struct rig_caps f6k_caps =
     .port_type =        RIG_PORT_NETWORK,
     // -spc- TODO set this reasonably, don't know what the flex should be
     .timeout =      600,    /* FA and FB make take up to 500 ms on band change */
-    .retry =        3,
+    .retry =        10,
 
     .has_get_func =     RIG_FUNC_NONE, /* has VOX but not implemented here */
     .has_set_func =     RIG_FUNC_NONE,
@@ -338,6 +338,7 @@ const struct rig_caps f6k_caps =
     .parm_gran =        {},
     //.extlevels =      elecraft_ext_levels,
     //.extparms =       kenwood_cfg_params,
+    .post_write_delay = 20,
     .preamp =       { RIG_DBLST_END, },
     .attenuator =       { RIG_DBLST_END, },
     .max_rit =      Hz(0),

rigs/kenwood/kenwood.c

@@ -74,6 +74,8 @@ static const struct kenwood_id kenwood_id_list[] =
     { RIG_MODEL_TS711, 3 },
     { RIG_MODEL_TS440, 4 },
     { RIG_MODEL_R5000, 5 },
+    { RIG_MODEL_TS140S, 6 },
+//    { RIG_MODEL_TS680S, 6 }, // The TS680S is supposed #6 too but it will return as TS140S since it matches it
     { RIG_MODEL_TS790, 7 },
     { RIG_MODEL_TS950S, 8 },
     { RIG_MODEL_TS850, 9 },
@@ -102,6 +104,7 @@ static const struct kenwood_id_string kenwood_id_string_list[] =
     { RIG_MODEL_TS711,  "003" },
     { RIG_MODEL_TS440,  "004" },
     { RIG_MODEL_R5000,  "005" },
+    { RIG_MODEL_TS140S, "006" },
     { RIG_MODEL_TS790,  "007" },
     { RIG_MODEL_TS950S, "008" },
     { RIG_MODEL_TS850,  "009" },

rigs/kenwood/ts140.c

@@ -172,7 +172,7 @@ const struct rig_caps ts140_caps =
     .priv = (void *)& ts140_priv_caps,
 
     .rig_init = kenwood_init,
-    .rig_open = kenwood_open, // we don't know the ID for this rig
+    .rig_open = kenwood_open,
     .rig_cleanup = kenwood_cleanup,
     .set_freq =  kenwood_set_freq,
     .get_freq =  kenwood_get_freq,