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

Replaced magic resultcodes from mbus_recv_frame with defines

Browse Source
This commit is contained in:
Stefan Wahren
2012-07-11 23:33:52 +02:00
parent ff37c4af8c
commit e6a52f97ea
11 changed files with 43 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
bin/mbus-serial-request-data.c
View File

@ -132,7 +132,7 @@ main(int argc, char **argv)
}
}
if (mbus_recv_frame(handle, &reply) != 0)
if (mbus_recv_frame(handle, &reply) != MBUS_RECV_RESULT_OK)
{
fprintf(stderr, "Failed to receive M-Bus response frame.\n");
return 1;

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

@ -103,7 +103,7 @@ main(int argc, char **argv)
ret = mbus_recv_frame(handle, &reply);
if (ret == -3)
if (ret == MBUS_RECV_RESULT_TIMEOUT)
{
continue;
}
@ -111,7 +111,7 @@ main(int argc, char **argv)
if (debug)
printf("\n");
if (ret == -2)
if (ret == MBUS_RECV_RESULT_INVALID)
{
/* check for more data (collision) */
mbus_purge_frames(handle);

6
bin/mbus-serial-select-secondary.c
View File

@ -79,13 +79,13 @@ main(int argc, char **argv)
ret = mbus_recv_frame(handle, &reply);
if (ret == -3)
if (ret == MBUS_RECV_RESULT_TIMEOUT)
{
printf("No reply from device with secondary address %s: %s\n", argv[2], mbus_error_str());
return 1;
}
if (ret == -2)
if (ret == MBUS_RECV_RESULT_INVALID)
{
printf("Invalid reply from %s: The address address probably match more than one device: %s\n", argv[2], mbus_error_str());
return 1;
@ -99,7 +99,7 @@ main(int argc, char **argv)
return 1;
}
if (mbus_recv_frame(handle, &reply) != 0)
if (mbus_recv_frame(handle, &reply) != MBUS_RECV_RESULT_OK)
{
printf("Failed to recieve reply from selected secondary device: %s\n", mbus_error_str());
return 1;

2
bin/mbus-serial-switch-baudrate.c
View File

@ -78,7 +78,7 @@ main(int argc, char **argv)
ret = mbus_recv_frame(handle, &reply);
if (ret == -3)
if (ret == MBUS_RECV_RESULT_TIMEOUT)
{
printf("No reply from device\n");
return 1;

2
bin/mbus-tcp-request-data.c
View File

@ -117,7 +117,7 @@ main(int argc, char **argv)
}
}
if (mbus_recv_frame(handle, &reply) != 0)
if (mbus_recv_frame(handle, &reply) != MBUS_RECV_RESULT_OK)
{
fprintf(stderr, "Failed to receive M-Bus response frame: %s\n", mbus_error_str());
return 1;

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

@ -86,7 +86,7 @@ main(int argc, char **argv)
ret = mbus_recv_frame(handle, &reply);
if (ret == -3)
if (ret == MBUS_RECV_RESULT_TIMEOUT)
{
continue;
}
@ -94,7 +94,7 @@ main(int argc, char **argv)
if (debug)
printf("\n");
if (ret == -2)
if (ret == MBUS_RECV_RESULT_INVALID)
{
/* check for more data (collision) */
mbus_purge_frames(handle);

6
bin/mbus-tcp-select-secondary.c
View File

@ -65,13 +65,13 @@ main(int argc, char **argv)
ret = mbus_recv_frame(handle, &reply);
if (ret == -3)
if (ret == MBUS_RECV_RESULT_TIMEOUT)
{
printf("No reply from device with secondary address %s: %s\n", argv[3], mbus_error_str());
return 1;
}
if (ret == -2)
if (ret == MBUS_RECV_RESULT_INVALID)
{
printf("Invalid reply from %s: The address address probably match more than one device: %s\n", argv[3], mbus_error_str());
return 1;
@ -85,7 +85,7 @@ main(int argc, char **argv)
return 1;
}
if (mbus_recv_frame(handle, &reply) != 0)
if (mbus_recv_frame(handle, &reply) != MBUS_RECV_RESULT_OK)
{
printf("Failed to recieve reply from selected secondary device: %s\n", mbus_error_str());
return 1;