Add stop_morse to Icom rigs

https://github.com/Hamlib/Hamlib/issues/240

rigs/icom/ic7100.c

@@ -391,5 +391,6 @@ const struct rig_caps ic7100_caps =
     .get_split_mode = icom_get_split_mode,
     .set_powerstat = icom_set_powerstat,
     .get_powerstat = icom_get_powerstat,
-    .send_morse = icom_send_morse
+    .send_morse = icom_send_morse,
+    .stop_morse = icom_stop_morse
 };

rigs/icom/ic7300.c

@@ -444,6 +444,7 @@ const struct rig_caps ic7300_caps =
     .power2mW = icom_power2mW,
     .mW2power = icom_mW2power,
     .send_morse = icom_send_morse,
+    .stop_morse = icom_stop_morse,
     .send_voice_mem = icom_send_voice_mem
 };
 
@@ -689,6 +690,7 @@ const struct rig_caps ic9700_caps =
     .power2mW = icom_power2mW,
     .mW2power = icom_mW2power,
     .send_morse = icom_send_morse,
+    .stop_morse = icom_stop_morse,
     .send_voice_mem = icom_send_voice_mem
 };
 
@@ -892,6 +894,7 @@ const struct rig_caps ic705_caps =
     .power2mW = icom_power2mW,
     .mW2power = icom_mW2power,
     .send_morse = icom_send_morse,
+    .stop_morse = icom_stop_morse,
     .send_voice_mem = icom_send_voice_mem
 };
 

rigs/icom/ic7410.c

@@ -273,5 +273,6 @@ const struct rig_caps ic7410_caps =
     .set_split_vfo =  icom_set_split_vfo,
     .get_split_vfo =  icom_mem_get_split_vfo,
     .send_morse =  icom_send_morse,
+    .stop_morse =  icom_stop_morse,
 
 };

rigs/icom/ic7610.c

@@ -327,5 +327,5 @@ const struct rig_caps ic7610_caps =
     .get_split_vfo =  icom_get_split_vfo,
     .set_powerstat = icom_set_powerstat,
     .get_powerstat = icom_get_powerstat,
-    .send_morse = icom_send_morse
+    .stop_morse = icom_stop_morse
 };

rigs/icom/ic7700.c

@@ -312,5 +312,6 @@ const struct rig_caps ic7700_caps =
     .get_split_vfo =  icom_get_split_vfo,
     .set_powerstat = icom_set_powerstat,
     .get_powerstat = icom_get_powerstat,
-    .send_morse = icom_send_morse
+    .send_morse = icom_send_morse,
+    .stop_morse = icom_stop_morse
 };

rigs/icom/ic7800.c

@@ -315,7 +315,8 @@ const struct rig_caps ic7800_caps =
     .get_split_vfo =  icom_get_split_vfo,
     .set_powerstat = icom_set_powerstat,
     .get_powerstat = icom_get_powerstat,
-    .send_morse = icom_send_morse
+    .send_morse = icom_send_morse,
+    .stop_morse = icom_stop_morse
 };
 
 /*

rigs/icom/ic785x.c

@@ -321,7 +321,8 @@ const struct rig_caps ic785x_caps =
     .get_split_vfo =  icom_get_split_vfo,
     .set_powerstat =  icom_set_powerstat,
     .get_powerstat =  icom_get_powerstat,
-    .send_morse = icom_send_morse
+    .send_morse = icom_send_morse,
+    .stop_morse = icom_stop_morse
 
 };
 

rigs/icom/icom.c

@@ -6798,6 +6798,39 @@ int icom_send_morse(RIG *rig, vfo_t vfo, const char *msg)
     return RIG_OK;
 }
 
+/*
+ * icom_stop_morse
+ * Assumes rig!=NULL, msg!=NULL
+ */
+int icom_stop_morse(RIG *rig, vfo_t vfo)
+{
+    unsigned char ackbuf[MAXFRAMELEN];
+    unsigned char cmd[MAXFRAMELEN];
+    int ack_len = sizeof(ackbuf), retval;
+    int len;
+
+    rig_debug(RIG_DEBUG_VERBOSE, "%s called\n", __func__);
+
+    cmd[0] = 0xff;
+
+    retval = icom_transaction(rig, C_SND_CW, -1, (unsigned char *) cmd, 1,
+                              ackbuf, &ack_len);
+
+    if (retval != RIG_OK)
+    {
+        return retval;
+    }
+
+    if (ack_len != 1 || ackbuf[0] != ACK)
+    {
+        rig_debug(RIG_DEBUG_ERR, "%s: ack NG (%#.2x), len=%d\n", __func__,
+                  ackbuf[0], ack_len);
+        return -RIG_ERJCTED;
+    }
+
+    return RIG_OK;
+}
+
 int icom_power2mW(RIG *rig, unsigned int *mwpower, float power, freq_t freq,
                   rmode_t mode)
 {

rigs/icom/icom.h

@@ -31,7 +31,7 @@
 #include <sys/time.h>
 #endif
 
-#define BACKEND_VER "20200912"
+#define BACKEND_VER "20201016"
 
 /*
  * defines used by comp_cal_str in rig.c
@@ -115,8 +115,10 @@ typedef enum
     CMD_PARAM_TYPE_FUNC,
 } cmd_param_t;
 
-struct cmdparams {      /* Lookup table item for levels & parms */
+struct cmdparams        /* Lookup table item for levels & parms */
-    union {
+{
+    union
+    {
         setting_t s;    /* Level or parm */
         token_t t;      /* TOKEN_BACKEND */
     } id;
@@ -175,7 +177,8 @@ struct icom_priv_caps
     int offs_len;               /* Number of bytes in offset frequency field. 0 defaults to 3 */
     int serial_USB_echo_check;  /* Flag to test USB echo state */
     int agc_levels_present;     /* Flag to indicate that agc_levels array is populated */
-    struct icom_agc_level agc_levels[RIG_AGC_LAST + 1]; /* Icom rig-specific AGC levels, the last entry should have level -1 */
+    struct icom_agc_level agc_levels[RIG_AGC_LAST +
+                                                      1]; /* Icom rig-specific AGC levels, the last entry should have level -1 */
     struct cmdparams *extcmds;  /* Pointer to extended operations array */
 };
 
@@ -191,8 +194,8 @@ struct icom_priv_data
     int serial_USB_echo_off; /* USB is not set to echo */
     /* we track vfos internally for use with different functions like split */
     /* this allows queries using CURR_VFO and Main/Sub to behave */
-    vfo_t rx_vfo; 
+    vfo_t rx_vfo;
-    vfo_t tx_vfo; 
+    vfo_t tx_vfo;
     freq_t curr_freq; // our current freq depending on which vfo is selected
     freq_t main_freq; // track last setting of main -- not being used yet
     freq_t sub_freq;  // track last setting of sub -- not being used yet
@@ -297,13 +300,15 @@ int icom_get_conf(RIG *rig, token_t token, char *val);
 int icom_set_powerstat(RIG *rig, powerstat_t status);
 int icom_get_powerstat(RIG *rig, powerstat_t *status);
 int icom_set_ant(RIG *rig, vfo_t vfo, ant_t ant, value_t option);
-int icom_get_ant(RIG *rig, vfo_t vfo, ant_t ant, value_t *option, ant_t *ant_curr, ant_t *ant_tx, ant_t *ant_rx);
+int icom_get_ant(RIG *rig, vfo_t vfo, ant_t ant, value_t *option,
+                 ant_t *ant_curr, ant_t *ant_tx, ant_t *ant_rx);
 int icom_decode_event(RIG *rig);
 int icom_power2mW(RIG *rig, unsigned int *mwpower, float power, freq_t freq,
                   rmode_t mode);
 int icom_mW2power(RIG *rig, float *power, unsigned int mwpower, freq_t freq,
                   rmode_t mode);
 int icom_send_morse(RIG *rig, vfo_t vfo, const char *msg);
+int icom_stop_morse(RIG *rig, vfo_t vfo);
 int icom_send_voice_mem(RIG *rig, vfo_t vfo, int bank);
 /* Exposed routines */
 int icom_get_split_vfos(RIG *rig, vfo_t *rx_vfo, vfo_t *tx_vfo);