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

New parameter for mbus_send_ping_frame to purge response

Browse Source
This commit is contained in:
Stefan Wahren 2012-09-01 22:51:44 +02:00
parent d2608d5de7
commit 1a538e73aa
4 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/mbus-serial-scan.c
View File

@ -95,7 +95,7 @@ main(int argc, char **argv)
fflush(stdout); fflush(stdout);
} }
if (mbus_send_ping_frame(handle, address) == -1) if (mbus_send_ping_frame(handle, address, 0) == -1)
{ {
printf("Scan failed. Could not send ping frame: %s\n", mbus_error_str()); printf("Scan failed. Could not send ping frame: %s\n", mbus_error_str());
return 1; return 1;

2
bin/mbus-tcp-scan.c
View File

@ -78,7 +78,7 @@ main(int argc, char **argv)
fflush(stdout); fflush(stdout);
} }
if (mbus_send_ping_frame(handle, address) == -1) if (mbus_send_ping_frame(handle, address, 0) == -1)
{ {
printf("Scan failed. Could not send ping frame: %s\n", mbus_error_str()); printf("Scan failed. Could not send ping frame: %s\n", mbus_error_str());
return 1; return 1;

12
mbus/mbus-protocol-aux.c
View File

@ -1786,10 +1786,10 @@ mbus_sendrecv_request(mbus_handle *handle, int address, mbus_frame *reply, int m
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
// send a data request packet to from master to slave // send a data request packet to from master to slave and optional purge response
//------------------------------------------------------------------------------ //------------------------------------------------------------------------------
int int
mbus_send_ping_frame(mbus_handle *handle, int address) mbus_send_ping_frame(mbus_handle *handle, int address, char purge_response)
{ {
int retval = 0; int retval = 0;
mbus_frame *frame; mbus_frame *frame;
@ -1808,7 +1808,13 @@ mbus_send_ping_frame(mbus_handle *handle, int address)
if (mbus_send_frame(handle, frame) == -1) if (mbus_send_frame(handle, frame) == -1)
{ {
MBUS_ERROR("%s: failed to send mbus frame.\n", __PRETTY_FUNCTION__); MBUS_ERROR("%s: failed to send mbus frame.\n", __PRETTY_FUNCTION__);
retval = -1; mbus_frame_free(frame);
return -1;
}
if (purge_response)
{
mbus_purge_frames(handle);
} }
mbus_frame_free(frame); mbus_frame_free(frame);

3
mbus/mbus-protocol-aux.h
View File

@ -267,10 +267,11 @@ int mbus_sendrecv_request(mbus_handle *handle, int address, mbus_frame *reply, i
* *
* @param handle Initialized handle * @param handle Initialized handle
* @param address Address (0-255) * @param address Address (0-255)
* @param purge_response Response flag (=0 don't receive response, >0 purge response)
* *
* @return Zero when successful. * @return Zero when successful.
*/ */
int mbus_send_ping_frame(mbus_handle *handle, int address); int mbus_send_ping_frame(mbus_handle *handle, int address, char purge_response);
/** /**
* Select slave by secondary address using "unified" handle * Select slave by secondary address using "unified" handle