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

Added frame tracing (hex format) via debug switch

Browse Source
This commit is contained in:
Stefan Wahren
2012-05-15 22:57:03 +02:00
parent 4178ffceb1
commit 90aec91bff
10 changed files with 137 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
bin/mbus-serial-request-data-multi-reply.c
View File

@ -66,6 +66,12 @@ main(int argc, char **argv)
fprintf(stderr, " optional flag -b for selecting baudrate\n");
return 0;
}
if (debug)
{
mbus_register_send_event(&mbus_dump_send_event);
mbus_register_recv_event(&mbus_dump_recv_event);
}
if ((handle = mbus_connect_serial(device)) == NULL)
{

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

@ -63,6 +63,12 @@ main(int argc, char **argv)
fprintf(stderr, " optional flag -b for selecting baudrate\n");
return 0;
}
if (debug)
{
mbus_register_send_event(&mbus_dump_send_event);
mbus_register_recv_event(&mbus_dump_recv_event);
}
if ((handle = mbus_connect_serial(device)) == NULL)
{

38
bin/mbus-serial-scan-secondary.c
View File

@ -17,6 +17,8 @@
#include <stdio.h>
#include <mbus/mbus.h>
static int debug = 0;
//------------------------------------------------------------------------------
// Scan for devices using secondary addressing.
//------------------------------------------------------------------------------
@ -32,30 +34,64 @@ main(int argc, char **argv)
device = argv[1];
addr_mask = strdup("FFFFFFFFFFFFFFFF");
}
else if (argc == 3 && strcmp(argv[1], "-d") == 0)
{
device = argv[2];
addr_mask = strdup("FFFFFFFFFFFFFFFF");
debug = 1;
}
else if (argc == 3)
{
device = argv[1];
addr_mask = strdup(argv[2]);
}
else if (argc == 4 && strcmp(argv[1], "-d") == 0)
{
device = argv[1];
addr_mask = strdup(argv[2]);
debug = 1;
}
else if (argc == 4 && strcmp(argv[1], "-b") == 0)
{
baudrate = atoi(argv[2]);
device = argv[3];
addr_mask = strdup("FFFFFFFFFFFFFFFF");
}
else if (argc == 5 && strcmp(argv[1], "-d") == 0)
{
baudrate = atoi(argv[3]);
device = argv[4];
addr_mask = strdup("FFFFFFFFFFFFFFFF");
debug = 1;
}
else if (argc == 5 && strcmp(argv[1], "-b") == 0)
{
baudrate = atoi(argv[2]);
device = argv[3];
addr_mask = strdup(argv[4]);
}
else if (argc == 6 && strcmp(argv[1], "-d") == 0)
{
baudrate = atoi(argv[3]);
device = argv[4];
addr_mask = strdup(argv[5]);
debug = 1;
}
else
{
fprintf(stderr, "usage: %s [-b BAUDRATE] device [address-mask]\n", argv[0]);
fprintf(stderr, "usage: %s [-d] [-b BAUDRATE] device [address-mask]\n", argv[0]);
fprintf(stderr, "\toptional flag -d for debug printout\n");
fprintf(stderr, "\toptional flag -b for selecting baudrate\n");
fprintf(stderr, "\trestrict the search by supplying an optional address mask on the form\n");
fprintf(stderr, "\t'FFFFFFFFFFFFFFFF' where F is a wildcard character\n");
return 0;
}
if (debug)
{
mbus_register_send_event(&mbus_dump_send_event);
mbus_register_recv_event(&mbus_dump_recv_event);
}
if (strlen(addr_mask) != 16)
{

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

@ -17,6 +17,8 @@
#include <stdio.h>
#include <mbus/mbus.h>
static int debug = 0;
//------------------------------------------------------------------------------
// Primary addressing scanning of mbus devices.
//------------------------------------------------------------------------------
@ -25,7 +27,7 @@ main(int argc, char **argv)
{
mbus_handle *handle;
char *device;
int address, baudrate = 9600, debug = 0;
int address, baudrate = 9600;
if (argc == 2)
{
@ -53,6 +55,12 @@ main(int argc, char **argv)
return 0;
}
if (debug)
{
mbus_register_send_event(&mbus_dump_send_event);
mbus_register_recv_event(&mbus_dump_recv_event);
}
if ((handle = mbus_connect_serial(device)) == NULL)
{
printf("Failed to setup connection to M-bus gateway\n");

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

@ -42,7 +42,8 @@ main(int argc, char **argv)
}
else
{
fprintf(stderr, "usage: %s device secondary-mbus-address\n", argv[0]);
fprintf(stderr, "usage: %s [-b BAUDRATE] device secondary-mbus-address\n", argv[0]);
fprintf(stderr, " optional flag -b for selecting baudrate\n");
return 0;
}

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

@ -56,6 +56,12 @@ main(int argc, char **argv)
return 0;
}
if (debug)
{
mbus_register_send_event(&mbus_dump_send_event);
mbus_register_recv_event(&mbus_dump_recv_event);
}
if ((handle = mbus_connect_tcp(host, port)) == NULL)
{
fprintf(stderr, "Failed to setup connection to M-bus gateway\n");

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

@ -56,6 +56,12 @@ main(int argc, char **argv)
return 0;
}
if (debug)
{
mbus_register_send_event(&mbus_dump_send_event);
mbus_register_recv_event(&mbus_dump_recv_event);
}
if ((handle = mbus_connect_tcp(host, port)) == NULL)
{
fprintf(stderr, "Failed to setup connection to M-bus gateway\n");

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

@ -44,6 +44,12 @@ main(int argc, char **argv)
printf("usage: %s [-d] host port\n", argv[0]);
return 0;
}
if (debug)
{
mbus_register_send_event(&mbus_dump_send_event);
mbus_register_recv_event(&mbus_dump_recv_event);
}
if ((handle = mbus_connect_tcp(host, port)) == NULL)
{