minify web content

.build.yml

@@ -9,17 +9,19 @@ steps:
 - name: submodules
   image: alpine/git
   commands:
-  - git submodule update --init --recursive
+  - git submodule update --init --recursive --depth 1
 
 - 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
+  image: setsoft/kicad_auto:ki6
   commands:
   - apt update
   - apt install -y make zip
@@ -62,6 +64,6 @@ steps:
     checksum:
       - sha512
       - md5
-    title: buildtest
+    title: fiatlux
   when:
     event: tag

Makefile

@@ -1,4 +1,3 @@
-
 .PHONY: firmware flash firmware_docker case pcb
 
 all: firmware case pcb
@@ -19,6 +18,11 @@ 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"

firmware/Makefile

@@ -2,11 +2,11 @@ PROGRAM=fiatlux
 
 EXTRA_CFLAGS=-O3 -Ibuild/gen -DLWIP_NETIF_HOSTNAME=1
 
-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
 
-FLASH_MODE = dio
+FLASH_MODE = qio
 
 include ../modules/rtos/common.mk
 
@@ -15,7 +15,7 @@ html: build/gen/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
 	@echo "Generating fsdata.."
 	@mkdir -p $(dir $@)
-	@./mkwebfs.py --gzip -o $@ $^
+	@./mkwebfs.py --gzip --minify -o $@ $^
 
 test: unittest systest
 

firmware/constcat.h

@@ -1,65 +0,0 @@
-//
-// Created by jedi on 23.07.21.
-//
-
-#ifdef __cplusplus
-
-template<size_t S>
-using size=std::integral_constant<size_t, S>;
-
-template<class T, size_t N>
-constexpr size<N> length( T const(&)[N] ) { return {}; }
-template<class T, size_t N>
-constexpr size<N> length( std::array<T, N> const& ) { return {}; }
-
-template<class T>
-using length_t = decltype(length(std::declval<T>()));
-
-constexpr size_t string_size() { return 0; }
-template<class...Ts>
-constexpr size_t string_size( size_t i, Ts... ts ) {
-return (i?i-1:0) + string_size(ts...);
-}
-template<class...Ts>
-using string_length=size< string_size( length_t<Ts>{}... )>;
-
-template<class...Ts>
-using combined_string = std::array<char, string_length<Ts...>{}+1>;
-
-template<class Lhs, class Rhs, unsigned...I1, unsigned...I2>
-constexpr const combined_string<Lhs,Rhs>
-concat_impl( Lhs const& lhs, Rhs const& rhs, seq<I1...>, seq<I2...>)
-{
-// the '\0' adds to symmetry:
-return {{ lhs[I1]..., rhs[I2]..., '\0' }};
-}
-
-template<class Lhs, class Rhs>
-constexpr const combined_string<Lhs,Rhs>
-concat(Lhs const& lhs, Rhs const& rhs)
-{
-return concat_impl(
-        lhs, rhs,
-        gen_seq<string_length<Lhs>{}>{},
-gen_seq<string_length<Rhs>{}>{}
-);
-}
-
-template<class T0, class T1, class... Ts>
-constexpr const combined_string<T0, T1, Ts...>
-concat(T0 const&t0, T1 const&t1, Ts const&...ts)
-{
-return concat(t0, concat(t1, ts...));
-}
-
-template<class T>
-constexpr const combined_string<T>
-concat(T const&t) {
-return concat(t, "");
-}
-constexpr const combined_string<>
-concat() {
-    return concat("");
-}
-
-#endif

firmware/mkwebfs.py

@@ -2,6 +2,7 @@
 import os
 import gzip
 import argparse
+import subprocess
 
 parser = argparse.ArgumentParser()
 parser.add_argument('-o', '--output', help='Output file name', default='stdout')
@@ -9,6 +10,9 @@ 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)
@@ -16,6 +20,31 @@ 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"
+
+
 def dumpBin2CHex(f, b):
     oStr = "\t"
     n = 0
@@ -41,40 +70,28 @@ for file in httpFiles:
     webPath = ("/" + file.removeprefix(args.webroot)).replace("//", "/")
     print("{} > {}".format(file, webPath))
 
+    mimeType = mimeFromName(file)
+
     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]
+        response += b'Content-type: ' + mimeType.encode() + b'\r\n'
-        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:
             compData = gzip.compress(binData, 9)
             if len(compData) < len(binData):
@@ -103,7 +120,8 @@ for file in httpFiles:
         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)))
+                         .format(escFileFile, lastFileStruct, escFileData, escFileData, len(fnameBin), escFileData,
+                                 len(fnameBin)))
         # TODO: The last value is 1 if args.header == True
         lastFileStruct = escFileFile
 

firmware/web.cpp

@@ -204,21 +204,7 @@ void websocket_task(void *pvParameter) {
 
         }
 
-        vTaskDelayMs(250);
-        {
-            uint8_t response[3];
-            uint16_t val;
-            val = sdk_system_adc_read();
-            response[2] = (uint8_t) val;
-            response[1] = val >> 8;
-            response[0] = 'V';
-            LOCK_TCPIP_CORE();
-            websocket_write(pcb, response, 3, WS_BIN_MODE);
-            UNLOCK_TCPIP_CORE();
-        }
         vTaskDelayMs(500);
-        //printf("9: %d\n",gpio_read(9));
-        //printf("10: %d\n",gpio_read(10));
     }
 
     syslog_detach();
@@ -261,18 +247,7 @@ void websocket_cb(struct tcp_pcb *pcb, char *data, u16_t data_len,
 
     bool togl = false;
 
-    int8_t en = 0;
-    /*uint8_t ap_disable_if_sta = 0;
-    uint8_t ssid_hidden = 0;
-    uint8_t dns_enable = 0;
-    uint8_t mdns_enable = 0;*/
-
     switch (data[0]) {
-        case 'V': // ADC
-            /* This should be done on a separate thread in 'real' applications */
-            val = sdk_system_adc_read();
-            cmd = 'V';
-            break;
         case 'R': // Restart
             cmd = 'R';
             ret = OK;
@@ -317,41 +292,6 @@ void websocket_cb(struct tcp_pcb *pcb, char *data, u16_t data_len,
             }
             cmd = 'C';
             break;
-        case 'S': {
-            if(data[1] == 'E')
-                en = 1;
-            char *ssid = &data[2];
-            size_t ssid_len = strlen(ssid);
-            char *password = &data[3 + ssid_len];
-            size_t password_len = strlen(password);
-            (void) password_len;
-
-            sysparam_set_int8("wifi_sta_enable", en);
-            sysparam_set_string("wifi_sta_ssid", ssid);
-            sysparam_set_string("wifi_sta_password", password);
-        }
-            cmd = 'S';
-            break;
-        case 'A': {
-            if(data[1] == 'E')
-                en = 1;
-            char *ssid = &data[2];
-            size_t ssid_len = strlen(ssid);
-            char *password = &data[3 + ssid_len];
-            size_t password_len = strlen(password);
-            (void) password_len;
-
-            sysparam_set_int8("wifi_ap_enable", en);
-            sysparam_set_string("wifi_ap_ssid", ssid);
-            sysparam_set_string("wifi_ap_password", password);
-
-            //sysparam_set_int8("wifi_ap_disable_if_sta", ap_disable_if_sta);
-            //sysparam_set_int8("wifi_ap_ssid_hidden", ssid_hidden);
-            //sysparam_set_int8("wifi_ap_dns", dns_enable);
-            //sysparam_set_int8("wifi_ap_mdns", mdns_enable);
-        }
-            cmd = 'A';
-            break;
         default:
             printf("[websocket_callback]:\n%.*s\n", (int) data_len, (char *) data);
             printf("Unknown command %c\n", data[0]);
@@ -387,36 +327,11 @@ void websocket_open_cb(struct tcp_pcb *pcb, const char *uri) {
     }
 }
 
-/*const char *gpio_cgi_handler(int iIndex, int iNumParams, char *pcParam[], char *pcValue[]) {
-    for (int i = 0; i < iNumParams; i++) {
-        if(strcmp(pcParam[i], "on") == 0) {
-            uint8_t gpio_num = atoi(pcValue[i]);
-            gpio_enable(gpio_num, GPIO_OUTPUT);
-            gpio_write(gpio_num, true);
-        } else if(strcmp(pcParam[i], "off") == 0) {
-            uint8_t gpio_num = atoi(pcValue[i]);
-            gpio_enable(gpio_num, GPIO_OUTPUT);
-            gpio_write(gpio_num, false);
-        } else if(strcmp(pcParam[i], "toggle") == 0) {
-            uint8_t gpio_num = atoi(pcValue[i]);
-            gpio_enable(gpio_num, GPIO_OUTPUT);
-            gpio_toggle(gpio_num);
-        }
-    }
-    return "/index.html";
-}*/
-
 extern "C" void httpd_task(void *pvParameters) {
     (void) pvParameters;
 
     while (!uxSemaphoreGetCount(wifi_available_semaphore))
         vTaskDelay(500 / portTICK_PERIOD_MS);
-    /*tCGI pCGIs[] = {
-            {"/gpio", (tCGIHandler) gpio_cgi_handler},
-    };
-
-    // register handlers and start the server
-    http_set_cgi_handlers(pCGIs, sizeof(pCGIs) / sizeof(pCGIs[0]));*/
     websocket_register_callbacks((tWsOpenHandler) websocket_open_cb, (tWsHandler) websocket_cb);
     httpd_init();
 

firmware/webdir/404.html

@@ -1,31 +1,22 @@
 <!DOCTYPE html>
-<html lang="en">
+<html>
 <head>
-	<meta charset="utf-8"/>
+	<meta charset="utf-8">
-	<title>fiatlux v0.2 | Error 404</title>
+	<meta name="viewport" content="width=device-width, user-scalable=no">
-	<link rel="stylesheet" href="css/picnic.min.css">
+	<link rel="shortcut icon" href="img/favicon.png">
-	<link rel="stylesheet" href="css/style.css">
+	<title>HTTP Server</title>
-	<meta name="viewport" content="width=device-width, initial-scale=1.0">
 </head>
 <body>
-<nav>
+<ul class="navbar">
-	<a href="#" class="brand">
+	<li><a href="/">Home</a></li>
-		<span>fiatlux v0.2</span>
+	<li><a href="websockets">WebSockets</a></li>
-	</a>
+	<li><a href="about">About</a></li>
-	<input id="bmenub" type="checkbox" class="show">
+</ul>
-	<label for="bmenub" class="burger pseudo button">&#9776;</label>
+
-	<div class="menu">
+<div class="grid main">
-		<a href="/#" class="button icon-picture">Dashboard</a>
+	<h1>404 - Page not found</h1>
-		<a href="/#wifi" class="button icon-puzzle">Wifi Settings</a>
+	<div class="alert alert-error">Sorry, the page you are requesting was not found on this server.</div>
-		<a href="/#ota" class="button icon-picture">System</a>
 </div>
-</nav>
-<main id="error">
-	<h2>Error 404 Not Found </h2>
-	<p>
-		The page you requested was not found on this system.
-		<a href="/#">Go back</a>
-	</p>
-</main>
 </body>
 </html>
+

firmware/webdir/index.html

@@ -17,8 +17,6 @@
     <label for="bmenub" class="burger pseudo button">&#9776;</label>
     <div class="menu">
         <a href="/#" class="button icon-picture">Dashboard</a>
-        <a href="/#io" class="button icon-puzzle">I/O</a>
-        <a href="/#wifi" class="button icon-puzzle">Wifi Settings</a>
         <a href="/#ota" class="button icon-picture">System</a>
     </div>
 </nav>
@@ -77,125 +75,6 @@
         </article>
 
     </section>
-    <section id="io">
-        <h2>I/O</h2>
-        <article class="card">
-            <header>
-                <h3>Protocols</h3>
-            </header>
-            <div class="table">
-                <div class="row">
-                    <label>MQTT</label>
-                    <span><input type="checkbox" class="plain"/></span>
-                </div>
-                <div class="row">
-                    <span><input type="reset" class="button"/></span>
-                    <span><input type="submit" value="Save"></span>
-                </div>
-            </div>
-        </article>
-        <article class="card">
-            <header>
-                <h3>Station Mode <span class="label success">current connection</span></h3>
-            </header>
-            <div class="table">
-                <div class="row">
-                    <label>WS2812 via I2S</label>
-                    <span><input type="checkbox" class="plain"/></span>
-                    <span><input type="color"/></span>
-                </div>
-                <div class="row">
-                    <label>APA102C via SPI</label>
-                    <span><input type="checkbox" class="plain"/></span>
-                    <span><input type="color"/></span>
-                </div>
-                <div class="row">
-                    <label>6 Channel SPI Dimmer</label>
-                    <span><input type="checkbox" class="plain"/></span>
-                    <span><input type="color"/></span>
-                </div>
-                <div class="row">
-                    <label>Binary Output on GPIO4</label>
-                    <span><input type="checkbox" class="plain"/></span>
-                    <span><button class="toggle button">Toggle</button></span>
-                </div>
-                <div class="row">
-                    <label>Binary Output on GPIO5</label>
-                    <span><input type="checkbox" class="plain"/></span>
-                    <span><button class="toggle button">Toggle</button></span>
-                </div>
-                <div class="row">
-                    <span><input type="reset" class="button"/></span>
-                    <span><input type="submit" value="Save"></span>
-                </div>
-            </div>
-        </article>
-    </section>
-    <section id="wifi">
-        <h2>Wifi Settings</h2>
-        <article class="card">
-            <header>
-                <h3>AP Mode</h3>
-            </header>
-            <div class="table">
-                <div class="row">
-                    <label>Enable</label>
-                    <span><input id="ap_toggle" type="checkbox" class="plain"/></span>
-                </div>
-                <div class="row">
-                    <label>SSID</label>
-                    <span><input id="ap_ssid" type="text" placeholder="SSID"/></span>
-                </div>
-                <div class="row">
-                    <label>Password</label>
-                    <span><input id="ap_pw" type="password" placeholder="Password"/></span>
-                </div>
-                <div class="row">
-                    <span>AP IP</span>
-                    <span><span class="postfill_apip">N/A</span></span>
-                </div>
-                <div class="row">
-                    <span>AP MAC</span>
-                    <span><span class="postfill_apmac">N/A</span></span>
-                </div>
-                <div class="row">
-                    <span><input type="reset" class="button"/></span>
-                    <span><input onclick="ap_update();" type="submit" value="Save"></span>
-                </div>
-            </div>
-        </article>
-        <article class="card">
-            <header>
-                <h3>Station Mode <span class="label success">current connection</span></h3>
-            </header>
-            <div class="table">
-                <div class="row">
-                    <label>Eanable</label>
-                    <span><input id="sta_toggle" type="checkbox" class="plain"/></span>
-                </div>
-                <div class="row">
-                    <label>SSID</label>
-                    <span><input id="sta_ssid" type="text" placeholder="SSID"/></span>
-                </div>
-                <div class="row">
-                    <label>Password</label>
-                    <span><input id="sta_pw" type="password" placeholder="Password"/></span>
-                </div>
-                <div class="row">
-                    <span>Sation IP</span>
-                    <span><span class="postfill_staip">N/A</span></span>
-                </div>
-                <div class="row">
-                    <span>Station MAC</span>
-                    <span><span class="postfill_stamac">N/A</span></span>
-                </div>
-                <div class="row">
-                    <span><input type="reset" class="button"/></span>
-                    <span><input onclick="sta_update();" type="submit" value="Save"></span>
-                </div>
-            </div>
-        </article>
-    </section>
     <section id="dashboard">
         <h2>Status</h2>
         <div class="flex">
@@ -296,22 +175,11 @@
                     <header>
                         <h3>I/O</h3>
                     </header>
-                    <div class="table">
-                        <div class="row">
-                            <span>Channel 1-6</span>
-                            <span>SPI Dimmer</span>
-                        </div>
-                        <div class="row">
-                            <span>Channel 7-127</span>
-                            <span>WS2812 via I2S</span>
-                        </div>
-                    </div>
                     <footer>
                         <label>
                             <input type="checkbox" name="onoffswitch" id="led-switch" onclick="gpio()">
                             <span class="toggle button">toggle signal led</span>
                         </label>
-                        <span><input type="color" onchange="console.log(colorStringToVec(event.target.value))"/></span>
                     </footer>
                 </article>
             </div>
@@ -344,18 +212,6 @@
         return pos;
     };
 
-    DataView.prototype.setInt8Vec = function (pos, vec) {
-        for (var i = 0; i < vec.length; i++) {
-            this.setInt8(pos++, vec[i]);
-        }
-        return pos;
-    };
-
-    function colorStringToVec(hex) {
-        var result = /^#?([a-f\d]{2})([a-f\d]{2})([a-f\d]{2})$/i.exec(hex);
-        return result ? [parseInt(result[1], 16), parseInt(result[2], 16), parseInt(result[3], 16)] : null;
-    }
-
     var ws;
     var retries;
     var series = new TimeSeries();
@@ -577,48 +433,6 @@
         }
     }
 
-    var sta_toggle = document.getElementById("sta_toggle");
-    var sta_ssid = document.getElementById("sta_ssid");
-    var sta_pw = document.getElementById("sta_pw");
-
-    function sta_update() {
-        var en = sta_toggle.checked;
-
-        const ssid = sta_ssid.value;
-        const password = sta_pw.value;
-
-        const buffer = new ArrayBuffer(ssid.length + password.length + 4);
-        const view1 = new DataView(buffer);
-        var tx_len = 0;
-        view1.setChar(tx_len++, 'S');
-        view1.setChar(tx_len++, (en ? "E" : "D"));
-        tx_len = view1.setString(tx_len, ssid);
-        tx_len = view1.setString(tx_len, password);
-        wsWrite(buffer);
-    }
-
-    var ap_toggle = document.getElementById("ap_toggle");
-    var ap_ssid = document.getElementById("ap_ssid");
-    var ap_pw = document.getElementById("ap_pw");
-
-    function ap_update() {
-        var en = ap_toggle.checked;
-
-        const ssid = ap_ssid.value;
-        const password = ap_pw.value;
-
-        const buffer = new ArrayBuffer(ssid.length + password.length + 4 + 8);
-        const view1 = new DataView(buffer);
-        var tx_len = 0;
-        view1.setChar(tx_len++, 'A');
-        view1.setChar(tx_len++, (en ? "E" : "D"));
-        tx_len = view1.setString(tx_len, ssid);
-        tx_len = view1.setString(tx_len, password);
-        tx_len = view1.setInt8Vec(tx_len, [192, 168, 111, 1]);
-        tx_len = view1.setInt8Vec(tx_len, [255, 255, 255, 0]);
-        wsWrite(buffer);
-    }
-
     function update_progress(progressBar, progress) {
         var iP = Math.floor(progress);
         var dBar = document.getElementById("progress_bar_" + progressBar);

modules/rtos

@@ -1 +1 @@
-Subproject commit a8217311e0d8547127b69b7c4ead62ed3aa87b79
+Subproject commit 7faa16b07ce0d606f9525a316990da5b58e61314

pcb/.gitignore

@@ -31,6 +31,8 @@ fp-info-cache
 *.wrl
 *.step
 
-*-bak
+*-backups/
 gen/
 pcb.zip
+
+report.txt

webapp/.gitignore

@@ -0,0 +1,3 @@
+node_modules/
+src/gen/
+package-lock.json