hamradio/Hamlib
1
0
Fork 0
mirror of https://github.com/Hamlib/Hamlib.git synced 2024-09-23 03:17:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add rig_flush function

Browse Source 
https://github.com/Hamlib/Hamlib/issues/307
This commit is contained in:
Michael Black W9MDB 2020-06-22 23:54:11 -05:00
parent 253a3d8643
commit 835caf34f9
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
include/hamlib/rig.h
View File

@ -2112,6 +2112,9 @@ extern HAMLIB_EXPORT(int) rig_open HAMLIB_PARAMS((RIG *rig));
* List Set/Get functions pairs
*/
extern HAMLIB_EXPORT(int)
rig_flush(RIG *rig);
extern HAMLIB_EXPORT(int)
rig_set_freq HAMLIB_PARAMS((RIG *rig,
vfo_t vfo,

22
src/misc.c
View File

@ -54,6 +54,8 @@
#include <hamlib/amplifier.h>
#include "misc.h"
#include "serial.h"
#include "network.h"
/**
@ -1385,8 +1387,9 @@ int HAMLIB_API parse_hoststr(char *hoststr, char host[256], char port[6])
dummy[0] = 0;
// Handle device names 1st
if (strstr(hoststr, "/dev")) return -1;
if (strncasecmp(hoststr, "com", 3)==0) return -1;
if (strstr(hoststr, "/dev")) { return -1; }
if (strncasecmp(hoststr, "com", 3) == 0) { return -1; }
// bracketed IPV6 with optional port
int n = sscanf(hoststr, "[%255[^]]]:%5s", host, port);
@ -1399,6 +1402,7 @@ int HAMLIB_API parse_hoststr(char *hoststr, char host[256], char port[6])
// non-bracketed full IPV6 with optional link addr
n = sscanf(hoststr, "%x:%x:%x:%x:%x:%x:%x:%x%%%31[^:]:%5s", &net1, &net2, &net3,
&net4, &net5, &net6, &net7, &net8, link, port);
if (n == 8 || n == 9)
{
strcpy(host, hoststr);
@ -1411,6 +1415,7 @@ int HAMLIB_API parse_hoststr(char *hoststr, char host[256], char port[6])
*p = 0;
return RIG_OK;
}
// non-bracketed IPV6 with optional link addr and optional port
n = sscanf(hoststr, "%x::%x:%x:%x:%x%%%31[^:]:%5s", &net1, &net2, &net3,
&net4, &net5, link, port);
@ -1475,6 +1480,17 @@ int HAMLIB_API parse_hoststr(char *hoststr, char host[256], char port[6])
return -1;
}
int HAMLIB_API rig_flush(RIG *rig)
{
if (rig->state.rigport.type.rig == RIG_PORT_NETWORK
|| rig->state.rigport.type.rig == RIG_PORT_UDP_NETWORK)
{
network_flush(&rig->state.rigport);
return RIG_OK;
}
return serial_flush(&rig->state.rigport);
}
//! @endcond
/** @} */
/** @} */