kopia lustrzana https://github.com/Hamlib/Hamlib
Add send_morse to Yaesu rigs -- message is the number of the memory to be played
rodzic
569f21c7fe
commit
49f3452bf2
|
@ -89,7 +89,7 @@ const struct rig_caps ftdx1200_caps =
|
|||
RIG_MODEL(RIG_MODEL_FTDX1200),
|
||||
.model_name = "FTDX-1200",
|
||||
.mfg_name = "Yaesu",
|
||||
.version = NEWCAT_VER ".1",
|
||||
.version = NEWCAT_VER ".2",
|
||||
.copyright = "LGPL",
|
||||
.status = RIG_STATUS_STABLE,
|
||||
.rig_type = RIG_TYPE_TRANSCEIVER,
|
||||
|
@ -256,5 +256,5 @@ const struct rig_caps ftdx1200_caps =
|
|||
.get_channel = newcat_get_channel,
|
||||
.set_ext_level = newcat_set_ext_level,
|
||||
.get_ext_level = newcat_get_ext_level,
|
||||
|
||||
.send_morse = newcat_send_morse,
|
||||
};
|
||||
|
|
|
@ -91,7 +91,7 @@ const struct rig_caps ft2000_caps =
|
|||
RIG_MODEL(RIG_MODEL_FT2000),
|
||||
.model_name = "FT-2000",
|
||||
.mfg_name = "Yaesu",
|
||||
.version = NEWCAT_VER ".0",
|
||||
.version = NEWCAT_VER ".1",
|
||||
.copyright = "LGPL",
|
||||
.status = RIG_STATUS_STABLE,
|
||||
.rig_type = RIG_TYPE_TRANSCEIVER,
|
||||
|
@ -263,5 +263,5 @@ const struct rig_caps ft2000_caps =
|
|||
.get_channel = newcat_get_channel,
|
||||
.set_ext_level = newcat_set_ext_level,
|
||||
.get_ext_level = newcat_get_ext_level,
|
||||
|
||||
.send_morse = newcat_send_morse,
|
||||
};
|
||||
|
|
|
@ -183,7 +183,7 @@ const struct rig_caps ftdx3000_caps =
|
|||
RIG_MODEL(RIG_MODEL_FTDX3000),
|
||||
.model_name = "FTDX-3000",
|
||||
.mfg_name = "Yaesu",
|
||||
.version = NEWCAT_VER ".4",
|
||||
.version = NEWCAT_VER ".5",
|
||||
.copyright = "LGPL",
|
||||
.status = RIG_STATUS_STABLE,
|
||||
.rig_type = RIG_TYPE_TRANSCEIVER,
|
||||
|
@ -347,6 +347,6 @@ const struct rig_caps ftdx3000_caps =
|
|||
.get_channel = newcat_get_channel,
|
||||
.set_ext_level = newcat_set_ext_level,
|
||||
.get_ext_level = newcat_get_ext_level,
|
||||
|
||||
.send_morse = newcat_send_morse,
|
||||
};
|
||||
|
||||
|
|
|
@ -44,7 +44,7 @@ const struct rig_caps ft450_caps =
|
|||
RIG_MODEL(RIG_MODEL_FT450),
|
||||
.model_name = "FT-450",
|
||||
.mfg_name = "Yaesu",
|
||||
.version = NEWCAT_VER ".0",
|
||||
.version = NEWCAT_VER ".1",
|
||||
.copyright = "LGPL",
|
||||
.status = RIG_STATUS_STABLE,
|
||||
.rig_type = RIG_TYPE_TRANSCEIVER,
|
||||
|
@ -201,5 +201,5 @@ const struct rig_caps ft450_caps =
|
|||
.get_trn = newcat_get_trn,
|
||||
.set_channel = newcat_set_channel,
|
||||
.get_channel = newcat_get_channel,
|
||||
|
||||
.send_morse = newcat_send_morse,
|
||||
};
|
||||
|
|
|
@ -88,7 +88,7 @@ const struct rig_caps ftdx5000_caps =
|
|||
RIG_MODEL(RIG_MODEL_FTDX5000),
|
||||
.model_name = "FTDX-5000",
|
||||
.mfg_name = "Yaesu",
|
||||
.version = NEWCAT_VER ".0",
|
||||
.version = NEWCAT_VER ".1",
|
||||
.copyright = "LGPL",
|
||||
.status = RIG_STATUS_STABLE,
|
||||
.rig_type = RIG_TYPE_TRANSCEIVER,
|
||||
|
@ -253,5 +253,5 @@ const struct rig_caps ftdx5000_caps =
|
|||
.get_channel = newcat_get_channel,
|
||||
.set_ext_level = newcat_set_ext_level,
|
||||
.get_ext_level = newcat_get_ext_level,
|
||||
|
||||
.send_morse = newcat_send_morse,
|
||||
};
|
||||
|
|
|
@ -58,7 +58,7 @@ const struct rig_caps ft891_caps =
|
|||
RIG_MODEL(RIG_MODEL_FT891),
|
||||
.model_name = "FT-891",
|
||||
.mfg_name = "Yaesu",
|
||||
.version = NEWCAT_VER ".3",
|
||||
.version = NEWCAT_VER ".4",
|
||||
.copyright = "LGPL",
|
||||
.status = RIG_STATUS_STABLE,
|
||||
.rig_type = RIG_TYPE_TRANSCEIVER,
|
||||
|
@ -237,7 +237,7 @@ const struct rig_caps ft891_caps =
|
|||
.get_trn = newcat_get_trn,
|
||||
.set_channel = newcat_set_channel,
|
||||
.get_channel = newcat_get_channel,
|
||||
|
||||
.send_morse = newcat_send_morse,
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
|
@ -51,7 +51,7 @@ const struct rig_caps ft9000_caps =
|
|||
RIG_MODEL(RIG_MODEL_FT9000),
|
||||
.model_name = "FTDX-9000",
|
||||
.mfg_name = "Yaesu",
|
||||
.version = NEWCAT_VER ".0",
|
||||
.version = NEWCAT_VER ".1",
|
||||
.copyright = "LGPL",
|
||||
.status = RIG_STATUS_UNTESTED,
|
||||
.rig_type = RIG_TYPE_TRANSCEIVER,
|
||||
|
@ -211,5 +211,5 @@ const struct rig_caps ft9000_caps =
|
|||
.get_trn = newcat_get_trn,
|
||||
.set_channel = newcat_set_channel,
|
||||
.get_channel = newcat_get_channel,
|
||||
|
||||
.send_morse = newcat_send_morse,
|
||||
};
|
||||
|
|
|
@ -89,7 +89,7 @@ const struct rig_caps ft950_caps =
|
|||
RIG_MODEL(RIG_MODEL_FT950),
|
||||
.model_name = "FT-950",
|
||||
.mfg_name = "Yaesu",
|
||||
.version = NEWCAT_VER ".1",
|
||||
.version = NEWCAT_VER ".2",
|
||||
.copyright = "LGPL",
|
||||
.status = RIG_STATUS_STABLE,
|
||||
.rig_type = RIG_TYPE_TRANSCEIVER,
|
||||
|
@ -283,5 +283,5 @@ const struct rig_caps ft950_caps =
|
|||
.get_channel = newcat_get_channel,
|
||||
.set_ext_level = newcat_set_ext_level,
|
||||
.get_ext_level = newcat_get_ext_level,
|
||||
|
||||
.send_morse = newcat_send_morse,
|
||||
};
|
||||
|
|
|
@ -67,7 +67,7 @@ const struct rig_caps ft991_caps =
|
|||
RIG_MODEL(RIG_MODEL_FT991),
|
||||
.model_name = "FT-991",
|
||||
.mfg_name = "Yaesu",
|
||||
.version = NEWCAT_VER ".3",
|
||||
.version = NEWCAT_VER ".5",
|
||||
.copyright = "LGPL",
|
||||
.status = RIG_STATUS_STABLE,
|
||||
.rig_type = RIG_TYPE_TRANSCEIVER,
|
||||
|
@ -244,7 +244,7 @@ const struct rig_caps ft991_caps =
|
|||
.get_trn = newcat_get_trn,
|
||||
.set_channel = newcat_set_channel,
|
||||
.get_channel = newcat_get_channel,
|
||||
|
||||
.send_morse = newcat_send_morse,
|
||||
};
|
||||
|
||||
|
||||
|
|
|
@ -244,4 +244,5 @@ const struct rig_caps ftdx10_caps =
|
|||
.get_channel = newcat_get_channel,
|
||||
.set_ext_level = newcat_set_ext_level,
|
||||
.get_ext_level = newcat_get_ext_level,
|
||||
.send_morse = newcat_send_morse,
|
||||
};
|
||||
|
|
|
@ -76,7 +76,7 @@ const struct rig_caps ftdx101d_caps =
|
|||
RIG_MODEL(RIG_MODEL_FTDX101D),
|
||||
.model_name = "FTDX-101D",
|
||||
.mfg_name = "Yaesu",
|
||||
.version = NEWCAT_VER ".11",
|
||||
.version = NEWCAT_VER ".12",
|
||||
.copyright = "LGPL",
|
||||
.status = RIG_STATUS_STABLE,
|
||||
.rig_type = RIG_TYPE_TRANSCEIVER,
|
||||
|
@ -245,4 +245,5 @@ const struct rig_caps ftdx101d_caps =
|
|||
.get_channel = newcat_get_channel,
|
||||
.set_ext_level = newcat_set_ext_level,
|
||||
.get_ext_level = newcat_get_ext_level,
|
||||
.send_morse = newcat_send_morse,
|
||||
};
|
||||
|
|
|
@ -77,7 +77,7 @@ const struct rig_caps ftdx101mp_caps =
|
|||
RIG_MODEL(RIG_MODEL_FTDX101MP),
|
||||
.model_name = "FTDX-101MP",
|
||||
.mfg_name = "Yaesu",
|
||||
.version = NEWCAT_VER ".2",
|
||||
.version = NEWCAT_VER ".3",
|
||||
.copyright = "LGPL",
|
||||
.status = RIG_STATUS_STABLE,
|
||||
.rig_type = RIG_TYPE_TRANSCEIVER,
|
||||
|
@ -246,4 +246,5 @@ const struct rig_caps ftdx101mp_caps =
|
|||
.get_channel = newcat_get_channel,
|
||||
.set_ext_level = newcat_set_ext_level,
|
||||
.get_ext_level = newcat_get_ext_level,
|
||||
.send_morse = newcat_send_morse,
|
||||
};
|
||||
|
|
|
@ -5959,9 +5959,22 @@ int newcat_recv_dtmf(RIG *rig, vfo_t vfo, char *digits, int *length)
|
|||
|
||||
int newcat_send_morse(RIG *rig, vfo_t vfo, const char *msg)
|
||||
{
|
||||
struct newcat_priv_data *priv = (struct newcat_priv_data *)rig->state.priv;
|
||||
int rc;
|
||||
char *s = strdup(msg);
|
||||
ENTERFUNC;
|
||||
|
||||
RETURNFUNC(-RIG_ENAVAIL);
|
||||
if (newcat_is_rig(rig, RIG_MODEL_FT450))
|
||||
{
|
||||
// 450 manual says 1/2/3 playback needs P1=6/7/8
|
||||
s[0] += 5;
|
||||
}
|
||||
else
|
||||
{
|
||||
snprintf(priv->cmd_str, sizeof(priv->cmd_str), "KY%c%c", s[0], cat_term);
|
||||
}
|
||||
rc = newcat_set_cmd(rig);
|
||||
free(s);
|
||||
RETURNFUNC(rc);
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -50,7 +50,7 @@
|
|||
typedef char ncboolean;
|
||||
|
||||
/* shared function version */
|
||||
#define NEWCAT_VER "20210919"
|
||||
#define NEWCAT_VER "20211017"
|
||||
|
||||
/* Hopefully large enough for future use, 128 chars plus '\0' */
|
||||
#define NEWCAT_DATA_LEN 129
|
||||
|
@ -220,6 +220,8 @@ rmode_t newcat_rmode_width(RIG *rig, vfo_t vfo, char mode, pbwidth_t *width);
|
|||
int newcat_set_ext_level(RIG *rig, vfo_t vfo, token_t token, value_t val);
|
||||
int newcat_get_ext_level(RIG *rig, vfo_t vfo, token_t token, value_t *val);
|
||||
|
||||
int newcat_send_morse(RIG *rig, vfo_t vfo, const char *msg);
|
||||
|
||||
#define TOKEN_BACKEND(t) (t)
|
||||
|
||||
#define TOK_ROOFING_FILTER TOKEN_BACKEND(100)
|
||||
|
|
Ładowanie…
Reference in New Issue