hmsniff: add two more message types

[hmcfgusb] / hmsniff.c

diff --git a/hmsniff.c b/hmsniff.c
index 70e2412a71d7d534396c01ad8a9e2d1f1fc472ee..82907f78b8f9029e3232b495af28839717eb8f87 100644 (file)
--- a/hmsniff.c
+++ b/hmsniff.c
@@ -1,6 +1,6 @@
 /* HM-sniffer for HM-CFG-USB
  *
- * Copyright (c) 2013-15 Michael Gernoth <michael@gernoth.net>
+ * Copyright (c) 2013-16 Michael Gernoth <michael@gernoth.net>
  *
  * Permission is hereby granted, free of charge, to any person obtaining a copy
  * of this software and associated documentation files (the "Software"), to
@@ -89,15 +89,28 @@ char *hm_message_types(uint8_t type, uint8_t subtype)
                case 0x53:
                        return "Water sensor";
                        break;
+               case 0x54:
+                       return "Gas sensor";
+                       break;
                case 0x58:
                        return "Climate event";
                        break;
                case 0x5a:
                        return "Thermal control";
                        break;
+               case 0x5e:
+               case 0x5f:
+                       return "Power event";
+                       break;
                case 0x70:
                        return "Weather event";
                        break;
+               case 0xca:
+                       return "Firmware";
+                       break;
+               case 0xcb:
+                       return "Rf configuration";
+                       break;
                default:
                        return "?";
                        break;
@@ -151,6 +164,7 @@ static void dissect_hm(uint8_t *buf, int len)
        } else {
                if (!(count++ % 20))
                        printf("                         LL NR FL CM sender recvr  payload\n");
+
                printf("%s.%03ld: %02X %02X %02X %02X %02X%02X%02X %02X%02X%02X ",
                                ts, tv.tv_usec/1000,
                                buf[0], buf[1], buf[2], buf[3],
@@ -189,6 +203,7 @@ static int parse_hmcfgusb(uint8_t *buf, int buf_len, void *data)
                        break;
                case 'R':
                case 'I':
+               case 'G':
                        break;
                default:
                        hexdump(buf, buf_len, "Unknown> ");
@@ -202,6 +217,8 @@ void hmsniff_syntax(char *prog)
 {
        fprintf(stderr, "Syntax: %s options\n\n", prog);
        fprintf(stderr, "Possible options:\n");
+       fprintf(stderr, "\t-f\t\tfast (100k/firmware update) mode\n");
+       fprintf(stderr, "\t-S serial\tuse HM-CFG-USB with given serial\n");
        fprintf(stderr, "\t-v\t\tverbose mode\n");
        fprintf(stderr, "\t-V\t\tshow version (" VERSION ")\n");
 
@@ -211,17 +228,26 @@ int main(int argc, char **argv)
 {
        struct hmcfgusb_dev *dev;
        struct recv_data rdata;
+       char *serial = NULL;
        int quit = 0;
+       int speed = 10;
+       uint8_t speed_buf[2];
        int opt;
 
-       while((opt = getopt(argc, argv, "vV")) != -1) {
+       while((opt = getopt(argc, argv, "fS:vV")) != -1) {
                switch (opt) {
+                       case 'f':
+                               speed = 100;
+                               break;
+                       case 'S':
+                               serial = optarg;
+                               break;
                        case 'v':
                                verbose = 1;
                                break;
                        case 'V':
                                printf("hmsniff " VERSION "\n");
-                               printf("Copyright (c) 2013-15 Michael Gernoth\n\n");
+                               printf("Copyright (c) 2013-16 Michael Gernoth\n\n");
                                exit(EXIT_SUCCESS);
                        case 'h':
                        case ':':
@@ -239,7 +265,7 @@ int main(int argc, char **argv)
                memset(&rdata, 0, sizeof(rdata));
                rdata.wrong_hmid = 0;
 
-               dev = hmcfgusb_init(parse_hmcfgusb, &rdata);
+               dev = hmcfgusb_init(parse_hmcfgusb, &rdata, serial);
                if (!dev) {
                        fprintf(stderr, "Can't initialize HM-CFG-USB, retrying in 1s...\n");
                        sleep(1);
@@ -250,6 +276,11 @@ int main(int argc, char **argv)
                hmcfgusb_send_null_frame(dev, 1);
                hmcfgusb_send(dev, (unsigned char*)"K", 1, 1);
 
+               hmcfgusb_send_null_frame(dev, 1);
+               speed_buf[0] = 'G';
+               speed_buf[1] = speed;
+               hmcfgusb_send(dev, speed_buf, 2, 1);
+
                while(!quit) {
                        int fd;