Added gzip compression

changed makefile
Script
2021-09-09 02:35:15 +02:00 · 2021-09-09 01:02:58 +02:00 · 2021-09-09 00:54:14 +02:00 · 2021-09-08 23:19:03 +02:00
27 changed files with 289 additions and 419 deletions
--- a/.build.yml
+++ b/.build.yml
@ -9,19 +9,17 @@ steps:
 - name: submodules
  image: alpine/git
  commands:
-  - git submodule update --init --recursive --depth 1
+  - git submodule update --init --recursive

 - name: firmware
  image: docker-repo.service.intern.lab.or.it:5000/fiatlux-build-env
  depends_on: [ submodules ]
  commands:
  - export PATH=$(pwd)/modules/sdk/xtensa-lx106-elf/bin:$PATH
-  - apt update
-  - apt install -y minify
  - make firmware -j$(nproc)

 - name: pcb
-  image: setsoft/kicad_auto:ki6
+  image: setsoft/kicad_auto
  commands:
  - apt update
  - apt install -y make zip
@ -64,6 +62,6 @@ steps:
    checksum:
      - sha512
      - md5
-    title: fiatlux
+    title: buildtest
  when:
    event: tag
--- a/.gitmodules
+++ b/.gitmodules
@ -1,6 +1,6 @@
 [submodule "modules/rtos"]
 	path = modules/rtos
-	url = https://git.neulandlabor.de/j3d1/esp-open-rtos.git
+	url = https://github.com/SuperHouse/esp-open-rtos.git
 [submodule "modules/sdk"]
 	path = modules/sdk
 	url = https://github.com/pfalcon/esp-open-sdk.git
--- a/8
+++ b/8
@ -1,3 +1,4 @@
+
 .PHONY: firmware flash firmware_docker case pcb

 all: firmware case pcb
@ -18,14 +19,9 @@ clean:
 	+@make -C firmware clean
 	+@make -C pcb clean

-flash_docker:
-	sh -c "docker build -t fiatlux_firmware_env docker/firmware"
-	sh -c "docker run --volume "$$(pwd)"/firmware:/app/firmware --device=/dev/ttyUSB0 fiatlux_firmware_env make -C firmware flash"
-
-
 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 html all"
+	sh -c "docker run --volume "$$(pwd)"/firmware:/app/firmware fiatlux_firmware_env make -C firmware 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
+ - bash gawk perl
 - g++ gcc
 - libc6-dev
 - flex bison
@ -69,3 +69,20 @@ In the project root run:
 nix-shell --option sandbox false
 make firmware -j$(nproc)
 ```
+
+
+
+>>> import htmlmin
+>>> input_html = '''
+  <body   style="background-color: tomato;">
+    <h1>  htmlmin   rocks</h1>
+    <pre>
+      and rolls
+    </pre>
+  </body>'''
+>>> htmlmin.minify(input_html)
+u' <body style="background-color: tomato;"> <h1> htmlmin rocks</h1> <pre>\n        and rolls\n      </pre> </body>'
+>>> print htmlmin.minify(input_html)
+ <body style="background-color: tomato;"> <h1> htmlmin rocks</h1> <pre>
+        and rolls
+      </pre> </body>
--- 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
+RUN apt remove --purge -y python2 && apt autoremove --purge -y && apt install -y python3 python3-serial perl
 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/
-build/
-compile_commands.json
+fsdata/fsdata.c
+compile_commands.json
--- a/firmware/.idea/firmware.iml
+++ b/firmware/.idea/firmware.iml
@ -1,5 +1,4 @@
 <?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,21 +1,20 @@
 PROGRAM=fiatlux

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

-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
+EXTRA_COMPONENTS=extras/i2s_dma extras/ws2812_i2s extras/dhcpserver extras/rboot-ota extras/mbedtls extras/httpd extras/sntp extras/cpp_support

 LIBS = hal m

-FLASH_MODE = qio
+FLASH_MODE = dio

 include ../modules/rtos/common.mk

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

-build/gen/fsdata.c: webdir/index.html webdir/404.html webdir/css/picnic.min.css webdir/css/style.css webdir/js/smoothie_min.js
+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
 	@echo "Generating fsdata.."
-	@mkdir -p $(dir $@)
-	@./mkwebfs.py --gzip --minify -o $@ $^
+	./mkwebfs.py

 test: unittest systest

--- a/firmware/fsdata/fs/404.html
+++ b/firmware/fsdata/fs/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,34 +22,30 @@ 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 .6em .3em .6em;
+.table>.row>*{
+	display: table-cell;
+	padding: .3em 2.4em .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,7 +5,6 @@
    <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>
@ -31,12 +30,6 @@
                <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>
@ -63,16 +56,6 @@
                </div>
            </div>
        </article>
-        <article class="card">
-            <header>
-                <h3>Syslog</h3>
-            </header>
-            <div class="table">
-                <div class="row">
-                    <pre id="syslog"></pre>
-                </div>
-            </div>
-        </article>

    </section>
    <section id="dashboard">
@ -191,7 +174,6 @@
 <script>
    var menu = document.getElementById("bmenub");
    var voltage = document.getElementById("out_voltage");
-    var syslog = document.getElementById("syslog");

    var unused_values = {};

@ -200,10 +182,6 @@
        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));
@ -220,7 +198,7 @@
        sbox = document.getElementById('status_box');
        sbox.className = "label " + cls;
        sbox.innerHTML = text;
-        console.info(text);
+        console.log(text);
    }

    function startPolling() {
@ -259,25 +237,18 @@

            if (cmd === 'G')
                console.log("LED switched", val);
-            else if ((cmd === 'F') || (cmd === "C")) {
+            else if (cmd === 'F') {
                receive_chunk_confirmation(dv);
            } else if (cmd === 'V') {
                voltage.innerHTML = (val * 13 / 1024).toFixed(2);
                series.append(new Date().getTime(), val);
-            } else if (cmd === 'L') {
-                var len = dv.getUint8(1);
-                var offset = dv.getUint16(2);
-                var str = "";
-                for (var i = 0; i < len; i++)
-                    str += dv.getChar(4 + i);
-                syslog.innerHTML = syslog.innerHTML.slice(0, offset) + str;
            } else
                console.log('unknown command', cmd, val);
        }
    }

    function wsOpen() {
-        var uri = "/stream";
+        var uri = "/stream"
        if (ws === undefined || ws.readyState !== 0) {
            if (retries)
                setMsg("warning", "WebSocket timeout, retrying..");
@ -293,12 +264,6 @@
                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);
            };
@ -388,11 +353,11 @@
            frame.set(new Uint8Array(slice), 12);
            receive_chunk_confirmation = (dv) => {
                setTimeout(() => {
-                    resolve({cmd: dv.getChar(0), ret: dv.getUint8(1), val: dv.getUint16(2)});
+                    resolve(i);
                }, 50);
            }
            setTimeout(() => {
-                reject({frame_error: i});
+                reject(i);
            }, 2000);
            wsWrite(frame.buffer);
        });
@ -406,10 +371,10 @@
            headerview.setInt32(4, buf.byteLength);
            headerview.setInt32(8, hash);
            receive_chunk_confirmation = (dv) => {
-                resolve({cmd: dv.getChar(0), ret: dv.getUint8(1), val: dv.getUint16(2)});
+                resolve(i);
            }
            setTimeout(() => {
-                reject({final_error: 0});
+                reject(i);
            }, 500);
            wsWrite(frame);
        });
@ -421,24 +386,14 @@
            (async () => {
                const ash = crc32(firmware_file);
                for (var i = 0; i * chunk_size < firmware_file.byteLength; 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_chunk(firmware_file, i);
                }
                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
--- a/firmware/fsdata/makefsdata
+++ b/firmware/fsdata/makefsdata
@ -0,0 +1,110 @@
+#!/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");
+        } 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/log.cpp
+++ b/firmware/log.cpp
@ -1,49 +0,0 @@
-//
-// Created by jedi on 18.11.21.
-//
-
-#include "log.h"
-
-#include <espressif/esp_common.h>
-
-constexpr unsigned syslog_buffer_size = 1024;
-char syslog_buf[syslog_buffer_size];
-volatile unsigned head = 0;
-volatile unsigned streams = 0;
-
-extern "C" void syslog(const char *msg) {
-    printf("syslog> %s", msg);
-    while (char c = *msg++) {
-        syslog_buf[head++ % syslog_buffer_size] = c;
-    }
-    syslog_buf[head] = 0;
-}
-
-unsigned syslog_current_tail() {
-    if(head < syslog_buffer_size)
-        return 0;
-    return head + 1 - syslog_buffer_size;
-}
-
-unsigned syslog_data_after(unsigned local_tail) {
-    if(local_tail > head)
-        return 0;
-    return (head % syslog_buffer_size) - (local_tail % syslog_buffer_size);
-}
-
-extern "C" int syslog_copy_out(char *out, int len, unsigned local_tail) {
-    unsigned cnt = 0;
-    while (cnt < syslog_data_after(local_tail) && cnt < len) {
-        out[cnt] = syslog_buf[local_tail % syslog_buffer_size + cnt];
-        cnt++;
-    }
-    return cnt;
-}
-
-extern "C" void syslog_attach() {
-    streams++;
-}
-
-extern "C" void syslog_detach() {
-    streams--;
-}
--- a/firmware/log.h
+++ b/firmware/log.h
@ -1,28 +0,0 @@
-//
-// Created by jedi on 18.11.21.
-//
-
-#ifndef FIRMWARE_LOG_H
-#define FIRMWARE_LOG_H
-
-#ifdef __cplusplus
-extern "C" {
-#endif
-
-void syslog(const char *);
-
-unsigned syslog_current_tail();
-
-unsigned syslog_data_after(unsigned);
-
-int syslog_copy_out(char *, int, unsigned);
-
-void syslog_attach();
-
-void syslog_detach();
-
-#ifdef __cplusplus
-}
-#endif
-
-#endif //FIRMWARE_LOG_H
--- a/firmware/mkwebfs.py
+++ b/firmware/mkwebfs.py
@ -1,49 +1,10 @@
 #!/usr/bin/env python3
 import os
 import gzip
-import argparse
-import subprocess
-
-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('--minify', dest='minify', action='store_true')
-parser.add_argument('--no-minify', dest='minify', action='store_false')
-parser.set_defaults(minify=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 mimeFromName(name):
-    if name.endswith(".html") or name.endswith(".htm") or name.endswith(".shtml") or name.endswith(
-            ".shtm") or name.endswith(".ssi"):
-        return "text/html"
-    if name.endswith(".js"):
-        return "application/x-javascript"
-    if name.endswith(".css"):
-        return "text/css"
-    if name.endswith(".ico"):
-        return "image/x-icon"
-    if name.endswith(".gif"):
-        return "image/gif"
-    if name.endswith(".png"):
-        return "image/png"
-    if name.endswith(".jpg"):
-        return "image/jpeg"
-    if name.endswith(".bmp"):
-        return "image/bmp"
-    if name.endswith(".class"):
-        return "application/octet-stream"
-    if name.endswith(".ram"):
-        return "audio/x-pn-realaudio"
-    return "text/plain"

+incHttpHeader = True
+useCompression = True
+fileDir = "fsdata/fs/"

 def dumpBin2CHex(f, b):
    oStr = "\t"
@ -57,42 +18,53 @@ def dumpBin2CHex(f, b):
    f.write(oStr)


-f_fsdata_c = open(args.output, 'w')
+f_fsdata_c = open('fsdata/fsdata.c', 'w')
 f_fsdata_c.write('#include "httpd/fsdata.h"\n\n')

-httpFiles = [file for file in args.input if (args.webroot in file)]
+httpFiles = []
+for root, dirs, files in os.walk(fileDir):
+    for file in files:
+        httpFiles.append("{}/{}".format(root, file).replace("//", "/"))

 lastFileStruct = "NULL"

 for file in httpFiles:
    response = b''
-
-    webPath = ("/" + file.removeprefix(args.webroot)).replace("//", "/")
-    print("{} > {}".format(file, webPath))
-
-    mimeType = mimeFromName(file)
-
-    if args.header:
-        if ("404" in file):
+    if incHttpHeader:
+        print(file)
+        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"
-        response += b'Content-type: ' + mimeType.encode() + b'\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.minify:
-            p = subprocess.Popen(["minify", "--html-keep-document-tags", "--mime", mimeType], stdin=subprocess.PIPE,
-                                 stdout=subprocess.PIPE)
-            minData = p.communicate(binData)[0]
-            if len(minData) < len(binData):
-                print("- Minify: {} -> {}".format(len(binData), len(minData)))
-                compEff = True
-                binData = minData
-
-        if args.gzip:
+        if useCompression:
            compData = gzip.compress(binData, 9)
            if len(compData) < len(binData):
                compEff = True
@ -110,6 +82,7 @@ for file in httpFiles:
        escFile = file.replace("/", "_").replace(".", "_")
        escFileData = "data_" + escFile
        escFileFile = "file_" + escFile
+        webPath = ("/" + file.replace(fileDir, "")).replace("//", "/")

        f_fsdata_c.write('static const unsigned char {}[] = {{\n'.format(escFileData))
        f_fsdata_c.write('\t/* LOCAL:{} */\n'.format(file))
@ -118,11 +91,10 @@ for file in httpFiles:
        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
+                .format(escFileFile, lastFileStruct, escFileData, escFileData, len(fnameBin), escFileData, len(fnameBin)))
+        #TODO: The last value is 1 if incHttpHeader == True
        lastFileStruct = escFileFile

 f_fsdata_c.write("\n")
--- a/firmware/otaflash.py
+++ b/firmware/otaflash.py
@ -4,69 +4,40 @@ 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")
-parser.add_argument("address")

 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://" + args.address)
+        ws.connect("ws://172.16.0.1")
        i = 0
-        bytes = f.read()
-        rolling = zlib.crc32(bytes)
-        total = len(bytes)
+        rolling = 0
+        total = 0
        while True:
-            chunk = bytes[bs * i:bs * i + bs]
+            bytes = f.read(512)
+            rolling = zlib.crc32(bytes, rolling)
+            total += len(bytes)
            msg = b'F\x00\x00\x00'
            msg += i.to_bytes(2, 'big')
-            msg += len(chunk).to_bytes(2, 'big')
-            msg += (zlib.crc32(chunk) & 0xffffffff).to_bytes(4, 'big')
-            msg += chunk
+            msg += len(bytes).to_bytes(2, 'big')
+            msg += (zlib.crc32(bytes) & 0xffffffff).to_bytes(4, 'big')
+            msg += bytes
            ws.send(msg)
-            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)
-
+            reply = ws.recv()
            time.sleep(0.05)
-            if len(chunk) != bs:
+            i += 1
+            if len(bytes) != 512:
                break
-
-        print("\rdone      ")
        msg = b'C\x00\x00\x00'
        msg += total.to_bytes(4, 'big')
-        msg += (rolling).to_bytes(4, 'big')
-        ws.settimeout(5)
+        msg += rolling.to_bytes(4, 'big')
        ws.send(msg)
-        reply = parse_reply(ws.recv())
-        print(reply)
+        print(ws.recv())
        ws.close()
-    except WebSocketTimeoutException:
-        pass
    except ConnectionResetError:
        pass
    except KeyboardInterrupt:
--- a/firmware/system.c
+++ b/firmware/system.c
@ -4,7 +4,6 @@

 #include "system.h"
 #include "crc32.h"
-#include "log.h"

 #include <FreeRTOS.h>
 #include <sysparam.h>
@ -40,7 +39,7 @@ void system_init_config() {
    uint32_t num_sectors;
    sysparam_init(base_addr, 0);
    if(sysparam_get_info(&base_addr, &num_sectors) != SYSPARAM_OK) {
-        syslog("Warning: WiFi config, sysparam not initialized\n");
+        printf("Warning: WiFi config, sysparam not initialized\n");
        num_sectors = 0x2000 / sdk_flashchip.sector_size;
        if(sysparam_create_area(base_addr, num_sectors, true) == SYSPARAM_OK) {
            sysparam_init(base_addr, 0);
@ -69,7 +68,7 @@ void system_otaflash_init() {
    otaflash_context.seq = 0;
 }

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

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

-enum return_code system_otaflash_verify_and_switch(uint32_t len, uint32_t hash) {
+int 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) {
-        syslog("OTA failed to verify firmware\r\n");
-        return CHECKSUM_MISMATCH;
+        printf("OTA failed to verify firmware\r\n");
+        return 0x99;
    }

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

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

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

 void system_otaflash_init();

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

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

 #ifdef __cplusplus
 }
--- a/firmware/types.h
+++ b/firmware/types.h
@ -1,20 +0,0 @@
-//
-// 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
@ -6,7 +6,6 @@
 #include "system.h"
 #include "lux.h"
 #include "wifi.h"
-#include "log.h"

 #include <cstring>
 #include <FreeRTOS.h>
@ -37,34 +36,16 @@ void websocket_task(void *pvParameter) {

    size_t connstarttime = xTaskGetTickCount();
    has_changed = {true, true, true};
-    syslog_attach();
-    unsigned local_log_tail = syslog_current_tail();

    for (;;) {
        if(pcb == nullptr || pcb->state != ESTABLISHED) {
-            syslog("Connection closed, deleting task\n");
+            printf("Connection closed, deleting task\n");
            break;
        }

-        //Syslog
-        if(syslog_data_after(local_log_tail) != 0) {
-            char response[128];
-            response[0] = 'L';
-            size_t len = syslog_copy_out(&response[4], 124, local_log_tail);
-            response[1] = len;
-            ((uint16_t &) response[2]) = local_log_tail & 0xFFFF;
-            if(len < sizeof(response)) {
-                LOCK_TCPIP_CORE();
-                websocket_write(pcb, (unsigned char *) response, len + 4, WS_BIN_MODE);
-                local_log_tail += len;
-                UNLOCK_TCPIP_CORE();
-            } else
-                syslog("buffer too small -1\n");
-            vTaskDelayMs(1000);
-        }
-
        //Global Info
        if(has_changed.global) {
+            has_changed.global = false;
            timeval tv{};
            gettimeofday(&tv, nullptr);
            size_t uptime = xTaskGetTickCount() * portTICK_PERIOD_MS / 1000;
@ -76,7 +57,7 @@ void websocket_task(void *pvParameter) {

            sysparam_get_string("hostname", &hostname);
            /* Generate response in JSON format */
-            char response[192];
+            char response[160];
            size_t len = snprintf(response, sizeof(response),
                                  "{\"walltime\" : \"%d\","
                                  "\"uptime\" : \"%d\","
@ -90,22 +71,22 @@ void websocket_task(void *pvParameter) {
            if(len < sizeof(response)) {
                LOCK_TCPIP_CORE();
                websocket_write(pcb, (unsigned char *) response, len, WS_TEXT_MODE);
-                has_changed.global = false;
                UNLOCK_TCPIP_CORE();
            } else
-                syslog("buffer too small 0\n");
-            vTaskDelayMs(1000);
+                printf("buffer too small 1");
+            vTaskDelayMs(2000);
        }

        //Connection Info
        if(has_changed.connection) {
+            has_changed.connection = false;
            timeval tv{};
            gettimeofday(&tv, nullptr);
            size_t connuptime = (xTaskGetTickCount() - connstarttime) * portTICK_PERIOD_MS / 1000;

            printf("conn %d: " IPSTR " <-> " IPSTR " \n", pcb->netif_idx, IP2STR(&pcb->local_ip),
                   IP2STR(&pcb->remote_ip));
-            char response[192];
+            char response[160];
            size_t len = snprintf(response, sizeof(response),
                                  "{\"connage\" : \"%d\","
                                  "\"clientip\" : \"" IPSTR "\""
@ -113,11 +94,10 @@ void websocket_task(void *pvParameter) {
            if(len < sizeof(response)) {
                LOCK_TCPIP_CORE();
                websocket_write(pcb, (unsigned char *) response, len, WS_TEXT_MODE);
-                has_changed.connection = false;
                UNLOCK_TCPIP_CORE();
            } else
-                syslog("buffer too small 1\n");
-            vTaskDelayMs(1000);
+                printf("buffer too small 1");
+            vTaskDelayMs(2000);
        }

        if(has_changed.wifi) {
@ -172,10 +152,10 @@ void websocket_task(void *pvParameter) {
                    websocket_write(pcb, (unsigned char *) response, len, WS_TEXT_MODE);
                    UNLOCK_TCPIP_CORE();
                } else
-                    syslog("buffer too small 2\n");
+                    printf("buffer too small 2");
            }

-            vTaskDelayMs(1000);
+            vTaskDelayMs(2000);

            if(opmode == STATION_MODE || opmode == STATIONAP_MODE) {
                uint8_t hwaddr[6];
@ -199,7 +179,7 @@ void websocket_task(void *pvParameter) {
                    websocket_write(pcb, (unsigned char *) response, len, WS_TEXT_MODE);
                    UNLOCK_TCPIP_CORE();
                } else
-                    syslog("buffer too small 3\n");
+                    printf("buffer too small 3");
            }

        }
@ -207,8 +187,6 @@ void websocket_task(void *pvParameter) {
        vTaskDelayMs(500);
    }

-    syslog_detach();
-
    vTaskDelete(nullptr);
 }

@ -237,38 +215,28 @@ 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[4];
-    auto &cmd = (char &) response[0];
-    auto &ret = response[1];
-    auto &val = (uint16_t &) response[2];
-    cmd = '0';
-    ret = ERROR;
-    val = 0;
+    uint8_t response[3];
+    uint16_t val = 0;
+    char cmd = '0';

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

    switch (data[0]) {
        case 'R': // Restart
            cmd = 'R';
-            ret = OK;
            break;
        case 'X': // Clear Config
            cmd = 'X';
-            ret = OK;
            break;
        case 'D': // Disable LED
-            syslog("G\n");
            signal_led(false);
-            cmd = 'G';
-            ret = OK;
            val = 1;
+            cmd = 'G';
            break;
        case 'E': // Enable LED
-            syslog("E\n");
            signal_led(true);
-            cmd = 'G';
-            ret = OK;
            val = 0;
+            cmd = 'G';
            break;
        case 'F':
            togl = !togl;
@ -278,9 +246,7 @@ void websocket_cb(struct tcp_pcb *pcb, char *data, u16_t data_len,
                if(f->seq == 0) {
                    system_otaflash_init();
                }
-                uint16_t ack = 0;
-                ret = system_otaflash_chunk(f->data, ntohs(f->len), ntohs(f->seq), ntohl(f->hash), &ack);
-                val = htons(ack);
+                val = system_otaflash_chunk(f->data, ntohs(f->len), ntohs(f->seq), ntohl(f->hash));
            }
            cmd = 'F';
            break;
@ -288,31 +254,32 @@ void websocket_cb(struct tcp_pcb *pcb, char *data, u16_t data_len,
            signal_led(false);
            {
                auto *f = (fw_check *) data;
-                ret = system_otaflash_verify_and_switch(ntohl(f->len), ntohl(f->hash));
+                val = 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]);
-            ret = ERROR;
+            val = 0;
            break;
    }

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

-    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();
-        }
+    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();
    }
 }

--- a/firmware/webdir/404.html
+++ b/firmware/webdir/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/wifi.cpp
+++ b/firmware/wifi.cpp
@ -3,7 +3,6 @@
 //

 #include "wifi.h"
-#include "log.h"

 #include <cstdlib>
 #include <cstring>
@ -37,7 +36,7 @@ SemaphoreHandle_t wifi_available_semaphore = nullptr;
    char *wifi_ap_ip_addr = nullptr;
    sysparam_get_string("wifi_ap_ip_addr", &wifi_ap_ip_addr);
    if(!wifi_ap_ip_addr) {
-        syslog("dns: no ip address\n");
+        printf("dns: no ip address\n");
        vTaskDelete(nullptr);
    }
    ip4_addr_t server_addr;
@ -195,7 +194,7 @@ extern "C" void wifi_task(void *pvParameters) {
        /* If the ssid and password are not valid then disable the AP interface. */
        if(!wifi_ap_ssid || strlen(wifi_ap_ssid) < 1 || strlen(wifi_ap_ssid) >= 32 ||
           !wifi_ap_password || strlen(wifi_ap_password) < 8 || strlen(wifi_ap_password) >= 64) {
-            syslog("len err\n");
+            printf("len err\n");
            wifi_ap_enable = 0;
        }
    }
--- a/modules/rtos
+++ b/modules/rtos
@ -1 +1 @@
-Subproject commit 7faa16b07ce0d606f9525a316990da5b58e61314
+Subproject commit 503e66a500419e8863998b7ea784c5e26a7a5f7c
--- a/pcb/.gitignore
+++ b/pcb/.gitignore
@ -31,8 +31,6 @@ fp-info-cache
 *.wrl
 *.step

-*-backups/
+*-bak
 gen/
 pcb.zip
-
-report.txt
--- a/webapp/.gitignore
+++ b/webapp/.gitignore
@ -1,3 +0,0 @@
-node_modules/
-src/gen/
-package-lock.json
Author	SHA1	Message	Date
7m9	8a9e1b6708	Added gzip compression All checks were successful continuous-integration/drone/push Build is passing Details	2021-09-09 02:35:15 +02:00
7m9	28cf59ee91	changed makefile All checks were successful continuous-integration/drone/push Build is passing Details	2021-09-09 01:02:58 +02:00
7m9	82f0634376	Script All checks were successful continuous-integration/drone/push Build is passing Details	2021-09-09 00:54:14 +02:00
jedi	51ed3b3b1c	stash All checks were successful continuous-integration/drone/push Build is passing Details	2021-09-08 23:19:03 +02:00