hamradio/Hamlib
1
0
Fork 0
mirror of https://github.com/Hamlib/Hamlib.git synced 2024-09-21 10:27:18 +00:00
Code Issues Packages Projects Releases Wiki Activity

Change behavior of 'w' command in rigctld for binary commands

Browse Source 
Now responds with hex string just like the input and the # of bytes
Will get hex string response for any binary data from rig from any command
Next step is to implement W command for known # of bytes in response to avoid the timeout
This commit is contained in:
Michael Black 2019-12-06 07:58:19 -06:00
parent de01f4768a
commit 9531f730b1
No known key found for this signature in database
GPG Key ID: 6599353EC683404D
1 changed files with 54 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

59
tests/rigctl_parse.c
View File

@ -4023,6 +4023,9 @@ declare_proto_rig(send_cmd)
char bufcmd[BUFSZ];
char buf[BUFSZ];
char eom_buf[4] = { 0xa, 0xd, 0, 0 };
int binary = 0;
rig_debug(RIG_DEBUG_TRACE, "%s: called\n", __func__);
/*
* binary protocols enter values as \0xZZ\0xYY..
@ -4051,6 +4054,12 @@ declare_proto_rig(send_cmd)
/* no End Of Message chars */
eom_buf[0] = '\0';
}
else if (rig->caps->rig_model == RIG_MODEL_NETRIGCTL)
{
rig_debug(RIG_DEBUG_VERBOSE, "%s: we're using netrigctl\n", __func__);
snprintf(bufcmd, sizeof(bufcmd), "w %s\n", arg1);
cmd_len = strlen(bufcmd);
}
else
{
/* text protocol */
@ -4078,9 +4087,10 @@ declare_proto_rig(send_cmd)
return retval;
}
if (interactive && prompt)
if ((interactive && prompt) || (interactive && !prompt && ext_resp))
{
fprintf(fout, "%s: ", cmd->arg2);
fwrite(cmd->arg1, 1, strlen(cmd->arg1), fout); /* i.e. "Frequency" */
fwrite(":", 1, 1, fout); /* i.e. "Frequency" */
}
do
@ -4102,13 +4112,52 @@ declare_proto_rig(send_cmd)
buf[BUFSZ - 1] = '\0';
}
// we use fwrite in case of any nulls in binary return
fwrite(buf, 1, retval, fout);
fwrite("\n", 1, 1, fout);
if (rig->caps->rig_model != RIG_MODEL_NETRIGCTL)
{
// see if we have binary being returned
int i;
for (i = 0; i < retval; ++i)
{
if (!isprint(buf[i]))
{
binary = 1;
break;
}
}
}
if (binary) // convert our buf to a hex representaion
{
int i;
char hex[64];
rig_debug(RIG_DEBUG_VERBOSE, "%s: sending binary\n", __func__);
for (i = 0; i < retval; ++i)
{
snprintf(hex, sizeof(hex), "\\0x%02X", (unsigned char)buf[i]);
fprintf(fout, "%s", hex);
}
fprintf(fout, " %d\n", retval);
return RIG_OK;
}
else
{
fwrite(buf, 1, strlen(buf), fout);
}
}
while (retval > 0);
// we use fwrite in case of any nulls in binary return
if (binary) { fwrite(buf, 1, retval, fout); }
if (binary)
{
fwrite("\n", 1, 1, fout);
}
if (retval > 0 || retval == -RIG_ETIMEOUT)
{
retval = RIG_OK;