mqtt verbindet

stash
Add error handling to OTA process
2021-09-12 22:03:11 +02:00 · 2021-09-12 22:03:11 +02:00 · 2021-09-12 22:00:59 +02:00 · 2021-09-12 20:59:09 +02:00 · 2021-09-09 14:30:10 +02:00
22 changed files with 468 additions and 212 deletions
--- a/2
+++ b/2
@ -21,7 +21,7 @@ clean:

 firmware_docker:
 	sh -c "docker build -t fiatlux_firmware_env docker/firmware"
-	sh -c "docker run --volume "$$(pwd)"/firmware:/app/firmware fiatlux_firmware_env make -C firmware all"
+	sh -c "docker run --volume "$$(pwd)"/firmware:/app/firmware fiatlux_firmware_env make -C firmware html all"

 pcb_docker:
 	sh -c "docker build -t fiatlux_pcb_env docker/pcb"
--- a/README.md
+++ b/README.md
@ -13,7 +13,7 @@ git submodule update --init --recursive
 ### Build Requirements

 - make
- - bash gawk perl
+ - bash gawk
 - g++ gcc
 - libc6-dev
 - flex bison
--- a/docker/firmware/Dockerfile
+++ b/docker/firmware/Dockerfile
@ -6,7 +6,7 @@ RUN cd app; git clone --recursive https://github.com/SuperHouse/esp-open-rtos.gi
 RUN cd app; sed -i 's/GNU bash, version (3\\\.\[1-9\]|4)/GNU bash, version (3.[1-9]|4|5)/g' modules/sdk/crosstool-NG/configure.ac; mkdir -p modules/sdk/crosstool-NG/.build/tarballs; wget https://github.com/libexpat/libexpat/releases/download/R_2_1_0/expat-2.1.0.tar.gz -O modules/sdk/crosstool-NG/.build/tarballs/expat-2.1.0.tar.gz
 RUN cd app/modules/sdk; export CT_EXPERIMENTAL=y; export CT_ALLOW_BUILD_AS_ROOT=y; export CT_ALLOW_BUILD_AS_ROOT_SURE=y; make standalone=y -j$(nproc); wget -N https://raw.githubusercontent.com/espressif/esptool/master/esptool.py -O xtensa-lx106-elf/bin/esptool.py
 USER 0
-RUN apt remove --purge -y python2 && apt autoremove --purge -y && apt install -y python3 python3-serial perl
+RUN apt remove --purge -y python2 && apt autoremove --purge -y && apt install -y python3 python3-serial
 RUN apt install -y --reinstall python-is-python3
 USER 1000
 WORKDIR /app
--- a/firmware/.gitignore
+++ b/firmware/.gitignore
@ -142,5 +142,5 @@ dkms.conf

 *.remove
 firmware/
-fsdata/fsdata.c
-compile_commands.json
+build/
+compile_commands.json
--- a/firmware/.idea/firmware.iml
+++ b/firmware/.idea/firmware.iml
@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<module classpath="External" external.linked.project.id="firmware" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="CompDB" type="CPP_MODULE" version="4" />
 <module version="4">
  <component name="FacetManager">
    <facet type="Python" name="Python facet">
--- a/firmware/Makefile
+++ b/firmware/Makefile
@ -1,8 +1,9 @@
 PROGRAM=fiatlux

-EXTRA_CFLAGS=-O3 -Ifsdata
+EXTRA_CFLAGS=-O3 -Ibuild/gen

-EXTRA_COMPONENTS=extras/i2s_dma extras/ws2812_i2s extras/dhcpserver extras/rboot-ota extras/mbedtls extras/httpd extras/sntp extras/cpp_support
+
+EXTRA_COMPONENTS=extras/i2s_dma extras/ws2812_i2s extras/dhcpserver extras/rboot-ota extras/mbedtls extras/httpd extras/sntp extras/cpp_support extras/paho_mqtt_c

 LIBS = hal m

@ -10,11 +11,12 @@ FLASH_MODE = dio

 include ../modules/rtos/common.mk

-html: fsdata/fsdata.c
+html: build/gen/fsdata.c

-fsdata/fsdata.c: fsdata/fs/index.html fsdata/fs/404.html fsdata/fs/css/picnic.min.css fsdata/fs/css/style.css fsdata/fs/js/smoothie_min.js
+build/gen/fsdata.c: webdir/index.html webdir/404.html webdir/css/picnic.min.css webdir/css/style.css webdir/js/smoothie_min.js
 	@echo "Generating fsdata.."
-	cd fsdata && ./makefsdata
+	@mkdir -p $(dir $@)
+	@./mkwebfs.py --gzip -o $@ $^

 test: unittest systest

@ -24,4 +26,4 @@ unittest:
 systest:
 	true

-.NOTPARALLEL: html all
+.NOTPARALLEL: html all
--- a/firmware/fiatlux.c
+++ b/firmware/fiatlux.c
@ -13,6 +13,7 @@

 void user_init(void)
 {
+    
    uart_set_baud(0, 115200);
    printf("SDK version: %s\n", sdk_system_get_sdk_version());

@ -22,6 +23,8 @@ void user_init(void)

    wifi_available_semaphore = xSemaphoreCreateBinary();

+    xTaskCreate(mqtt_task, "mqtt_task", 1024, NULL, 1, NULL);
+
    xTaskCreate(wifi_task, "wifi_task", 1024, NULL, 1, NULL);

    xTaskCreate(&httpd_task, "httpd_task", 1024, NULL, 2, NULL);
--- a/firmware/fsdata/fs/404.html
+++ b/firmware/fsdata/fs/404.html
@ -1,22 +0,0 @@
-<!DOCTYPE html>
-<html>
-	<head>
-		<meta charset="utf-8">
-		<meta name="viewport" content="width=device-width, user-scalable=no">
-		<link rel="shortcut icon" href="img/favicon.png">
-		<title>HTTP Server</title>
-	</head>
-	<body>
-		<ul class="navbar">
-			<li><a href="/">Home</a></li>
-			<li><a href="websockets">WebSockets</a></li>
-			<li><a href="about">About</a></li>
-		</ul>
-
-		<div class="grid main">
-			<h1>404 - Page not found</h1>
-			<div class="alert alert-error">Sorry, the page you are requesting was not found on this server.</div>
-		</div>
-	</body>
-</html>
-
--- a/firmware/fsdata/makefsdata
+++ b/firmware/fsdata/makefsdata
@ -1,114 +0,0 @@
-#!/usr/bin/perl
-
-$incHttpHeader = 1;
-
-open(OUTPUT, "> fsdata.c");
-print(OUTPUT "#include \"httpd/fsdata.h\"\n\n");
-
-chdir("fs");
-open(FILES, "find . -type f |");
-
-while($file = <FILES>) {
-
-    # Do not include files in CVS directories nor backup files.
-    if($file =~ /(CVS|~)/) {
-        next;
-    }
-
-    chop($file);
-
-    if($incHttpHeader == 1) {
-        open(HEADER, "> /tmp/header") || die $!;
-        if($file =~ /404/) {
-            print(HEADER "HTTP/1.0 404 File not found\r\n");
-        } else {
-            print(HEADER "HTTP/1.0 200 OK\r\n");
-        }
-        print(HEADER "lwIP/1.4.1 (http://savannah.nongnu.org/projects/lwip)\r\n");
-        if($file =~ /\.html$/ || $file =~ /\.htm$/ || $file =~ /\.shtml$/ || $file =~ /\.shtm$/ || $file =~ /\.ssi$/) {
-            print(HEADER "Content-type: text/html\r\n");
-        } elsif($file =~ /\.js$/) {
-            print(HEADER "Content-type: application/x-javascript\r\n\r\n");
-        } elsif($file =~ /\.css$/) {
-            print(HEADER "Content-type: text/css\r\n\r\n");
-        } elsif($file =~ /\.ico$/) {
-            print(HEADER "Content-type: image/x-icon\r\n\r\n");
-        } elsif($file =~ /\.gif$/) {
-            print(HEADER "Content-type: image/gif\r\n");
-        } elsif($file =~ /\.png$/) {
-            print(HEADER "Content-type: image/png\r\n");
-        } elsif($file =~ /\.jpg$/) {
-            print(HEADER "Content-type: image/jpeg\r\n");
-        } elsif($file =~ /\.bmp$/) {
-            print(HEADER "Content-type: image/bmp\r\n\r\n");
-        } elsif($file =~ /\.class$/) {
-            print(HEADER "Content-type: application/octet-stream\r\n");
-        } elsif($file =~ /\.ram$/) {
-            print(HEADER "Content-type: audio/x-pn-realaudio\r\n");
-        } else {
-            print(HEADER "Content-type: text/plain\r\n");
-        }
-        print(HEADER "\r\n");
-        close(HEADER);
-
-        unless($file =~ /\.plain$/ || $file =~ /cgi/) {
-            system("cat /tmp/header $file > /tmp/file");
-        } else {
-            system("cp $file /tmp/file");
-        }
-    } else {
-        system("cp $file /tmp/file");
-    }
-
-    open(FILE, "/tmp/file");
-    unlink("/tmp/file");
-    unlink("/tmp/header");
-
-    $file =~ s/\.//;
-    $fvar = $file;
-    $fvar =~ s-/-_-g;
-    $fvar =~ s-\.-_-g;
-
-    print(OUTPUT "static const unsigned char data".$fvar."[] = {\n");
-    print(OUTPUT "\t/* $file */\n\t");
-    for($j = 0; $j < length($file); $j++) {
-        printf(OUTPUT "0x%02X, ", unpack("C", substr($file, $j, 1)));
-    }
-    printf(OUTPUT "0,\n");
-
-
-    $i = 0;
-    while(read(FILE, $data, 1)) {
-        if($i == 0) {
-            print(OUTPUT "\t");
-        }
-        printf(OUTPUT "0x%02X, ", unpack("C", $data));
-        $i++;
-        if($i == 10) {
-            print(OUTPUT "\n");
-            $i = 0;
-        }
-    }
-    print(OUTPUT "};\n\n");
-    close(FILE);
-    push(@fvars, $fvar);
-    push(@files, $file);
-}
-
-for($i = 0; $i < @fvars; $i++) {
-    $file = $files[$i];
-    $fvar = $fvars[$i];
-
-    if($i == 0) {
-        $prevfile = "NULL";
-    } else {
-        $prevfile = "file" . $fvars[$i - 1];
-    }
-    print(OUTPUT "const struct fsdata_file file".$fvar."[] = {{\n$prevfile,\ndata$fvar, ");
-    print(OUTPUT "data$fvar + ". (length($file) + 1) .",\n");
-    print(OUTPUT "sizeof(data$fvar) - ". (length($file) + 1) .",\n");
-    print(OUTPUT $incHttpHeader."\n}};\n\n");
-}
-
-print(OUTPUT "#define FS_ROOT file$fvars[$i - 1]\n\n");
-print(OUTPUT "#define FS_NUMFILES $i\n");
--- a/firmware/mkwebfs.py
+++ b/firmware/mkwebfs.py
@ -0,0 +1,112 @@
+#!/usr/bin/env python3
+import os
+import gzip
+import argparse
+
+parser = argparse.ArgumentParser()
+parser.add_argument('-o', '--output', help='Output file name', default='stdout')
+parser.add_argument('-W', '--webroot', help='Output file name', default='webdir/')
+parser.add_argument('--gzip', dest='gzip', action='store_true')
+parser.add_argument('--no-gzip', dest='gzip', action='store_false')
+parser.set_defaults(gzip=False)
+parser.add_argument('--header', dest='header', action='store_true')
+parser.add_argument('--no-header', dest='header', action='store_false')
+parser.set_defaults(header=True)
+parser.add_argument('input', nargs='+', default=os.getcwd())
+args = parser.parse_args()
+
+
+def dumpBin2CHex(f, b):
+    oStr = "\t"
+    n = 0
+    for val in b:
+        oStr += hex(val) + ", "
+        n += 1
+        if n % 8 == 0:
+            oStr += "\n\t"
+    oStr += "\n"
+    f.write(oStr)
+
+
+f_fsdata_c = open(args.output, 'w')
+f_fsdata_c.write('#include "httpd/fsdata.h"\n\n')
+
+httpFiles = [file for file in args.input if (args.webroot in file)]
+
+lastFileStruct = "NULL"
+
+for file in httpFiles:
+    response = b''
+
+    webPath = ("/" + file.removeprefix(args.webroot)).replace("//", "/")
+    print("{} > {}".format(file, webPath))
+
+    if args.header:
+        if ("404" in file):
+            response = b'HTTP/1.0 404 File not found\r\n'
+        else:
+            response = b'HTTP/1.0 200 OK\r\n'
+        response += b"lwIP/1.4.1 (http://savannah.nongnu.org/projects/lwip)\r\n"
+        fext = file.split('.')[-1]
+        ctype = b'Content-type: text/plain\r\n'
+        if (fext.endswith("html") or fext.endswith("htm") or fext.endswith("shtml") or fext.endswith(
+                "shtm") or fext.endswith("ssi")):
+            ctype = b'Content-type: text/html\r\n'
+        if (fext.endswith("js")):
+            ctype = b'Content-type: application/x-javascript\r\n'
+        if (fext.endswith("css")):
+            ctype = b'Content-type: text/css\r\n'
+        if (fext.endswith("ico")):
+            ctype = b'Content-type: image/x-icon\r\n'
+        if (fext.endswith("gif")):
+            ctype = b'Content-type: image/gif\r\n'
+        if (fext.endswith("png")):
+            ctype = b'Content-type: image/png\r\n'
+        if(fext.endswith("jpg")):
+            ctype = b'Content-type: image/jpeg\r\n'
+        if(fext.endswith("bmp")):
+            ctype = b'Content-type: image/bmp\r\n'
+        if(fext.endswith("class")):
+            ctype = b'Content-type: application/octet-stream\r\n'
+        if(fext.endswith("ram")):
+            ctype = b'Content-type: audio/x-pn-realaudio\r\n'
+        response += ctype
+
+        binFile = open(file, 'rb')
+        binData = binFile.read()
+        compEff = False
+        if args.gzip:
+            compData = gzip.compress(binData, 9)
+            if len(compData) < len(binData):
+                compEff = True
+                print("- Compressed from {} to {}".format(len(binData), len(compData)))
+                binData = compData
+            else:
+                print("- Compression skipped Orig: {} Comp: {}".format(len(binData), len(compData)))
+        binFile.close()
+
+        if compEff:
+            response += b'Content-Encoding: gzip\r\n'
+        response += b"\r\n"
+        response += binData
+        binFile.close()
+        escFile = file.replace("/", "_").replace(".", "_")
+        escFileData = "data_" + escFile
+        escFileFile = "file_" + escFile
+
+        f_fsdata_c.write('static const unsigned char {}[] = {{\n'.format(escFileData))
+        f_fsdata_c.write('\t/* LOCAL:{} */\n'.format(file))
+        f_fsdata_c.write('\t/* WEB:  {} */\n'.format(webPath))
+        fnameBin = webPath.encode("ascii") + b'\0'
+        dumpBin2CHex(f_fsdata_c, fnameBin)
+        dumpBin2CHex(f_fsdata_c, response)
+        f_fsdata_c.write("};\n\n")
+
+        f_fsdata_c.write("const struct fsdata_file {}[] = {{{{\n  {},\n  {}, {} + {}, sizeof({}) - {}, 1 }}}};\n\n"
+                .format(escFileFile, lastFileStruct, escFileData, escFileData, len(fnameBin), escFileData, len(fnameBin)))
+        # TODO: The last value is 1 if args.header == True
+        lastFileStruct = escFileFile
+
+f_fsdata_c.write("\n")
+f_fsdata_c.write("#define FS_ROOT {}\n\n".format(lastFileStruct))
+f_fsdata_c.write("#define FS_NUMFILES {}\n\n".format(len(httpFiles)))
--- a/firmware/mqtt.cpp
+++ b/firmware/mqtt.cpp
@ -3,3 +3,158 @@
 //

 #include "mqtt.h"
+
+#include <stdio.h>
+#include <string.h>
+
+#include <espressif/esp_common.h>
+#include <espressif/user_interface.h>
+
+extern "C" {
+
+#include <paho_mqtt_c/MQTTESP8266.h>
+#include <paho_mqtt_c/MQTTClient.h>
+
+}
+
+#include <semphr.h>
+
+
+/* You can use http://test.mosquitto.org/ to test mqtt_client instead
+ * of setting up your own MQTT server */
+#define MQTT_HOST ("172.16.0.42")
+#define MQTT_PORT 1883
+
+#define MQTT_USER NULL
+#define MQTT_PASS NULL
+
+QueueHandle_t publish_queue;
+#define PUB_MSG_LEN 16
+
+extern "C" void beat_task(void *pvParameters) {
+    TickType_t xLastWakeTime = xTaskGetTickCount();
+    char msg[PUB_MSG_LEN];
+    int count = 0;
+
+    while (1) {
+        vTaskDelayUntil(&xLastWakeTime, 10000 / portTICK_PERIOD_MS);
+        printf("beat\r\n");
+        snprintf(msg, PUB_MSG_LEN, "Beat %d\r\n", count++);
+        if(xQueueSend(publish_queue, (void *) msg, 0) == pdFALSE) {
+            printf("Publish queue overflow.\r\n");
+        }
+    }
+}
+
+static void topic_received(mqtt_message_data_t *md) {
+    int i;
+    mqtt_message_t *message = md->message;
+    printf("Received: ");
+    for (i = 0; i < md->topic->lenstring.len; ++i)
+        printf("%c", md->topic->lenstring.data[i]);
+
+    printf(" = ");
+    for (i = 0; i < (int) message->payloadlen; ++i)
+        printf("%c", ((char *) (message->payload))[i]);
+
+    printf("\r\n");
+}
+
+static const char *get_my_id(void) {
+    // Use MAC address for Station as unique ID
+    static char my_id[13];
+    static bool my_id_done = false;
+    int8_t i;
+    uint8_t x;
+    if(my_id_done)
+        return my_id;
+    if(!sdk_wifi_get_macaddr(STATION_IF, (uint8_t *) my_id))
+        return NULL;
+    for (i = 5; i >= 0; --i) {
+        x = my_id[i] & 0x0F;
+        if(x > 9) x += 7;
+        my_id[i * 2 + 1] = x + '0';
+        x = my_id[i] >> 4;
+        if(x > 9) x += 7;
+        my_id[i * 2] = x + '0';
+    }
+    my_id[12] = '\0';
+    my_id_done = true;
+    return my_id;
+}
+
+extern "C" void mqtt_task(void *pvParameters) {
+    int ret = 0;
+    struct mqtt_network network;
+    mqtt_client_t client = mqtt_client_default;
+    char mqtt_client_id[20];
+    uint8_t mqtt_buf[100];
+    uint8_t mqtt_readbuf[100];
+    mqtt_packet_connect_data_t data = mqtt_packet_connect_data_initializer;
+
+    mqtt_network_new(&network);
+    memset(mqtt_client_id, 0, sizeof(mqtt_client_id));
+    strcpy(mqtt_client_id, "ESP-");
+    strcat(mqtt_client_id, get_my_id());
+
+    while (1) {
+        printf("%s: started\n\r", __func__);
+        printf("%s: (Re)connecting to MQTT server %s ... ", __func__,
+               MQTT_HOST);
+        ret = mqtt_network_connect(&network, MQTT_HOST, MQTT_PORT);
+        if(ret) {
+            printf("error: %d\n\r", ret);
+            taskYIELD();
+            continue;
+        }
+        printf("done\n\r");
+        mqtt_client_new(&client, &network, 5000, mqtt_buf, 100,
+                        mqtt_readbuf, 100);
+
+        data.willFlag = 0;
+        data.MQTTVersion = 3;
+        data.clientID.cstring = mqtt_client_id;
+        data.username.cstring = MQTT_USER;
+        data.password.cstring = MQTT_PASS;
+        data.keepAliveInterval = 10;
+        data.cleansession = 0;
+        printf("Send MQTT connect ... ");
+        ret = mqtt_connect(&client, &data);
+        if(ret) {
+            printf("error: %d\n\r", ret);
+            mqtt_network_disconnect(&network);
+            taskYIELD();
+            continue;
+        }
+        printf("done\r\n");
+        mqtt_subscribe(&client, "/esptopic", MQTT_QOS1, topic_received);
+        xQueueReset(publish_queue);
+
+        while (1) {
+
+            char msg[PUB_MSG_LEN - 1] = "\0";
+            while (xQueueReceive(publish_queue, (void *) msg, 0) ==
+                   pdTRUE) {
+                printf("got message to publish\r\n");
+                mqtt_message_t message;
+                message.payload = msg;
+                message.payloadlen = PUB_MSG_LEN;
+                message.dup = 0;
+                message.qos = MQTT_QOS1;
+                message.retained = 0;
+                ret = mqtt_publish(&client, "/beat", &message);
+                if(ret != MQTT_SUCCESS) {
+                    printf("error while publishing message: %d\n", ret);
+                    break;
+                }
+            }
+
+            ret = mqtt_yield(&client, 1000);
+            if(ret == MQTT_DISCONNECTED)
+                break;
+        }
+        printf("Connection dropped, request restart\n\r");
+        mqtt_network_disconnect(&network);
+        taskYIELD();
+    }
+}
--- a/firmware/mqtt.h
+++ b/firmware/mqtt.h
@ -9,6 +9,9 @@
 extern "C" {
 #endif

+void mqtt_task(void *pvParameters);
+void beat_task(void *pvParameters);
+
 #ifdef __cplusplus
 }
 #endif
--- a/firmware/otaflash.py
+++ b/firmware/otaflash.py
@ -4,40 +4,68 @@ import time
 import websocket
 import argparse
 import zlib
+from websocket import WebSocketTimeoutException

 parser = argparse.ArgumentParser(description='Update fiatlux firmware via websocket.')
 parser.add_argument("binfile")

 args = parser.parse_args()

+bs = 1024
+
+
+def parse_reply(bytes):
+    cmd = bytes[0:1].decode("utf-8")
+    ret = int.from_bytes(bytes[1:2], "big")
+    val = int.from_bytes(bytes[2:4], "big")
+    return {'cmd': cmd, 'ret': ret, 'val': val}
+
+
 with open(args.binfile, "rb") as f:
    try:
        ws = websocket.WebSocket()
+        print("send {}".format(args.binfile))
        ws.connect("ws://172.16.0.1")
        i = 0
-        rolling = 0
-        total = 0
+        bytes = f.read()
+        rolling = zlib.crc32(bytes)
+        total = len(bytes)
        while True:
-            bytes = f.read(512)
-            rolling = zlib.crc32(bytes, rolling)
-            total += len(bytes)
+            chunk = bytes[bs * i:bs * i + bs]
            msg = b'F\x00\x00\x00'
            msg += i.to_bytes(2, 'big')
-            msg += len(bytes).to_bytes(2, 'big')
-            msg += (zlib.crc32(bytes) & 0xffffffff).to_bytes(4, 'big')
-            msg += bytes
+            msg += len(chunk).to_bytes(2, 'big')
+            msg += (zlib.crc32(chunk) & 0xffffffff).to_bytes(4, 'big')
+            msg += chunk
            ws.send(msg)
-            reply = ws.recv()
+            print("\r{:6.2f}%".format(100 * i * bs / total), end='')
+            reply = parse_reply(ws.recv())
+            if reply['cmd'] == 'F' and reply['ret'] == 0:
+                i += 1
+            elif reply['cmd'] == 'F' and reply['ret'] == 1:
+                print("Error: SEQUENCE_OUT_OF_ORDER")
+                i = reply['val']
+            elif reply['cmd'] == 'F' and reply['ret'] == 2:
+                print("Error: CHECKSUM_MISMATCH")
+                i = reply['val']
+            else:
+                print(reply)
+
            time.sleep(0.05)
-            i += 1
-            if len(bytes) != 512:
+            if len(chunk) != bs:
                break
+
+        print("\rdone      ")
        msg = b'C\x00\x00\x00'
        msg += total.to_bytes(4, 'big')
-        msg += rolling.to_bytes(4, 'big')
+        msg += (rolling).to_bytes(4, 'big')
+        ws.settimeout(5)
        ws.send(msg)
-        print(ws.recv())
+        reply = parse_reply(ws.recv())
+        print(reply)
        ws.close()
+    except WebSocketTimeoutException:
+        pass
    except ConnectionResetError:
        pass
    except KeyboardInterrupt:
--- a/firmware/system.c
+++ b/firmware/system.c
@ -68,7 +68,7 @@ void system_otaflash_init() {
    otaflash_context.seq = 0;
 }

-int system_otaflash_chunk(uint8_t *data, uint16_t len, uint16_t seq, uint32_t hash) {
+enum return_code system_otaflash_chunk(uint8_t *data, uint16_t len, uint16_t seq, uint32_t hash, uint16_t *ack) {
    uint32_t local_hash = crc32(data, len);
    if(hash == local_hash && otaflash_context.seq == seq) {
        if(otaflash_context.head % SECTOR_SIZE == 0) {
@ -83,9 +83,13 @@ int system_otaflash_chunk(uint8_t *data, uint16_t len, uint16_t seq, uint32_t ha
        }
        otaflash_context.head += len;
        otaflash_context.seq++;
-        return 0x88;
+        return OK;
+    } else if(hash != local_hash) {
+        return CHECKSUM_MISMATCH;
    } else {
-        return 0xff;
+        if(ack)
+            *ack = otaflash_context.seq;
+        return SEQUENCE_OUT_OF_ORDER;
    }

 }
@ -96,21 +100,22 @@ void system_otaflash_verify_chunk(void *ctx, void *data, size_t len) {
    *(uint32_t *) ctx = digest;
 }

-int system_otaflash_verify_and_switch(uint32_t len, uint32_t hash) {
+enum return_code system_otaflash_verify_and_switch(uint32_t len, uint32_t hash) {

    uint32_t digest = 0;
    rboot_digest_image(otaflash_context.base, min(len, MAX_IMAGE_SIZE), system_otaflash_verify_chunk, &digest);

    if(hash != digest) {
        printf("OTA failed to verify firmware\r\n");
-        return 0x99;
+        return CHECKSUM_MISMATCH;
    }

    vPortEnterCritical();
    if(!rboot_set_current_rom(otaflash_context.slot)) {
-        printf("OTA failed to set new rboot slot\r\n");
+        printf("OTA Update failed to set new rboot slot\r\n");
+        vPortExitCritical();
+        return RBOOT_SWITCH_FAILED;
    }
-    sdk_system_restart();
-    vPortExitCritical(); // | should not be reached
-    return 0x77;         // |
+    vPortExitCritical();
+    return OK;
 }
--- a/firmware/system.h
+++ b/firmware/system.h
@ -6,6 +6,7 @@
 #define FIRMWARE_SYSTEM_H

 #include <stdint.h>
+#include "types.h"

 #ifdef __cplusplus
 extern "C" {
@ -17,9 +18,9 @@ void system_init_config();

 void system_otaflash_init();

-int system_otaflash_chunk(uint8_t *data, uint16_t len, uint16_t seq, uint32_t hash);
+enum return_code system_otaflash_chunk(uint8_t *data, uint16_t len, uint16_t seq, uint32_t hash, uint16_t *ack);

-int system_otaflash_verify_and_switch(uint32_t len, uint32_t hash);
+enum return_code system_otaflash_verify_and_switch(uint32_t len, uint32_t hash);

 #ifdef __cplusplus
 }
--- a/firmware/types.h
+++ b/firmware/types.h
@ -0,0 +1,20 @@
+//
+// Created by jedi on 09.09.21.
+//
+
+#ifndef FIRMWARE_TYPES_H
+#define FIRMWARE_TYPES_H
+
+#ifdef __cplusplus
+extern "C" {
+#endif
+
+enum return_code {
+    OK = 0, SEQUENCE_OUT_OF_ORDER, CHECKSUM_MISMATCH, RBOOT_SWITCH_FAILED, ERROR = 0xFF
+};
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif //FIRMWARE_TYPES_H
--- a/firmware/web.cpp
+++ b/firmware/web.cpp
@ -215,38 +215,48 @@ struct fw_check {
 void websocket_cb(struct tcp_pcb *pcb, char *data, u16_t data_len,
                  uint8_t /*mode*/) { //mode should be WS_BIN_MODE or WS_TEXT_MODE

-    uint8_t response[3];
-    uint16_t val = 0;
-    char cmd = '0';
+    uint8_t response[4];
+    auto &cmd = (char &) response[0];
+    auto &ret = response[1];
+    auto &val = (uint16_t &) response[2];
+    cmd = '0';
+    ret = ERROR;
+    val = 0;

-    bool togl = 0;
+    bool togl = false;

    switch (data[0]) {
        case 'R': // Restart
            cmd = 'R';
+            ret = OK;
            break;
        case 'X': // Clear Config
            cmd = 'X';
+            ret = OK;
            break;
        case 'D': // Disable LED
            signal_led(false);
-            val = 1;
            cmd = 'G';
+            ret = OK;
+            val = 1;
            break;
        case 'E': // Enable LED
            signal_led(true);
-            val = 0;
            cmd = 'G';
+            ret = OK;
+            val = 0;
            break;
        case 'F':
-            togl = ~togl;
+            togl = !togl;
            signal_led(togl);
            {
                auto *f = (fw_frame *) data;
                if(f->seq == 0) {
                    system_otaflash_init();
                }
-                val = system_otaflash_chunk(f->data, ntohs(f->len), ntohs(f->seq), ntohl(f->hash));
+                uint16_t ack = 0;
+                ret = system_otaflash_chunk(f->data, ntohs(f->len), ntohs(f->seq), ntohl(f->hash), &ack);
+                val = htons(ack);
            }
            cmd = 'F';
            break;
@ -254,32 +264,31 @@ void websocket_cb(struct tcp_pcb *pcb, char *data, u16_t data_len,
            signal_led(false);
            {
                auto *f = (fw_check *) data;
-                val = system_otaflash_verify_and_switch(ntohl(f->len), ntohl(f->hash));
+                ret = system_otaflash_verify_and_switch(ntohl(f->len), ntohl(f->hash));
            }
            cmd = 'C';
            break;
        default:
            printf("[websocket_callback]:\n%.*s\n", (int) data_len, (char *) data);
            printf("Unknown command %c\n", data[0]);
-            val = 0;
+            ret = ERROR;
            break;
    }

-    response[2] = (uint8_t) val;
-    response[1] = val >> 8;
-    response[0] = cmd;
-
    LOCK_TCPIP_CORE();
-    websocket_write(pcb, response, 3, WS_BIN_MODE);
+    websocket_write(pcb, response, 4, WS_BIN_MODE);
    UNLOCK_TCPIP_CORE();

-    if(data[0] == 'R') { // Restart
-        vTaskDelay(500 / portTICK_PERIOD_MS);
-        vPortEnterCritical();
-        sdk_system_restart();
-    } else if(data[0] == 'X') { // Clear Config
-        vTaskDelay(500 / portTICK_PERIOD_MS);
-        system_clear_config();
+    if(ret == OK) {
+        if(cmd == 'R' || cmd == 'C') { // Restart
+            printf("rebooting now");
+            vTaskDelay(1000 / portTICK_PERIOD_MS);
+            vPortEnterCritical();
+            sdk_system_restart();
+        } else if(cmd == 'X') { // Clear Config
+            vTaskDelay(1000 / portTICK_PERIOD_MS);
+            system_clear_config();
+        }
    }
 }

--- a/firmware/webdir/404.html
+++ b/firmware/webdir/404.html
@ -0,0 +1,22 @@
+<!DOCTYPE html>
+<html>
+<head>
+	<meta charset="utf-8">
+	<meta name="viewport" content="width=device-width, user-scalable=no">
+	<link rel="shortcut icon" href="img/favicon.png">
+	<title>HTTP Server</title>
+</head>
+<body>
+<ul class="navbar">
+	<li><a href="/">Home</a></li>
+	<li><a href="websockets">WebSockets</a></li>
+	<li><a href="about">About</a></li>
+</ul>
+
+<div class="grid main">
+	<h1>404 - Page not found</h1>
+	<div class="alert alert-error">Sorry, the page you are requesting was not found on this server.</div>
+</div>
+</body>
+</html>
+
--- a/firmware/fsdata/fs/css/picnic.min.css
+++ b/firmware/fsdata/fs/css/picnic.min.css
--- a/firmware/fsdata/fs/css/style.css
+++ b/firmware/fsdata/fs/css/style.css
@ -6,15 +6,15 @@ main {
 	margin-right: auto;
 }

-canvas{
+canvas {
 	width: 100%;
 }

-main section:target ~ section, main section#io, main section#wifi,  main section#ota  {
+main section:target ~ section, main section#io, main section#wifi, main section#ota {
 	display: none;
 }

-main section:target{
+main section:target {
 	display: block !important;
 }

@ -22,30 +22,34 @@ main section:target{
 	width: 100%;
 	display: table;
 }
-.table>.row{
+
+.table > .row {
 	display: table-row;
 }
-.table>.row:nth-child(2n) {
-	background: rgba(17,17,17,0.05);
+
+.table > .row:nth-child(2n) {
+	background: rgba(17, 17, 17, 0.05);
 }
-.table>.row>*{
-	display: table-cell;
-	padding: .3em 2.4em .3em .6em;
+
+.table > .row > * {
+    display: table-cell;
+    padding: .3em .6em .3em .6em;
 }
-.table>header.row>*{
+
+.table > header.row > * {
 	text-align: left;
 	font-weight: 900;
 	color: #fff;
 	background-color: #0074d9;
 }

-.table>.row>input{
+.table > .row > input {
 	border: none;
 	background: none;
 	font-weight: 900;
 }

-.plain{
+.plain {
 	opacity: initial;
 	width: initial;
 }
--- a/firmware/fsdata/fs/index.html
+++ b/firmware/fsdata/fs/index.html
@ -5,6 +5,7 @@
    <title>fiatlux v0.2</title>
    <link rel="stylesheet" href="css/picnic.min.css">
    <link rel="stylesheet" href="css/style.css">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
 </head>
 <body>
 <nav>
@ -30,6 +31,12 @@
                <div class="row">
                    <span><input id="firmware_file" type="file" onchange="load_firmware(event)"/></span>
                </div>
+                <div class="row">
+                    <div class="full" id="progress_ct_ota">
+                        <div id="progress_bar_ota"
+                             style="background:#0074d9; display: block; width:9%; color: #fff"></div>
+                    </div>
+                </div>
                <div class="row">
                    <span><input id="transmit_firmware" disabled type="submit" value="Upload"
                                 onclick="transmit_firmware(event)"></span>
@ -182,6 +189,10 @@
        return pos;
    };

+    DataView.prototype.getChar = function (pos) {
+        return String.fromCharCode(this.getInt8(pos));
+    };
+
    DataView.prototype.setString = function (pos, str) {
        for (var i = 0; i < str.length; i++) {
            this.setInt8(pos++, str.charCodeAt(i));
@ -237,7 +248,7 @@

            if (cmd === 'G')
                console.log("LED switched", val);
-            else if (cmd === 'F') {
+            else if ((cmd === 'F') || (cmd === "C")) {
                receive_chunk_confirmation(dv);
            } else if (cmd === 'V') {
                voltage.innerHTML = (val * 13 / 1024).toFixed(2);
@ -248,7 +259,7 @@
    }

    function wsOpen() {
-        var uri = "/stream"
+        var uri = "/stream";
        if (ws === undefined || ws.readyState !== 0) {
            if (retries)
                setMsg("warning", "WebSocket timeout, retrying..");
@ -264,6 +275,12 @@
                console.error(evt);
                setMsg("error", "WebSocket error!"); /*window.location.reload(true);*/
            };
+            ws.onclose = function (evt) {
+                msgStyle = "warning";
+                if (!evt.wasClean) msgStyle = "error";
+                setMsg(msgStyle, "WebSocket closed!");
+                setTimeout(() => wsOpen(), 0);
+            };
            ws.onmessage = function (evt) {
                onMessage(evt);
            };
@ -353,11 +370,11 @@
            frame.set(new Uint8Array(slice), 12);
            receive_chunk_confirmation = (dv) => {
                setTimeout(() => {
-                    resolve(i);
+                    resolve({cmd: dv.getChar(0), ret: dv.getUint8(1), val: dv.getUint16(2)});
                }, 50);
            }
            setTimeout(() => {
-                reject(i);
+                reject({frame_error: i});
            }, 2000);
            wsWrite(frame.buffer);
        });
@ -371,10 +388,10 @@
            headerview.setInt32(4, buf.byteLength);
            headerview.setInt32(8, hash);
            receive_chunk_confirmation = (dv) => {
-                resolve(i);
+                resolve({cmd: dv.getChar(0), ret: dv.getUint8(1), val: dv.getUint16(2)});
            }
            setTimeout(() => {
-                reject(i);
+                reject({final_error: 0});
            }, 500);
            wsWrite(frame);
        });
@ -386,14 +403,24 @@
            (async () => {
                const ash = crc32(firmware_file);
                for (var i = 0; i * chunk_size < firmware_file.byteLength; i++) {
-                    await transmit_firmware_chunk(firmware_file, i);
+                    update_progress("ota", i * chunk_size / firmware_file.byteLength * 100);
+                    const reply = await transmit_firmware_chunk(firmware_file, i);
+                    console.log("reply", reply)
                }
                await transmit_firmware_final(firmware_file, crc32(firmware_file));
+                update_progress("ota", 100);
            })().then(() => {
                console.log("transmit_firmware done");
            })
        }
    }
+
+    function update_progress(progressBar, progress) {
+        var iP = Math.floor(progress);
+        var dBar = document.getElementById("progress_bar_" + progressBar);
+        dBar.innerText = iP + "%";
+        dBar.style.width = progress + "%";
+    }
 </script>
 </body>
 </html>
--- a/firmware/fsdata/fs/js/smoothie_min.js
+++ b/firmware/fsdata/fs/js/smoothie_min.js
Author	SHA1	Message	Date
Eleon	c0a1c4f79e	mqtt verbindet All checks were successful continuous-integration/drone/push Build is passing Details	2021-09-12 22:03:11 +02:00
jedi	10e11d91b6	stash	2021-09-12 22:03:11 +02:00
jedi	24f5e4398d	Add error handling to OTA process All checks were successful continuous-integration/drone/push Build is passing Details	2021-09-12 22:00:59 +02:00
Marcus	8f052ecb37	Added Progress bar and Fixed OTA update All checks were successful continuous-integration/drone/push Build is passing Details	2021-09-12 20:59:09 +02:00
7m9	c0228cdf49	Added gzip compression All checks were successful continuous-integration/drone/push Build is passing Details	2021-09-09 14:30:10 +02:00