the switch_msg are actually CC1101-registers

[hmcfgusb] / flash-ota.c

diff --git a/flash-ota.c b/flash-ota.c
index 1fd11d805226e0ca881a9a160e7d48cd23d99dfd..4279aa9cac05010113d467a8e0e7407a1c6cc0f9 100644 (file)
--- a/flash-ota.c
+++ b/flash-ota.c
@@ -41,7 +41,10 @@
 #include "version.h"
 #include "hmcfgusb.h"
 
 #include "version.h"
 #include "hmcfgusb.h"
 

+#define MAX_RETRIES    5
+

 uint32_t hmid = 0;
 uint32_t hmid = 0;

+uint32_t my_hmid = 0;

 
 enum message_type {
        MESSAGE_TYPE_E,
 
 enum message_type {
        MESSAGE_TYPE_E,


@@ -53,6 +56,7 @@ struct recv_data {
        enum message_type message_type;
        uint16_t status;
        int speed;
        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)
 };
 
 static int parse_hmcfgusb(uint8_t *buf, int buf_len, void *data)


@@ -82,6 +86,10 @@ static int parse_hmcfgusb(uint8_t *buf, int buf_len, void *data)
                case 'G':
                        rdata->speed = buf[1];
                        break;
                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;
        }
                default:
                        break;
        }


@@ -121,7 +129,7 @@ int send_hm_message(struct hmcfgusb_dev *dev, struct recv_data *rdata, uint8_t *
        memcpy(&out[0x0f], msg, msg[0] + 1);
 
        memset(rdata, 0, sizeof(struct recv_data));
        memcpy(&out[0x0f], msg, msg[0] + 1);
 
        memset(rdata, 0, sizeof(struct recv_data));

-       hmcfgusb_send(dev, out, sizeof(out), 2);
+       hmcfgusb_send(dev, out, sizeof(out), 1);

 
        while (1) {
                if (rdata->message_type == MESSAGE_TYPE_R) {
 
        while (1) {
                if (rdata->message_type == MESSAGE_TYPE_R) {


@@ -129,7 +137,13 @@ int send_hm_message(struct hmcfgusb_dev *dev, struct recv_data *rdata, uint8_t *
                            ((rdata->status & 0xff) == 0x02)) {
                                break;
                        } else {
                            ((rdata->status & 0xff) == 0x02)) {
                                break;
                        } else {

-                               fprintf(stderr, "\n\nInvalid status: %04x\n\n", rdata->status);
+                               if ((rdata->status & 0xff00) == 0x0400) {
+                                       fprintf(stderr, "\nOut of credits!\n");
+                               } else if ((rdata->status & 0xff) == 0x08) {
+                                       fprintf(stderr, "\nMissing ACK!\n");
+                               } else {
+                                       fprintf(stderr, "\nInvalid status: %04x\n", rdata->status);
+                               }

                                return 0;
                        }
                }
                                return 0;
                        }
                }


@@ -158,7 +172,7 @@ static int switch_speed(struct hmcfgusb_dev *dev, struct recv_data *rdata, uint8
        out[0] = 'G';
        out[1] = speed;
 
        out[0] = 'G';
        out[1] = speed;
 

-       hmcfgusb_send(dev, out, sizeof(out), 2);
+       hmcfgusb_send(dev, out, sizeof(out), 1);

 
        while (1) {
                errno = 0;
 
        while (1) {
                errno = 0;


@@ -179,7 +193,7 @@ static int switch_speed(struct hmcfgusb_dev *dev, struct recv_data *rdata, uint8
 int main(int argc, char **argv)
 {
        const char twiddlie[] = { '-', '\\', '|', '/' };
 int main(int argc, char **argv)
 {
        const char twiddlie[] = { '-', '\\', '|', '/' };

-       const uint8_t switch_msg[] = { 0x10, 0x5B, 0x11, 0xF8, 0x15, 0x47 };
+       const uint8_t cc1101_regs[] = { 0x10, 0x5B, 0x11, 0xF8, 0x15, 0x47 };

        struct hmcfgusb_dev *dev;
        struct recv_data rdata;
        uint8_t out[0x40];
        struct hmcfgusb_dev *dev;
        struct recv_data rdata;
        uint8_t out[0x40];


@@ -222,12 +236,58 @@ int main(int argc, char **argv)
                exit(EXIT_FAILURE);
        }
 
                exit(EXIT_FAILURE);
        }
 

+       printf("\nRebooting HM-CFG-USB to avoid running out of credits\n\n");
+
+       if (!dev->bootloader) {
+               printf("HM-CFG-USB not in bootloader mode, entering bootloader.\n");
+               hmcfgusb_enter_bootloader(dev);
+               printf("Waiting for device to reappear...\n");
+
+               do {
+                       if (dev) {
+                               hmcfgusb_close(dev);
+                       }
+                       sleep(1);
+               } while (((dev = hmcfgusb_init(parse_hmcfgusb, &rdata)) == NULL) || (!dev->bootloader));
+       }
+

        if (dev->bootloader) {
        if (dev->bootloader) {

-               fprintf(stderr, "\nHM-CFG-USB not in bootloader mode, aborting!\n");
+               printf("HM-CFG-USB in bootloader mode, rebooting\n");
+               hmcfgusb_leave_bootloader(dev);
+
+               do {
+                       if (dev) {
+                               hmcfgusb_close(dev);
+                       }
+                       sleep(1);
+               } while (((dev = hmcfgusb_init(parse_hmcfgusb, &rdata)) == NULL) || (dev->bootloader));
+       }
+
+       printf("\n\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);
        }
 
                exit(EXIT_FAILURE);
        }
 

-       printf("\nHM-CFG-USB opened\n\n");
+       printf("HM-CFG-USB firmware version: %u\n", rdata.hmcfgusb_version);

 
        if (!switch_speed(dev, &rdata, 10)) {
                fprintf(stderr, "Can't switch speed!\n");
 
        if (!switch_speed(dev, &rdata, 10)) {
                fprintf(stderr, "Can't switch speed!\n");


@@ -271,7 +331,7 @@ int main(int argc, char **argv)
        out[2] = (hmid >> 8) & 0xff;
        out[3] = hmid & 0xff;
 
        out[2] = (hmid >> 8) & 0xff;
        out[3] = hmid & 0xff;
 

-       hmcfgusb_send(dev, out, sizeof(out), 2);
+       hmcfgusb_send(dev, out, sizeof(out), 1);

 
        switchcnt = 3;
        do {
 
        switchcnt = 3;
        do {


@@ -282,11 +342,11 @@ int main(int argc, char **argv)
                out[MSGID] = msgid++;
                out[CTL] = 0x00;
                out[TYPE] = 0xCB;
                out[MSGID] = msgid++;
                out[CTL] = 0x00;
                out[TYPE] = 0xCB;

-               SET_SRC(out, 0x000000);
+               SET_SRC(out, my_hmid);

                SET_DST(out, hmid);
 
                SET_DST(out, hmid);
 

-               memcpy(&out[PAYLOAD], switch_msg, sizeof(switch_msg));
-               SET_LEN_FROM_PAYLOADLEN(out, sizeof(switch_msg));
+               memcpy(&out[PAYLOAD], cc1101_regs, sizeof(cc1101_regs));
+               SET_LEN_FROM_PAYLOADLEN(out, sizeof(cc1101_regs));

 
                if (!send_hm_message(dev, &rdata, out)) {
                        exit(EXIT_FAILURE);
 
                if (!send_hm_message(dev, &rdata, out)) {
                        exit(EXIT_FAILURE);


@@ -304,11 +364,11 @@ int main(int argc, char **argv)
                out[MSGID] = msgid++;
                out[CTL] = 0x20;
                out[TYPE] = 0xCB;
                out[MSGID] = msgid++;
                out[CTL] = 0x20;
                out[TYPE] = 0xCB;

-               SET_SRC(out, 0x000000);
+               SET_SRC(out, my_hmid);

                SET_DST(out, hmid);
 
                SET_DST(out, hmid);
 

-               memcpy(&out[PAYLOAD], switch_msg, sizeof(switch_msg));
-               SET_LEN_FROM_PAYLOADLEN(out, sizeof(switch_msg));
+               memcpy(&out[PAYLOAD], cc1101_regs, sizeof(cc1101_regs));
+               SET_LEN_FROM_PAYLOADLEN(out, sizeof(cc1101_regs));

 
                cnt = 3;
                do {
 
                cnt = 3;
                do {


@@ -330,6 +390,10 @@ int main(int argc, char **argv)
                }
        } while ((!switched) && (switchcnt--));
 
                }
        } while ((!switched) && (switchcnt--));
 

+       if (!switched) {
+               fprintf(stderr, "Too many errors, giving up!\n");
+               exit(EXIT_FAILURE);
+       }

 
        printf("Yes!\n");
 
 
        printf("Yes!\n");
 


@@ -379,7 +443,7 @@ int main(int argc, char **argv)
                        if (ack)
                                out[CTL] = 0x20;
                        out[TYPE] = 0xCA;
                        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);
                        SET_DST(out, hmid);
 
                        memcpy(&out[PAYLOAD], pos, payloadlen);


@@ -390,7 +454,7 @@ int main(int argc, char **argv)
                        } else {
                                pos = &(fw->fw[block][2]);
                                cnt++;
                        } else {
                                pos = &(fw->fw[block][2]);
                                cnt++;

-                               if (cnt == 3) {
+                               if (cnt == MAX_RETRIES) {

                                        fprintf(stderr, "\nToo many errors, giving up!\n");
                                        exit(EXIT_FAILURE);
                                } else {
                                        fprintf(stderr, "\nToo many errors, giving up!\n");
                                        exit(EXIT_FAILURE);
                                } else {