kopia lustrzana https://github.com/Hamlib/Hamlib
rodzic
fddddf1f6f
commit
aa9c3b39ba
|
@ -297,7 +297,7 @@ static int multicast_send_json(RIG *rig)
|
|||
// sprintf(msg,"%s:f=%.1f", date_strget(msg, (int)sizeof(msg), 0), f);
|
||||
msg[0] = 0;
|
||||
snprintf(buf, sizeof(buf), "%s:%s", rig->caps->model_name,
|
||||
rig->state.rigport.pathname);
|
||||
RIGPORT(rig)->pathname);
|
||||
strcat(msg, "{\n");
|
||||
json_add_string(msg, "ID", buf, 1);
|
||||
json_add_time(msg, 1);
|
||||
|
@ -339,7 +339,7 @@ void *multicast_thread_rx(void *vrig)
|
|||
while (rig->state.multicast->runflag)
|
||||
{
|
||||
#if 0
|
||||
ret = read_string(&rig->state.rigport, (unsigned char *) buf, sizeof(buf), "\n",
|
||||
ret = read_string(RIGPORT(rig), (unsigned char *) buf, sizeof(buf), "\n",
|
||||
1,
|
||||
0, 1);
|
||||
#endif
|
||||
|
@ -652,8 +652,8 @@ int main(int argc, const char *argv[])
|
|||
return 1;
|
||||
}
|
||||
|
||||
strncpy(rig->state.rigport.pathname, "/dev/ttyUSB0", HAMLIB_FILPATHLEN - 1);
|
||||
rig->state.rigport.parm.serial.rate = 38400;
|
||||
strncpy(RIGPORT(rig)->pathname, "/dev/ttyUSB0", HAMLIB_FILPATHLEN - 1);
|
||||
RIGPORT(rig)->parm.serial.rate = 38400;
|
||||
rig_open(rig);
|
||||
multicast_init(rig, "224.0.0.1", 4532);
|
||||
pthread_join(rig->state.multicast->threadid, NULL);
|
||||
|
|
10
src/serial.c
10
src/serial.c
|
@ -1051,7 +1051,7 @@ int HAMLIB_API ser_set_rts(hamlib_port_t *p, int state)
|
|||
|
||||
/**
|
||||
* \brief Get RTS bit
|
||||
* \param p supposed to be &rig->state.rigport
|
||||
* \param p supposed to be RIGPORT(rig)
|
||||
* \param state non-NULL
|
||||
*/
|
||||
int HAMLIB_API ser_get_rts(hamlib_port_t *p, int *state)
|
||||
|
@ -1134,7 +1134,7 @@ int HAMLIB_API ser_set_dtr(hamlib_port_t *p, int state)
|
|||
|
||||
/**
|
||||
* \brief Get DTR bit
|
||||
* \param p supposed to be &rig->state.rigport
|
||||
* \param p supposed to be RIGPORT(rig)
|
||||
* \param state non-NULL
|
||||
*/
|
||||
int HAMLIB_API ser_get_dtr(hamlib_port_t *p, int *state)
|
||||
|
@ -1186,7 +1186,7 @@ int HAMLIB_API ser_set_brk(const hamlib_port_t *p, int state)
|
|||
|
||||
/**
|
||||
* \brief Get Carrier (CI?) bit
|
||||
* \param p supposed to be &rig->state.rigport
|
||||
* \param p supposed to be RIGPORT(rig)
|
||||
* \param state non-NULL
|
||||
*/
|
||||
int HAMLIB_API ser_get_car(hamlib_port_t *p, int *state)
|
||||
|
@ -1209,7 +1209,7 @@ int HAMLIB_API ser_get_car(hamlib_port_t *p, int *state)
|
|||
|
||||
/**
|
||||
* \brief Get Clear to Send (CTS) bit
|
||||
* \param p supposed to be &rig->state.rigport
|
||||
* \param p supposed to be RIGPORT(rig)
|
||||
* \param state non-NULL
|
||||
*/
|
||||
int HAMLIB_API ser_get_cts(hamlib_port_t *p, int *state)
|
||||
|
@ -1232,7 +1232,7 @@ int HAMLIB_API ser_get_cts(hamlib_port_t *p, int *state)
|
|||
|
||||
/**
|
||||
* \brief Get Data Set Ready (DSR) bit
|
||||
* \param p supposed to be &rig->state.rigport
|
||||
* \param p supposed to be RIGPORT(rig)
|
||||
* \param state non-NULL
|
||||
*/
|
||||
int HAMLIB_API ser_get_dsr(hamlib_port_t *p, int *state)
|
||||
|
|
|
@ -22,7 +22,7 @@ static int snapshot_serialize_rig(cJSON *rig_node, RIG *rig)
|
|||
|
||||
cJSON *id_node = cJSON_CreateObject();
|
||||
cJSON_AddStringToObject(id_node, "model", rig->caps->model_name);
|
||||
cJSON_AddStringToObject(id_node, "endpoint", rig->state.rigport.pathname);
|
||||
cJSON_AddStringToObject(id_node, "endpoint", RIGPORT(rig)->pathname);
|
||||
cJSON_AddStringToObject(id_node, "process", snapshot_data_pid);
|
||||
cJSON_AddStringToObject(id_node, "deviceId", rig->state.device_id);
|
||||
cJSON_AddItemToObject(rig_node, "id", id_node);
|
||||
|
|
Ładowanie…
Reference in New Issue