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

added a debug/verbose flag to the primary address scan utils

Browse Source
This commit is contained in:
Robert Johansson 2012-05-13 16:34:34 +09:00
parent 726f837d2d
commit dadf3b4823
2 changed files with 51 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -25,20 +25,31 @@ main(int argc, char **argv)
{
mbus_handle *handle;
char *device;
int address, baudrate = 9600;
int address, baudrate = 9600, debug = 0;
if (argc == 2)
{
device = argv[1];
}
else if (argc == 3 && strcmp(argv[1], "-d") == 0)
{
debug = 1;
device = argv[2];
}
else if (argc == 4 && strcmp(argv[1], "-b") == 0)
{
baudrate = atoi(argv[2]);
device = argv[3];
}
else if (argc == 5 && strcmp(argv[1], "-d") == 0 && strcmp(argv[2], "-b") == 0)
{
debug = 1;
baudrate = atoi(argv[3]);
device = argv[4];
}
else
{
fprintf(stderr, "usage: %s [-b BAUDRATE] device\n", argv[0]);
fprintf(stderr, "usage: %s [-d] [-b BAUDRATE] device\n", argv[0]);
return 0;
}
@ -54,6 +65,8 @@ main(int argc, char **argv)
return 1;
}
if (debug)
printf("Scanning primary addresses:\n");
for (address = 0; address < 254; address++)
{
@ -61,6 +74,12 @@ main(int argc, char **argv)
memset((void *)&reply, 0, sizeof(mbus_frame));
if (debug)
{
printf("%d ", address);
fflush(stdout);
}
if (mbus_send_ping_frame(handle, address) == -1)
{
printf("Scan failed. Could not send ping frame: %s\n", mbus_error_str());
@ -74,6 +93,9 @@ main(int argc, char **argv)
if (mbus_frame_type(&reply) == MBUS_FRAME_TYPE_ACK)
{
if (debug)
printf("\n");
printf("Found a M-Bus device at address %d\n", address);
}
}

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

@ -26,27 +26,44 @@ main(int argc, char **argv)
{
mbus_handle *handle;
char *host;
int port, address;
int port, address, debug = 0;
if (argc != 3)
if (argc == 3)
{
printf("usage: %s host port\n", argv[0]);
host = argv[1];
port = atoi(argv[2]);
}
else if (argc == 4 && strcmp(argv[1], "-d") == 0)
{
debug = 1;
host = argv[2];
port = atoi(argv[3]);
}
else
{
printf("usage: %s [-d] host port\n", argv[0]);
return 0;
}
host = argv[1];
port = atoi(argv[2]);
if ((handle = mbus_connect_tcp(host, port)) == NULL)
{
printf("Scan failed: Could not setup connection to M-bus gateway: %s\n", mbus_error_str());
return 1;
}
if (debug)
printf("Scanning primary addresses:\n");
for (address = 0; address < 254; address++)
{
mbus_frame reply;
if (debug)
{
printf("%d ", address);
fflush(stdout);
}
if (mbus_send_ping_frame(handle, address) == -1)
{
printf("Scan failed. Could not send ping frame: %s\n", mbus_error_str());
@ -60,6 +77,9 @@ main(int argc, char **argv)
if (mbus_frame_type(&reply) == MBUS_FRAME_TYPE_ACK)
{
if (debug)
printf("\n");
printf("Found a M-Bus device at address %d\n", address);
}
}