Merge remote branch 'upstream/master'

bin/mbus-serial-request-data-multi-reply.c

@@ -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)
     {

bin/mbus-serial-request-data.c

@@ -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)
     {

bin/mbus-serial-scan-secondary.c

@@ -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)
     {

bin/mbus-serial-scan.c

@@ -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");

bin/mbus-serial-select-secondary.c

@@ -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;
     }
  

bin/mbus-tcp-request-data-multi-reply.c

@@ -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");

bin/mbus-tcp-request-data.c

@@ -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");

bin/mbus-tcp-scan.c

@@ -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)
     {

mbus/mbus-protocol.c

@@ -28,14 +28,29 @@ static mbus_slave_data slave_data[MBUS_MAX_PRIMARY_SLAVES];
 //
 // init event callback
 //
-void (*_mbus_recv_event)(u_char src_type) = NULL;
+void (*_mbus_recv_event)(u_char src_type, const char *buff, size_t len) = NULL;
-void (*_mbus_send_event)(u_char src_type) = NULL;
+void (*_mbus_send_event)(u_char src_type, const char *buff, size_t len) = NULL;
+
+//
+//  trace callbacks
+//
+void
+mbus_dump_recv_event(u_char src_type, const char *buff, size_t len)
+{
+    mbus_hex_dump("RECV", buff, len);
+}
+
+void
+mbus_dump_send_event(u_char src_type, const char *buff, size_t len)
+{
+    mbus_hex_dump("SEND", buff, len);
+}
 
 //------------------------------------------------------------------------------
 /// Register a function for receive events.
 //------------------------------------------------------------------------------
 void
-mbus_register_recv_event(void (*event)(u_char src_type))
+mbus_register_recv_event(void (*event)(u_char src_type, const char *buff, size_t len))
 {
     _mbus_recv_event = event;
 }
@@ -44,7 +59,7 @@ mbus_register_recv_event(void (*event)(u_char src_type))
 /// Register a function for send events.
 //------------------------------------------------------------------------------
 void
-mbus_register_send_event(void (*event)(u_char src_type))
+mbus_register_send_event(void (*event)(u_char src_type, const char *buff, size_t len))
 {
     _mbus_send_event = event;
 }
@@ -2942,6 +2957,28 @@ mbus_data_fixed_print(mbus_data_fixed *data)
     return -1;
 }
 
+void
+mbus_hex_dump(const char *label, const char *buff, size_t len)
+{
+    time_t rawtime;
+    struct tm * timeinfo;
+    char timestamp[21];
+    size_t i;
+    
+    time ( &rawtime );
+    timeinfo = gmtime ( &rawtime );
+    
+    strftime(timestamp,20,"%Y-%m-%d %H:%M:%S",timeinfo);
+    fprintf(stderr, "[%s] %s (%03d):", timestamp, label, len);
+    
+    for (i = 0; i < len; i++)
+    {
+       fprintf(stderr, " %02X", (u_char) buff[i]);
+    }
+    
+    fprintf(stderr, "\n");
+}
+
 int
 mbus_data_error_print(int error)
 {   

mbus/mbus-protocol.h

@@ -462,14 +462,17 @@ typedef struct _mbus_data_secondary_address {
 //
 // Event callback functions
 //
-extern void (*_mbus_recv_event)(u_char src_type);
+extern void (*_mbus_recv_event)(u_char src_type, const char *buff, size_t len);
-extern void (*_mbus_send_event)(u_char src_type);
+extern void (*_mbus_send_event)(u_char src_type, const char *buff, size_t len);
+
+void mbus_dump_recv_event(u_char src_type, const char *buff, size_t len);
+void mbus_dump_send_event(u_char src_type, const char *buff, size_t len);
 
 //
 // Event register functions
 //
-void mbus_register_recv_event(void (*event)(u_char src_type));
+void mbus_register_recv_event(void (*event)(u_char src_type, const char *buff, size_t len));
-void mbus_register_send_event(void (*event)(u_char src_type));
+void mbus_register_send_event(void (*event)(u_char src_type, const char *buff, size_t len));
 
 //
 // variable length records
@@ -554,6 +557,7 @@ void  mbus_error_str_set(char *message);
 void  mbus_error_reset();
 
 void  mbus_parse_set_debug(int debug);
+void  mbus_hex_dump(const char *label, const char *buff, size_t len);
 
 //
 // data encode/decode functions