Commit d04f4b6

committed

Add validation handling for SH and RF in newcat.c

Fix FTDX10 SH command formatting Hamlib/Hamlib#973

1 parent 1874f3a commit d04f4b6Copy full SHA for d04f4b6

File tree

+12

-2

lines changed

+12

-2

lines changed

Lines changed: 11 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -8515,7 +8515,7 @@ int newcat_set_rx_bandwidth(RIG *rig, vfo_t vfo, rmode_t mode, pbwidth_t width)`
`8515`	`8515`	`SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "SH%c%d%02d;", main_sub_vfo, on,`
`8516`	`8516`	`w);`
`8517`	`8517`	`}`
`8518`		`- else if (is_ft2000 \|\| is_ftdx10\|\|is_ftdx3000)`
	`8518`	`+ else if (is_ft2000 \|\| is_ftdx3000)`
`8519`	`8519`	`{`
`8520`	`8520`	`SNPRINTF(priv->cmd_str, sizeof(priv->cmd_str), "SH0%02d;", w);`
`8521`	`8521`	`}`
`@@ -10350,6 +10350,16 @@ int newcat_set_cmd_validate(RIG *rig)`
`10350`	`10350`	`{`
`10351`	`10351`	`strcpy(valcmd, ""); // nothing to validate`
`10352`	`10352`	`}`
	`10353`	`+ else if (strncmp(priv->cmd_str, "SH", 2) == 0)`
	`10354`	`+ {`
	`10355`	`+ // could validate with SH but different formats need to be handled`
	`10356`	`+ strcpy(valcmd, ""); // nothing to validate`
	`10357`	`+ }`
	`10358`	`+ else if (strncmp(priv->cmd_str, "RF", 2) == 0)`
	`10359`	`+ {`
	`10360`	`+ // could validate with RF but different formats need to be handled`
	`10361`	`+ strcpy(valcmd, ""); // nothing to validate`
	`10362`	`+ }`
`10353`	`10363`	`else`
`10354`	`10364`	`{`
`10355`	`10365`	`rig_debug(RIG_DEBUG_TRACE, "%s: %s not implemented\n", __func__, priv->cmd_str);`

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -50,7 +50,7 @@`
`50`	`50`	`typedef char ncboolean;`
`51`	`51`
`52`	`52`	`/* shared function version */`
`53`		`-#define NEWCAT_VER "20220220"`
	`53`	`+#define NEWCAT_VER "20220221"`
`54`	`54`
`55`	`55`	`/* Hopefully large enough for future use, 128 chars plus '0円' */`
`56`	`56`	`#define NEWCAT_DATA_LEN 129`

Comments

(0)