fixed misleading error message

[hmcfgusb] / flash-ota.c

diff --git a/flash-ota.c b/flash-ota.c
index f8431a6cc1cc4523cfcf1de35bd2eb7f53a3e89f..cbda024a9b8269c6bb2617d068708db6c7b4933e 100644 (file)
--- a/flash-ota.c
+++ b/flash-ota.c
@@ -42,6 +42,7 @@
 #include "hmcfgusb.h"
 
 uint32_t hmid = 0;
+uint32_t my_hmid = 0;
 
 enum message_type {
        MESSAGE_TYPE_E,
@@ -53,6 +54,7 @@ struct recv_data {
        enum message_type message_type;
        uint16_t status;
        int speed;
+       uint16_t hmcfgusb_version;
 };
 
 static int parse_hmcfgusb(uint8_t *buf, int buf_len, void *data)
@@ -82,6 +84,10 @@ static int parse_hmcfgusb(uint8_t *buf, int buf_len, void *data)
                case 'G':
                        rdata->speed = buf[1];
                        break;
+               case 'H':
+                       rdata->hmcfgusb_version = (buf[11] << 8) | buf[12];
+                       my_hmid = (buf[0x1b] << 16) | (buf[0x1c] << 8) | buf[0x1d];
+                       break;
                default:
                        break;
        }
@@ -223,12 +229,36 @@ int main(int argc, char **argv)
        }
 
        if (dev->bootloader) {
-               fprintf(stderr, "\nHM-CFG-USB not in bootloader mode, aborting!\n");
+               fprintf(stderr, "\nHM-CFG-USB in bootloader mode, aborting!\n");
                exit(EXIT_FAILURE);
        }
 
        printf("\nHM-CFG-USB opened\n\n");
 
+       memset(out, 0, sizeof(out));
+       out[0] = 'K';
+       hmcfgusb_send(dev, out, sizeof(out), 1);
+
+       while (1) {
+               errno = 0;
+               pfd = hmcfgusb_poll(dev, 1);
+               if ((pfd < 0) && errno) {
+                       if (errno != ETIMEDOUT) {
+                               perror("\n\nhmcfgusb_poll");
+                               exit(EXIT_FAILURE);
+                       }
+               }
+               if (rdata.hmcfgusb_version)
+                       break;
+       }
+
+       if (rdata.hmcfgusb_version < 0x3c7) {
+               fprintf(stderr, "HM-CFG-USB firmware too low: %u < 967\n", rdata.hmcfgusb_version);
+               exit(EXIT_FAILURE);
+       }
+
+       printf("HM-CFG-USB firmware version: %u\n", rdata.hmcfgusb_version);
+
        if (!switch_speed(dev, &rdata, 10)) {
                fprintf(stderr, "Can't switch speed!\n");
                exit(EXIT_FAILURE);
@@ -282,7 +312,7 @@ int main(int argc, char **argv)
                out[MSGID] = msgid++;
                out[CTL] = 0x00;
                out[TYPE] = 0xCB;
-               SET_SRC(out, 0x000000);
+               SET_SRC(out, my_hmid);
                SET_DST(out, hmid);
 
                memcpy(&out[PAYLOAD], switch_msg, sizeof(switch_msg));
@@ -304,7 +334,7 @@ int main(int argc, char **argv)
                out[MSGID] = msgid++;
                out[CTL] = 0x20;
                out[TYPE] = 0xCB;
-               SET_SRC(out, 0x000000);
+               SET_SRC(out, my_hmid);
                SET_DST(out, hmid);
 
                memcpy(&out[PAYLOAD], switch_msg, sizeof(switch_msg));
@@ -383,7 +413,7 @@ int main(int argc, char **argv)
                        if (ack)
                                out[CTL] = 0x20;
                        out[TYPE] = 0xCA;
-                       SET_SRC(out, 0x000000);
+                       SET_SRC(out, my_hmid);
                        SET_DST(out, hmid);
 
                        memcpy(&out[PAYLOAD], pos, payloadlen);