wn/libmbus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

resolved conflict

Browse Source
This commit is contained in:
Robert Johansson 2012-04-13 11:00:10 +09:00
parent bd3c270621
commit 748db590d7
2 changed files with 1 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libmbus/bin/mbus-tcp-request-data-multi-reply.c
View File

@ -94,29 +94,10 @@ main(int argc, char **argv)
// primary addressing // primary addressing
address = atoi(addr_str); address = atoi(addr_str);
} }
/*
if (mbus_send_request_frame(handle, address) == -1)
{
fprintf(stderr, "Failed to send M-Bus request frame.\n");
return 1;
}
if (mbus_recv_frame(handle, &reply) == -1)
{
fprintf(stderr, "Failed to receive M-Bus response frame.\n");
return 1;
}
*/
// instead of the send and recv, use this sendrecv function that // instead of the send and recv, use this sendrecv function that
<<<<<<< HEAD
// takes care of the possibility of multi-telegram replies
if (mbus_sendrecv_request(handle, address, &reply) == -1)
=======
// takes care of the possibility of multi-telegram replies (limit = 16 frames) // takes care of the possibility of multi-telegram replies (limit = 16 frames)
if (mbus_sendrecv_request(handle, address, &reply, 16) == -1) if (mbus_sendrecv_request(handle, address, &reply, 16) == -1)
>>>>>>> 58c2bbe2338cc1c5e30fa4cb1d52f5cb56ae9801
{ {
fprintf(stderr, "Failed to send/receive M-Bus request.\n"); fprintf(stderr, "Failed to send/receive M-Bus request.\n");
return 1; return 1;

2
libmbus/mbus/mbus-protocol.h
View File

@ -171,7 +171,7 @@ typedef struct _mbus_data_variable {
mbus_data_variable_header header; mbus_data_variable_header header;
mbus_data_record *record; // XXX: this max num must be dynamic mbus_data_record *record;
size_t nrecords; size_t nrecords;
u_char *data; u_char *data;