Swap to AP mode if WiFi psk is wrong

Switch to subunit of currency if price is low
Fixed negative month cost in realtime calculation
2026-03-11 21:15:30 +00:00 · 2023-06-11 09:45:17 +02:00 · 2023-06-11 08:54:03 +02:00 · 2023-06-11 08:20:09 +02:00 · 2023-06-11 08:08:33 +02:00 · 2023-06-11 08:03:07 +02:00
19 changed files with 436 additions and 301 deletions
--- a/lib/AmsDataStorage/src/AmsDataStorage.cpp
+++ b/lib/AmsDataStorage/src/AmsDataStorage.cpp
@@ -577,6 +577,11 @@ bool AmsDataStorage::isHappy() {
 }

 bool AmsDataStorage::isDayHappy() {
+    if(tz == NULL) {
+        if(debugger->isActive(RemoteDebug::VERBOSE)) debugger->printf_P(PSTR("(AmsDataStorage) Timezone is missing\n"));
+        return false;
+    }
+
    time_t now = time(nullptr);
    if(now < FirmwareVersion::BuildEpoch) return false;

--- a/lib/EnergyAccounting/include/EnergyAccounting.h
+++ b/lib/EnergyAccounting/include/EnergyAccounting.h
@@ -14,12 +14,12 @@ struct EnergyAccountingPeak {
 struct EnergyAccountingData {
    uint8_t version;
    uint8_t month;
-    uint32_t costYesterday;
-    uint32_t costThisMonth;
-    uint32_t costLastMonth;
-    uint32_t incomeYesterday;
-    uint32_t incomeThisMonth;
-    uint32_t incomeLastMonth;
+    int32_t costYesterday;
+    int32_t costThisMonth;
+    int32_t costLastMonth;
+    int32_t incomeYesterday;
+    int32_t incomeThisMonth;
+    int32_t incomeLastMonth;
    uint32_t lastMonthImport;
    uint32_t lastMonthExport;
    uint8_t lastMonthAccuracy;
--- a/lib/EnergyAccounting/src/EnergyAccounting.cpp
+++ b/lib/EnergyAccounting/src/EnergyAccounting.cpp
@@ -179,6 +179,7 @@ bool EnergyAccounting::update(AmsData* amsData) {
 void EnergyAccounting::calcDayCost() {
    time_t now = time(nullptr);
    tmElements_t local, utc;
+    if(tz == NULL) return;
    breakTime(tz->toLocal(now), local);

    if(getPriceForHour(0) != ENTSOE_NO_VALUE) {
@@ -205,10 +206,10 @@ float EnergyAccounting::getUseThisHour() {
 }

 float EnergyAccounting::getUseToday() {
+    if(tz == NULL) return 0.0;
    float ret = 0.0;
    time_t now = time(nullptr);
    if(now < FirmwareVersion::BuildEpoch) return 0.0;
-    if(tz == NULL) return 0.0;
    tmElements_t utc, local;
    breakTime(tz->toLocal(now), local);
    for(uint8_t i = 0; i < currentHour; i++) {
@@ -237,6 +238,7 @@ float EnergyAccounting::getProducedThisHour() {
 }

 float EnergyAccounting::getProducedToday() {
+    if(tz == NULL) return 0.0;
    float ret = 0.0;
    time_t now = time(nullptr);
    if(now < FirmwareVersion::BuildEpoch) return 0.0;
--- a/lib/EntsoePriceApi/src/EntsoeApi.cpp
+++ b/lib/EntsoePriceApi/src/EntsoeApi.cpp
@@ -236,9 +236,9 @@ bool EntsoeApi::retrieve(const char* url, Stream* doc) {
            } else {
                lastError = status;
                if(status == 429) {
-                    nextFetchDelayMinutes = 60;
+                    nextFetchDelayMinutes = 15;
                } else if(status == 404) {
-                    nextFetchDelayMinutes = 180;
+                    nextFetchDelayMinutes = 60;
                } else {
                    nextFetchDelayMinutes = 30;
                }
@@ -272,14 +272,14 @@ float EntsoeApi::getCurrencyMultiplier(const char* from, const char* to, time_t
            ESP.wdtFeed();
        #endif

-        snprintf_P(buf, BufferSize, PSTR("https://data.norges-bank.no/api/data/EXR/M.%s.NOK.SP?lastNObservations=1"), from);
+        snprintf_P(buf, BufferSize, PSTR("https://data.norges-bank.no/api/data/EXR/B.%s.NOK.SP?lastNObservations=1"), from);
        if(debugger->isActive(RemoteDebug::INFO)) debugger->printf_P(PSTR("(EntsoeApi) Retrieving %s to NOK conversion\n"), from);
        if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf_P(PSTR("(EntsoeApi)  url: %s\n"), buf);
        if(retrieve(buf, &p)) {
            if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf_P(PSTR("(EntsoeApi)  got exchange rate %.4f\n"), p.getValue());
            currencyMultiplier = p.getValue();
            if(strncmp(to, "NOK", 3) != 0) {
-                snprintf_P(buf, BufferSize, PSTR("https://data.norges-bank.no/api/data/EXR/M.%s.NOK.SP?lastNObservations=1"), to);
+                snprintf_P(buf, BufferSize, PSTR("https://data.norges-bank.no/api/data/EXR/B.%s.NOK.SP?lastNObservations=1"), to);
                if(debugger->isActive(RemoteDebug::INFO)) debugger->printf_P(PSTR("(EntsoeApi) Retrieving %s to NOK conversion\n"), to);
                if(debugger->isActive(RemoteDebug::DEBUG)) debugger->printf_P(PSTR("(EntsoeApi)  url: %s\n"), buf);
                if(retrieve(buf, &p)) {
--- a/lib/SvelteUi/app/dist/index.js
+++ b/lib/SvelteUi/app/dist/index.js
--- a/lib/SvelteUi/app/package-lock.json
+++ b/lib/SvelteUi/app/package-lock.json
@@ -21,13 +21,29 @@
        "svelte-navigator": "^3.2.2",
        "svelte-preprocess": "^4.10.7",
        "tailwindcss": "^3.1.5",
-        "vite": "^3.0.7"
+        "vite": "^3.2.7"
+      }
+    },
+    "node_modules/@esbuild/android-arm": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.15.18.tgz",
+      "integrity": "sha512-5GT+kcs2WVGjVs7+boataCkO5Fg0y4kCjzkB5bAip7H4jfnOS3dA6KPiww9W1OEKTKeAcUVhdZGvgI65OXmUnw==",
+      "cpu": [
+        "arm"
+      ],
+      "dev": true,
+      "optional": true,
+      "os": [
+        "android"
+      ],
+      "engines": {
+        "node": ">=12"
      }
    },
    "node_modules/@esbuild/linux-loong64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.14.54.tgz",
-      "integrity": "sha512-bZBrLAIX1kpWelV0XemxBZllyRmM6vgFQQG2GdNb+r3Fkp0FOh1NJSvekXDs7jq70k4euu1cryLMfU+mTXlEpw==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.15.18.tgz",
+      "integrity": "sha512-L4jVKS82XVhw2nvzLg/19ClLWg0y27ulRwuP7lcyL6AbUWB5aPglXY3M21mauDQMDfRLs8cQmeT03r/+X3cZYQ==",
      "cpu": [
        "loong64"
      ],
@@ -725,9 +741,9 @@
      "dev": true
    },
    "node_modules/esbuild": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.14.54.tgz",
-      "integrity": "sha512-Cy9llcy8DvET5uznocPyqL3BFRrFXSVqbgpMJ9Wz8oVjZlh/zUSNbPRbov0VX7VxN2JH1Oa0uNxZ7eLRb62pJA==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.15.18.tgz",
+      "integrity": "sha512-x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q==",
      "dev": true,
      "hasInstallScript": true,
      "bin": {
@@ -737,33 +753,34 @@
        "node": ">=12"
      },
      "optionalDependencies": {
-        "@esbuild/linux-loong64": "0.14.54",
-        "esbuild-android-64": "0.14.54",
-        "esbuild-android-arm64": "0.14.54",
-        "esbuild-darwin-64": "0.14.54",
-        "esbuild-darwin-arm64": "0.14.54",
-        "esbuild-freebsd-64": "0.14.54",
-        "esbuild-freebsd-arm64": "0.14.54",
-        "esbuild-linux-32": "0.14.54",
-        "esbuild-linux-64": "0.14.54",
-        "esbuild-linux-arm": "0.14.54",
-        "esbuild-linux-arm64": "0.14.54",
-        "esbuild-linux-mips64le": "0.14.54",
-        "esbuild-linux-ppc64le": "0.14.54",
-        "esbuild-linux-riscv64": "0.14.54",
-        "esbuild-linux-s390x": "0.14.54",
-        "esbuild-netbsd-64": "0.14.54",
-        "esbuild-openbsd-64": "0.14.54",
-        "esbuild-sunos-64": "0.14.54",
-        "esbuild-windows-32": "0.14.54",
-        "esbuild-windows-64": "0.14.54",
-        "esbuild-windows-arm64": "0.14.54"
+        "@esbuild/android-arm": "0.15.18",
+        "@esbuild/linux-loong64": "0.15.18",
+        "esbuild-android-64": "0.15.18",
+        "esbuild-android-arm64": "0.15.18",
+        "esbuild-darwin-64": "0.15.18",
+        "esbuild-darwin-arm64": "0.15.18",
+        "esbuild-freebsd-64": "0.15.18",
+        "esbuild-freebsd-arm64": "0.15.18",
+        "esbuild-linux-32": "0.15.18",
+        "esbuild-linux-64": "0.15.18",
+        "esbuild-linux-arm": "0.15.18",
+        "esbuild-linux-arm64": "0.15.18",
+        "esbuild-linux-mips64le": "0.15.18",
+        "esbuild-linux-ppc64le": "0.15.18",
+        "esbuild-linux-riscv64": "0.15.18",
+        "esbuild-linux-s390x": "0.15.18",
+        "esbuild-netbsd-64": "0.15.18",
+        "esbuild-openbsd-64": "0.15.18",
+        "esbuild-sunos-64": "0.15.18",
+        "esbuild-windows-32": "0.15.18",
+        "esbuild-windows-64": "0.15.18",
+        "esbuild-windows-arm64": "0.15.18"
      }
    },
    "node_modules/esbuild-android-64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.14.54.tgz",
-      "integrity": "sha512-Tz2++Aqqz0rJ7kYBfz+iqyE3QMycD4vk7LBRyWaAVFgFtQ/O8EJOnVmTOiDWYZ/uYzB4kvP+bqejYdVKzE5lAQ==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.15.18.tgz",
+      "integrity": "sha512-wnpt3OXRhcjfIDSZu9bnzT4/TNTDsOUvip0foZOUBG7QbSt//w3QV4FInVJxNhKc/ErhUxc5z4QjHtMi7/TbgA==",
      "cpu": [
        "x64"
      ],
@@ -777,9 +794,9 @@
      }
    },
    "node_modules/esbuild-android-arm64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.54.tgz",
-      "integrity": "sha512-F9E+/QDi9sSkLaClO8SOV6etqPd+5DgJje1F9lOWoNncDdOBL2YF59IhsWATSt0TLZbYCf3pNlTHvVV5VfHdvg==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.15.18.tgz",
+      "integrity": "sha512-G4xu89B8FCzav9XU8EjsXacCKSG2FT7wW9J6hOc18soEHJdtWu03L3TQDGf0geNxfLTtxENKBzMSq9LlbjS8OQ==",
      "cpu": [
        "arm64"
      ],
@@ -793,9 +810,9 @@
      }
    },
    "node_modules/esbuild-darwin-64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.54.tgz",
-      "integrity": "sha512-jtdKWV3nBviOd5v4hOpkVmpxsBy90CGzebpbO9beiqUYVMBtSc0AL9zGftFuBon7PNDcdvNCEuQqw2x0wP9yug==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.15.18.tgz",
+      "integrity": "sha512-2WAvs95uPnVJPuYKP0Eqx+Dl/jaYseZEUUT1sjg97TJa4oBtbAKnPnl3b5M9l51/nbx7+QAEtuummJZW0sBEmg==",
      "cpu": [
        "x64"
      ],
@@ -809,9 +826,9 @@
      }
    },
    "node_modules/esbuild-darwin-arm64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.54.tgz",
-      "integrity": "sha512-OPafJHD2oUPyvJMrsCvDGkRrVCar5aVyHfWGQzY1dWnzErjrDuSETxwA2HSsyg2jORLY8yBfzc1MIpUkXlctmw==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.18.tgz",
+      "integrity": "sha512-tKPSxcTJ5OmNb1btVikATJ8NftlyNlc8BVNtyT/UAr62JFOhwHlnoPrhYWz09akBLHI9nElFVfWSTSRsrZiDUA==",
      "cpu": [
        "arm64"
      ],
@@ -825,9 +842,9 @@
      }
    },
    "node_modules/esbuild-freebsd-64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.54.tgz",
-      "integrity": "sha512-OKwd4gmwHqOTp4mOGZKe/XUlbDJ4Q9TjX0hMPIDBUWWu/kwhBAudJdBoxnjNf9ocIB6GN6CPowYpR/hRCbSYAg==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.18.tgz",
+      "integrity": "sha512-TT3uBUxkteAjR1QbsmvSsjpKjOX6UkCstr8nMr+q7zi3NuZ1oIpa8U41Y8I8dJH2fJgdC3Dj3CXO5biLQpfdZA==",
      "cpu": [
        "x64"
      ],
@@ -841,9 +858,9 @@
      }
    },
    "node_modules/esbuild-freebsd-arm64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.54.tgz",
-      "integrity": "sha512-sFwueGr7OvIFiQT6WeG0jRLjkjdqWWSrfbVwZp8iMP+8UHEHRBvlaxL6IuKNDwAozNUmbb8nIMXa7oAOARGs1Q==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.18.tgz",
+      "integrity": "sha512-R/oVr+X3Tkh+S0+tL41wRMbdWtpWB8hEAMsOXDumSSa6qJR89U0S/PpLXrGF7Wk/JykfpWNokERUpCeHDl47wA==",
      "cpu": [
        "arm64"
      ],
@@ -857,9 +874,9 @@
      }
    },
    "node_modules/esbuild-linux-32": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.54.tgz",
-      "integrity": "sha512-1ZuY+JDI//WmklKlBgJnglpUL1owm2OX+8E1syCD6UAxcMM/XoWd76OHSjl/0MR0LisSAXDqgjT3uJqT67O3qw==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.15.18.tgz",
+      "integrity": "sha512-lphF3HiCSYtaa9p1DtXndiQEeQDKPl9eN/XNoBf2amEghugNuqXNZA/ZovthNE2aa4EN43WroO0B85xVSjYkbg==",
      "cpu": [
        "ia32"
      ],
@@ -873,9 +890,9 @@
      }
    },
    "node_modules/esbuild-linux-64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.54.tgz",
-      "integrity": "sha512-EgjAgH5HwTbtNsTqQOXWApBaPVdDn7XcK+/PtJwZLT1UmpLoznPd8c5CxqsH2dQK3j05YsB3L17T8vE7cp4cCg==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.15.18.tgz",
+      "integrity": "sha512-hNSeP97IviD7oxLKFuii5sDPJ+QHeiFTFLoLm7NZQligur8poNOWGIgpQ7Qf8Balb69hptMZzyOBIPtY09GZYw==",
      "cpu": [
        "x64"
      ],
@@ -889,9 +906,9 @@
      }
    },
    "node_modules/esbuild-linux-arm": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.54.tgz",
-      "integrity": "sha512-qqz/SjemQhVMTnvcLGoLOdFpCYbz4v4fUo+TfsWG+1aOu70/80RV6bgNpR2JCrppV2moUQkww+6bWxXRL9YMGw==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.15.18.tgz",
+      "integrity": "sha512-UH779gstRblS4aoS2qpMl3wjg7U0j+ygu3GjIeTonCcN79ZvpPee12Qun3vcdxX+37O5LFxz39XeW2I9bybMVA==",
      "cpu": [
        "arm"
      ],
@@ -905,9 +922,9 @@
      }
    },
    "node_modules/esbuild-linux-arm64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.54.tgz",
-      "integrity": "sha512-WL71L+0Rwv+Gv/HTmxTEmpv0UgmxYa5ftZILVi2QmZBgX3q7+tDeOQNqGtdXSdsL8TQi1vIaVFHUPDe0O0kdig==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.18.tgz",
+      "integrity": "sha512-54qr8kg/6ilcxd+0V3h9rjT4qmjc0CccMVWrjOEM/pEcUzt8X62HfBSeZfT2ECpM7104mk4yfQXkosY8Quptug==",
      "cpu": [
        "arm64"
      ],
@@ -921,9 +938,9 @@
      }
    },
    "node_modules/esbuild-linux-mips64le": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.54.tgz",
-      "integrity": "sha512-qTHGQB8D1etd0u1+sB6p0ikLKRVuCWhYQhAHRPkO+OF3I/iSlTKNNS0Lh2Oc0g0UFGguaFZZiPJdJey3AGpAlw==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.18.tgz",
+      "integrity": "sha512-Mk6Ppwzzz3YbMl/ZZL2P0q1tnYqh/trYZ1VfNP47C31yT0K8t9s7Z077QrDA/guU60tGNp2GOwCQnp+DYv7bxQ==",
      "cpu": [
        "mips64el"
      ],
@@ -937,9 +954,9 @@
      }
    },
    "node_modules/esbuild-linux-ppc64le": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.54.tgz",
-      "integrity": "sha512-j3OMlzHiqwZBDPRCDFKcx595XVfOfOnv68Ax3U4UKZ3MTYQB5Yz3X1mn5GnodEVYzhtZgxEBidLWeIs8FDSfrQ==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.18.tgz",
+      "integrity": "sha512-b0XkN4pL9WUulPTa/VKHx2wLCgvIAbgwABGnKMY19WhKZPT+8BxhZdqz6EgkqCLld7X5qiCY2F/bfpUUlnFZ9w==",
      "cpu": [
        "ppc64"
      ],
@@ -953,9 +970,9 @@
      }
    },
    "node_modules/esbuild-linux-riscv64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.54.tgz",
-      "integrity": "sha512-y7Vt7Wl9dkOGZjxQZnDAqqn+XOqFD7IMWiewY5SPlNlzMX39ocPQlOaoxvT4FllA5viyV26/QzHtvTjVNOxHZg==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.18.tgz",
+      "integrity": "sha512-ba2COaoF5wL6VLZWn04k+ACZjZ6NYniMSQStodFKH/Pu6RxzQqzsmjR1t9QC89VYJxBeyVPTaHuBMCejl3O/xg==",
      "cpu": [
        "riscv64"
      ],
@@ -969,9 +986,9 @@
      }
    },
    "node_modules/esbuild-linux-s390x": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.54.tgz",
-      "integrity": "sha512-zaHpW9dziAsi7lRcyV4r8dhfG1qBidQWUXweUjnw+lliChJqQr+6XD71K41oEIC3Mx1KStovEmlzm+MkGZHnHA==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.18.tgz",
+      "integrity": "sha512-VbpGuXEl5FCs1wDVp93O8UIzl3ZrglgnSQ+Hu79g7hZu6te6/YHgVJxCM2SqfIila0J3k0csfnf8VD2W7u2kzQ==",
      "cpu": [
        "s390x"
      ],
@@ -985,9 +1002,9 @@
      }
    },
    "node_modules/esbuild-netbsd-64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.54.tgz",
-      "integrity": "sha512-PR01lmIMnfJTgeU9VJTDY9ZerDWVFIUzAtJuDHwwceppW7cQWjBBqP48NdeRtoP04/AtO9a7w3viI+PIDr6d+w==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.18.tgz",
+      "integrity": "sha512-98ukeCdvdX7wr1vUYQzKo4kQ0N2p27H7I11maINv73fVEXt2kyh4K4m9f35U1K43Xc2QGXlzAw0K9yoU7JUjOg==",
      "cpu": [
        "x64"
      ],
@@ -1001,9 +1018,9 @@
      }
    },
    "node_modules/esbuild-openbsd-64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.54.tgz",
-      "integrity": "sha512-Qyk7ikT2o7Wu76UsvvDS5q0amJvmRzDyVlL0qf5VLsLchjCa1+IAvd8kTBgUxD7VBUUVgItLkk609ZHUc1oCaw==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.18.tgz",
+      "integrity": "sha512-yK5NCcH31Uae076AyQAXeJzt/vxIo9+omZRKj1pauhk3ITuADzuOx5N2fdHrAKPxN+zH3w96uFKlY7yIn490xQ==",
      "cpu": [
        "x64"
      ],
@@ -1017,9 +1034,9 @@
      }
    },
    "node_modules/esbuild-sunos-64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.54.tgz",
-      "integrity": "sha512-28GZ24KmMSeKi5ueWzMcco6EBHStL3B6ubM7M51RmPwXQGLe0teBGJocmWhgwccA1GeFXqxzILIxXpHbl9Q/Kw==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.15.18.tgz",
+      "integrity": "sha512-On22LLFlBeLNj/YF3FT+cXcyKPEI263nflYlAhz5crxtp3yRG1Ugfr7ITyxmCmjm4vbN/dGrb/B7w7U8yJR9yw==",
      "cpu": [
        "x64"
      ],
@@ -1033,9 +1050,9 @@
      }
    },
    "node_modules/esbuild-windows-32": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.54.tgz",
-      "integrity": "sha512-T+rdZW19ql9MjS7pixmZYVObd9G7kcaZo+sETqNH4RCkuuYSuv9AGHUVnPoP9hhuE1WM1ZimHz1CIBHBboLU7w==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.15.18.tgz",
+      "integrity": "sha512-o+eyLu2MjVny/nt+E0uPnBxYuJHBvho8vWsC2lV61A7wwTWC3jkN2w36jtA+yv1UgYkHRihPuQsL23hsCYGcOQ==",
      "cpu": [
        "ia32"
      ],
@@ -1049,9 +1066,9 @@
      }
    },
    "node_modules/esbuild-windows-64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.54.tgz",
-      "integrity": "sha512-AoHTRBUuYwXtZhjXZbA1pGfTo8cJo3vZIcWGLiUcTNgHpJJMC1rVA44ZereBHMJtotyN71S8Qw0npiCIkW96cQ==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.15.18.tgz",
+      "integrity": "sha512-qinug1iTTaIIrCorAUjR0fcBk24fjzEedFYhhispP8Oc7SFvs+XeW3YpAKiKp8dRpizl4YYAhxMjlftAMJiaUw==",
      "cpu": [
        "x64"
      ],
@@ -1065,9 +1082,9 @@
      }
    },
    "node_modules/esbuild-windows-arm64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.54.tgz",
-      "integrity": "sha512-M0kuUvXhot1zOISQGXwWn6YtS+Y/1RT9WrVIOywZnJHo3jCDyewAc79aKNQWFCQm+xNHVTq9h8dZKvygoXQQRg==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.18.tgz",
+      "integrity": "sha512-q9bsYzegpZcLziq0zgUi5KqGVtfhjxGbnksaBFYmWLxeV/S1fK4OLdq2DFYnXcLMjlZw2L0jLsk1eGoB522WXQ==",
      "cpu": [
        "arm64"
      ],
@@ -1508,9 +1525,15 @@
      "dev": true
    },
    "node_modules/nanoid": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
-      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw==",
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
+      "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA==",
+      "funding": [
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
+        }
+      ],
      "bin": {
        "nanoid": "bin/nanoid.cjs"
      },
@@ -1643,9 +1666,9 @@
      }
    },
    "node_modules/postcss": {
-      "version": "8.4.16",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.16.tgz",
-      "integrity": "sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ==",
+      "version": "8.4.24",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.24.tgz",
+      "integrity": "sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg==",
      "funding": [
        {
          "type": "opencollective",
@@ -1654,10 +1677,14 @@
        {
          "type": "tidelift",
          "url": "https://tidelift.com/funding/github/npm/postcss"
+        },
+        {
+          "type": "github",
+          "url": "https://github.com/sponsors/ai"
        }
      ],
      "dependencies": {
-        "nanoid": "^3.3.4",
+        "nanoid": "^3.3.6",
        "picocolors": "^1.0.0",
        "source-map-js": "^1.0.2"
      },
@@ -2243,9 +2270,9 @@
      }
    },
    "node_modules/rollup": {
-      "version": "2.77.3",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.77.3.tgz",
-      "integrity": "sha512-/qxNTG7FbmefJWoeeYJFbHehJ2HNWnjkAFRKzWN/45eNBBF/r8lo992CwcJXEzyVxs5FmfId+vTSTQDb+bxA+g==",
+      "version": "2.79.1",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz",
+      "integrity": "sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==",
      "dev": true,
      "bin": {
        "rollup": "dist/bin/rollup"
@@ -2658,15 +2685,15 @@
      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
    },
    "node_modules/vite": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-3.0.9.tgz",
-      "integrity": "sha512-waYABTM+G6DBTCpYAxvevpG50UOlZuynR0ckTK5PawNVt7ebX6X7wNXHaGIO6wYYFXSM7/WcuFuO2QzhBB6aMw==",
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-3.2.7.tgz",
+      "integrity": "sha512-29pdXjk49xAP0QBr0xXqu2s5jiQIXNvE/xwd0vUizYT2Hzqe4BksNNoWllFVXJf4eLZ+UlVQmXfB4lWrc+t18g==",
      "dev": true,
      "dependencies": {
-        "esbuild": "^0.14.47",
-        "postcss": "^8.4.16",
+        "esbuild": "^0.15.9",
+        "postcss": "^8.4.18",
        "resolve": "^1.22.1",
-        "rollup": ">=2.75.6 <2.77.0 || ~2.77.0"
+        "rollup": "^2.79.1"
      },
      "bin": {
        "vite": "bin/vite.js"
@@ -2678,12 +2705,17 @@
        "fsevents": "~2.3.2"
      },
      "peerDependencies": {
+        "@types/node": ">= 14",
        "less": "*",
        "sass": "*",
        "stylus": "*",
+        "sugarss": "*",
        "terser": "^5.4.0"
      },
      "peerDependenciesMeta": {
+        "@types/node": {
+          "optional": true
+        },
        "less": {
          "optional": true
        },
@@ -2693,6 +2725,9 @@
        "stylus": {
          "optional": true
        },
+        "sugarss": {
+          "optional": true
+        },
        "terser": {
          "optional": true
        }
@@ -2724,10 +2759,17 @@
    }
  },
  "dependencies": {
+    "@esbuild/android-arm": {
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/@esbuild/android-arm/-/android-arm-0.15.18.tgz",
+      "integrity": "sha512-5GT+kcs2WVGjVs7+boataCkO5Fg0y4kCjzkB5bAip7H4jfnOS3dA6KPiww9W1OEKTKeAcUVhdZGvgI65OXmUnw==",
+      "dev": true,
+      "optional": true
+    },
    "@esbuild/linux-loong64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.14.54.tgz",
-      "integrity": "sha512-bZBrLAIX1kpWelV0XemxBZllyRmM6vgFQQG2GdNb+r3Fkp0FOh1NJSvekXDs7jq70k4euu1cryLMfU+mTXlEpw==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/@esbuild/linux-loong64/-/linux-loong64-0.15.18.tgz",
+      "integrity": "sha512-L4jVKS82XVhw2nvzLg/19ClLWg0y27ulRwuP7lcyL6AbUWB5aPglXY3M21mauDQMDfRLs8cQmeT03r/+X3cZYQ==",
      "dev": true,
      "optional": true
    },
@@ -3212,171 +3254,172 @@
      "dev": true
    },
    "esbuild": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.14.54.tgz",
-      "integrity": "sha512-Cy9llcy8DvET5uznocPyqL3BFRrFXSVqbgpMJ9Wz8oVjZlh/zUSNbPRbov0VX7VxN2JH1Oa0uNxZ7eLRb62pJA==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild/-/esbuild-0.15.18.tgz",
+      "integrity": "sha512-x/R72SmW3sSFRm5zrrIjAhCeQSAWoni3CmHEqfQrZIQTM3lVCdehdwuIqaOtfC2slvpdlLa62GYoN8SxT23m6Q==",
      "dev": true,
      "requires": {
-        "@esbuild/linux-loong64": "0.14.54",
-        "esbuild-android-64": "0.14.54",
-        "esbuild-android-arm64": "0.14.54",
-        "esbuild-darwin-64": "0.14.54",
-        "esbuild-darwin-arm64": "0.14.54",
-        "esbuild-freebsd-64": "0.14.54",
-        "esbuild-freebsd-arm64": "0.14.54",
-        "esbuild-linux-32": "0.14.54",
-        "esbuild-linux-64": "0.14.54",
-        "esbuild-linux-arm": "0.14.54",
-        "esbuild-linux-arm64": "0.14.54",
-        "esbuild-linux-mips64le": "0.14.54",
-        "esbuild-linux-ppc64le": "0.14.54",
-        "esbuild-linux-riscv64": "0.14.54",
-        "esbuild-linux-s390x": "0.14.54",
-        "esbuild-netbsd-64": "0.14.54",
-        "esbuild-openbsd-64": "0.14.54",
-        "esbuild-sunos-64": "0.14.54",
-        "esbuild-windows-32": "0.14.54",
-        "esbuild-windows-64": "0.14.54",
-        "esbuild-windows-arm64": "0.14.54"
+        "@esbuild/android-arm": "0.15.18",
+        "@esbuild/linux-loong64": "0.15.18",
+        "esbuild-android-64": "0.15.18",
+        "esbuild-android-arm64": "0.15.18",
+        "esbuild-darwin-64": "0.15.18",
+        "esbuild-darwin-arm64": "0.15.18",
+        "esbuild-freebsd-64": "0.15.18",
+        "esbuild-freebsd-arm64": "0.15.18",
+        "esbuild-linux-32": "0.15.18",
+        "esbuild-linux-64": "0.15.18",
+        "esbuild-linux-arm": "0.15.18",
+        "esbuild-linux-arm64": "0.15.18",
+        "esbuild-linux-mips64le": "0.15.18",
+        "esbuild-linux-ppc64le": "0.15.18",
+        "esbuild-linux-riscv64": "0.15.18",
+        "esbuild-linux-s390x": "0.15.18",
+        "esbuild-netbsd-64": "0.15.18",
+        "esbuild-openbsd-64": "0.15.18",
+        "esbuild-sunos-64": "0.15.18",
+        "esbuild-windows-32": "0.15.18",
+        "esbuild-windows-64": "0.15.18",
+        "esbuild-windows-arm64": "0.15.18"
      }
    },
    "esbuild-android-64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.14.54.tgz",
-      "integrity": "sha512-Tz2++Aqqz0rJ7kYBfz+iqyE3QMycD4vk7LBRyWaAVFgFtQ/O8EJOnVmTOiDWYZ/uYzB4kvP+bqejYdVKzE5lAQ==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-android-64/-/esbuild-android-64-0.15.18.tgz",
+      "integrity": "sha512-wnpt3OXRhcjfIDSZu9bnzT4/TNTDsOUvip0foZOUBG7QbSt//w3QV4FInVJxNhKc/ErhUxc5z4QjHtMi7/TbgA==",
      "dev": true,
      "optional": true
    },
    "esbuild-android-arm64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.14.54.tgz",
-      "integrity": "sha512-F9E+/QDi9sSkLaClO8SOV6etqPd+5DgJje1F9lOWoNncDdOBL2YF59IhsWATSt0TLZbYCf3pNlTHvVV5VfHdvg==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-android-arm64/-/esbuild-android-arm64-0.15.18.tgz",
+      "integrity": "sha512-G4xu89B8FCzav9XU8EjsXacCKSG2FT7wW9J6hOc18soEHJdtWu03L3TQDGf0geNxfLTtxENKBzMSq9LlbjS8OQ==",
      "dev": true,
      "optional": true
    },
    "esbuild-darwin-64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.14.54.tgz",
-      "integrity": "sha512-jtdKWV3nBviOd5v4hOpkVmpxsBy90CGzebpbO9beiqUYVMBtSc0AL9zGftFuBon7PNDcdvNCEuQqw2x0wP9yug==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-64/-/esbuild-darwin-64-0.15.18.tgz",
+      "integrity": "sha512-2WAvs95uPnVJPuYKP0Eqx+Dl/jaYseZEUUT1sjg97TJa4oBtbAKnPnl3b5M9l51/nbx7+QAEtuummJZW0sBEmg==",
      "dev": true,
      "optional": true
    },
    "esbuild-darwin-arm64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.14.54.tgz",
-      "integrity": "sha512-OPafJHD2oUPyvJMrsCvDGkRrVCar5aVyHfWGQzY1dWnzErjrDuSETxwA2HSsyg2jORLY8yBfzc1MIpUkXlctmw==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-darwin-arm64/-/esbuild-darwin-arm64-0.15.18.tgz",
+      "integrity": "sha512-tKPSxcTJ5OmNb1btVikATJ8NftlyNlc8BVNtyT/UAr62JFOhwHlnoPrhYWz09akBLHI9nElFVfWSTSRsrZiDUA==",
      "dev": true,
      "optional": true
    },
    "esbuild-freebsd-64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.14.54.tgz",
-      "integrity": "sha512-OKwd4gmwHqOTp4mOGZKe/XUlbDJ4Q9TjX0hMPIDBUWWu/kwhBAudJdBoxnjNf9ocIB6GN6CPowYpR/hRCbSYAg==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-64/-/esbuild-freebsd-64-0.15.18.tgz",
+      "integrity": "sha512-TT3uBUxkteAjR1QbsmvSsjpKjOX6UkCstr8nMr+q7zi3NuZ1oIpa8U41Y8I8dJH2fJgdC3Dj3CXO5biLQpfdZA==",
      "dev": true,
      "optional": true
    },
    "esbuild-freebsd-arm64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.14.54.tgz",
-      "integrity": "sha512-sFwueGr7OvIFiQT6WeG0jRLjkjdqWWSrfbVwZp8iMP+8UHEHRBvlaxL6IuKNDwAozNUmbb8nIMXa7oAOARGs1Q==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-freebsd-arm64/-/esbuild-freebsd-arm64-0.15.18.tgz",
+      "integrity": "sha512-R/oVr+X3Tkh+S0+tL41wRMbdWtpWB8hEAMsOXDumSSa6qJR89U0S/PpLXrGF7Wk/JykfpWNokERUpCeHDl47wA==",
      "dev": true,
      "optional": true
    },
    "esbuild-linux-32": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.14.54.tgz",
-      "integrity": "sha512-1ZuY+JDI//WmklKlBgJnglpUL1owm2OX+8E1syCD6UAxcMM/XoWd76OHSjl/0MR0LisSAXDqgjT3uJqT67O3qw==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-32/-/esbuild-linux-32-0.15.18.tgz",
+      "integrity": "sha512-lphF3HiCSYtaa9p1DtXndiQEeQDKPl9eN/XNoBf2amEghugNuqXNZA/ZovthNE2aa4EN43WroO0B85xVSjYkbg==",
      "dev": true,
      "optional": true
    },
    "esbuild-linux-64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.14.54.tgz",
-      "integrity": "sha512-EgjAgH5HwTbtNsTqQOXWApBaPVdDn7XcK+/PtJwZLT1UmpLoznPd8c5CxqsH2dQK3j05YsB3L17T8vE7cp4cCg==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-64/-/esbuild-linux-64-0.15.18.tgz",
+      "integrity": "sha512-hNSeP97IviD7oxLKFuii5sDPJ+QHeiFTFLoLm7NZQligur8poNOWGIgpQ7Qf8Balb69hptMZzyOBIPtY09GZYw==",
      "dev": true,
      "optional": true
    },
    "esbuild-linux-arm": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.14.54.tgz",
-      "integrity": "sha512-qqz/SjemQhVMTnvcLGoLOdFpCYbz4v4fUo+TfsWG+1aOu70/80RV6bgNpR2JCrppV2moUQkww+6bWxXRL9YMGw==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm/-/esbuild-linux-arm-0.15.18.tgz",
+      "integrity": "sha512-UH779gstRblS4aoS2qpMl3wjg7U0j+ygu3GjIeTonCcN79ZvpPee12Qun3vcdxX+37O5LFxz39XeW2I9bybMVA==",
      "dev": true,
      "optional": true
    },
    "esbuild-linux-arm64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.14.54.tgz",
-      "integrity": "sha512-WL71L+0Rwv+Gv/HTmxTEmpv0UgmxYa5ftZILVi2QmZBgX3q7+tDeOQNqGtdXSdsL8TQi1vIaVFHUPDe0O0kdig==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-arm64/-/esbuild-linux-arm64-0.15.18.tgz",
+      "integrity": "sha512-54qr8kg/6ilcxd+0V3h9rjT4qmjc0CccMVWrjOEM/pEcUzt8X62HfBSeZfT2ECpM7104mk4yfQXkosY8Quptug==",
      "dev": true,
      "optional": true
    },
    "esbuild-linux-mips64le": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.14.54.tgz",
-      "integrity": "sha512-qTHGQB8D1etd0u1+sB6p0ikLKRVuCWhYQhAHRPkO+OF3I/iSlTKNNS0Lh2Oc0g0UFGguaFZZiPJdJey3AGpAlw==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-mips64le/-/esbuild-linux-mips64le-0.15.18.tgz",
+      "integrity": "sha512-Mk6Ppwzzz3YbMl/ZZL2P0q1tnYqh/trYZ1VfNP47C31yT0K8t9s7Z077QrDA/guU60tGNp2GOwCQnp+DYv7bxQ==",
      "dev": true,
      "optional": true
    },
    "esbuild-linux-ppc64le": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.14.54.tgz",
-      "integrity": "sha512-j3OMlzHiqwZBDPRCDFKcx595XVfOfOnv68Ax3U4UKZ3MTYQB5Yz3X1mn5GnodEVYzhtZgxEBidLWeIs8FDSfrQ==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-ppc64le/-/esbuild-linux-ppc64le-0.15.18.tgz",
+      "integrity": "sha512-b0XkN4pL9WUulPTa/VKHx2wLCgvIAbgwABGnKMY19WhKZPT+8BxhZdqz6EgkqCLld7X5qiCY2F/bfpUUlnFZ9w==",
      "dev": true,
      "optional": true
    },
    "esbuild-linux-riscv64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.14.54.tgz",
-      "integrity": "sha512-y7Vt7Wl9dkOGZjxQZnDAqqn+XOqFD7IMWiewY5SPlNlzMX39ocPQlOaoxvT4FllA5viyV26/QzHtvTjVNOxHZg==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-riscv64/-/esbuild-linux-riscv64-0.15.18.tgz",
+      "integrity": "sha512-ba2COaoF5wL6VLZWn04k+ACZjZ6NYniMSQStodFKH/Pu6RxzQqzsmjR1t9QC89VYJxBeyVPTaHuBMCejl3O/xg==",
      "dev": true,
      "optional": true
    },
    "esbuild-linux-s390x": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.14.54.tgz",
-      "integrity": "sha512-zaHpW9dziAsi7lRcyV4r8dhfG1qBidQWUXweUjnw+lliChJqQr+6XD71K41oEIC3Mx1KStovEmlzm+MkGZHnHA==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-linux-s390x/-/esbuild-linux-s390x-0.15.18.tgz",
+      "integrity": "sha512-VbpGuXEl5FCs1wDVp93O8UIzl3ZrglgnSQ+Hu79g7hZu6te6/YHgVJxCM2SqfIila0J3k0csfnf8VD2W7u2kzQ==",
      "dev": true,
      "optional": true
    },
    "esbuild-netbsd-64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.14.54.tgz",
-      "integrity": "sha512-PR01lmIMnfJTgeU9VJTDY9ZerDWVFIUzAtJuDHwwceppW7cQWjBBqP48NdeRtoP04/AtO9a7w3viI+PIDr6d+w==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-netbsd-64/-/esbuild-netbsd-64-0.15.18.tgz",
+      "integrity": "sha512-98ukeCdvdX7wr1vUYQzKo4kQ0N2p27H7I11maINv73fVEXt2kyh4K4m9f35U1K43Xc2QGXlzAw0K9yoU7JUjOg==",
      "dev": true,
      "optional": true
    },
    "esbuild-openbsd-64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.14.54.tgz",
-      "integrity": "sha512-Qyk7ikT2o7Wu76UsvvDS5q0amJvmRzDyVlL0qf5VLsLchjCa1+IAvd8kTBgUxD7VBUUVgItLkk609ZHUc1oCaw==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-openbsd-64/-/esbuild-openbsd-64-0.15.18.tgz",
+      "integrity": "sha512-yK5NCcH31Uae076AyQAXeJzt/vxIo9+omZRKj1pauhk3ITuADzuOx5N2fdHrAKPxN+zH3w96uFKlY7yIn490xQ==",
      "dev": true,
      "optional": true
    },
    "esbuild-sunos-64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.14.54.tgz",
-      "integrity": "sha512-28GZ24KmMSeKi5ueWzMcco6EBHStL3B6ubM7M51RmPwXQGLe0teBGJocmWhgwccA1GeFXqxzILIxXpHbl9Q/Kw==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-sunos-64/-/esbuild-sunos-64-0.15.18.tgz",
+      "integrity": "sha512-On22LLFlBeLNj/YF3FT+cXcyKPEI263nflYlAhz5crxtp3yRG1Ugfr7ITyxmCmjm4vbN/dGrb/B7w7U8yJR9yw==",
      "dev": true,
      "optional": true
    },
    "esbuild-windows-32": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.14.54.tgz",
-      "integrity": "sha512-T+rdZW19ql9MjS7pixmZYVObd9G7kcaZo+sETqNH4RCkuuYSuv9AGHUVnPoP9hhuE1WM1ZimHz1CIBHBboLU7w==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-32/-/esbuild-windows-32-0.15.18.tgz",
+      "integrity": "sha512-o+eyLu2MjVny/nt+E0uPnBxYuJHBvho8vWsC2lV61A7wwTWC3jkN2w36jtA+yv1UgYkHRihPuQsL23hsCYGcOQ==",
      "dev": true,
      "optional": true
    },
    "esbuild-windows-64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.14.54.tgz",
-      "integrity": "sha512-AoHTRBUuYwXtZhjXZbA1pGfTo8cJo3vZIcWGLiUcTNgHpJJMC1rVA44ZereBHMJtotyN71S8Qw0npiCIkW96cQ==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-64/-/esbuild-windows-64-0.15.18.tgz",
+      "integrity": "sha512-qinug1iTTaIIrCorAUjR0fcBk24fjzEedFYhhispP8Oc7SFvs+XeW3YpAKiKp8dRpizl4YYAhxMjlftAMJiaUw==",
      "dev": true,
      "optional": true
    },
    "esbuild-windows-arm64": {
-      "version": "0.14.54",
-      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.14.54.tgz",
-      "integrity": "sha512-M0kuUvXhot1zOISQGXwWn6YtS+Y/1RT9WrVIOywZnJHo3jCDyewAc79aKNQWFCQm+xNHVTq9h8dZKvygoXQQRg==",
+      "version": "0.15.18",
+      "resolved": "https://registry.npmjs.org/esbuild-windows-arm64/-/esbuild-windows-arm64-0.15.18.tgz",
+      "integrity": "sha512-q9bsYzegpZcLziq0zgUi5KqGVtfhjxGbnksaBFYmWLxeV/S1fK4OLdq2DFYnXcLMjlZw2L0jLsk1eGoB522WXQ==",
      "dev": true,
      "optional": true
    },
@@ -3696,9 +3739,9 @@
      "dev": true
    },
    "nanoid": {
-      "version": "3.3.4",
-      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.4.tgz",
-      "integrity": "sha512-MqBkQh/OHTS2egovRtLk45wEyNXwF+cokD+1YPf9u5VfJiRdAiRwB2froX5Co9Rh20xs4siNPm8naNotSD6RBw=="
+      "version": "3.3.6",
+      "resolved": "https://registry.npmjs.org/nanoid/-/nanoid-3.3.6.tgz",
+      "integrity": "sha512-BGcqMMJuToF7i1rt+2PWSNVnWIkGCU78jBG3RxO/bZlnZPK2Cmi2QaffxGO/2RvWi9sL+FAiRiXMgsyxQ1DIDA=="
    },
    "no-case": {
      "version": "3.0.4",
@@ -3795,11 +3838,11 @@
      "dev": true
    },
    "postcss": {
-      "version": "8.4.16",
-      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.16.tgz",
-      "integrity": "sha512-ipHE1XBvKzm5xI7hiHCZJCSugxvsdq2mPnsq5+UF+VHCjiBvtDrlxJfMBToWaP9D5XlgNmcFGqoHmUn0EYEaRQ==",
+      "version": "8.4.24",
+      "resolved": "https://registry.npmjs.org/postcss/-/postcss-8.4.24.tgz",
+      "integrity": "sha512-M0RzbcI0sO/XJNucsGjvWU9ERWxb/ytp1w6dKtxTKgixdtQDq4rmx/g8W1hnaheq9jgwL/oyEdH5Bc4WwJKMqg==",
      "requires": {
-        "nanoid": "^3.3.4",
+        "nanoid": "^3.3.6",
        "picocolors": "^1.0.0",
        "source-map-js": "^1.0.2"
      }
@@ -4144,9 +4187,9 @@
      }
    },
    "rollup": {
-      "version": "2.77.3",
-      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.77.3.tgz",
-      "integrity": "sha512-/qxNTG7FbmefJWoeeYJFbHehJ2HNWnjkAFRKzWN/45eNBBF/r8lo992CwcJXEzyVxs5FmfId+vTSTQDb+bxA+g==",
+      "version": "2.79.1",
+      "resolved": "https://registry.npmjs.org/rollup/-/rollup-2.79.1.tgz",
+      "integrity": "sha512-uKxbd0IhMZOhjAiD5oAFp7BqvkA4Dv47qpOCtaNvng4HBwdbWtdOh8f5nZNuk2rp51PMGk3bzfWu5oayNEuYnw==",
      "dev": true,
      "requires": {
        "fsevents": "~2.3.2"
@@ -4386,16 +4429,16 @@
      "integrity": "sha512-EPD5q1uXyFxJpCrLnCc1nHnq3gOa6DZBocAIiI2TaSCA7VCJ1UJDMagCzIkXNsUYfD1daK//LTEQ8xiIbrHtcw=="
    },
    "vite": {
-      "version": "3.0.9",
-      "resolved": "https://registry.npmjs.org/vite/-/vite-3.0.9.tgz",
-      "integrity": "sha512-waYABTM+G6DBTCpYAxvevpG50UOlZuynR0ckTK5PawNVt7ebX6X7wNXHaGIO6wYYFXSM7/WcuFuO2QzhBB6aMw==",
+      "version": "3.2.7",
+      "resolved": "https://registry.npmjs.org/vite/-/vite-3.2.7.tgz",
+      "integrity": "sha512-29pdXjk49xAP0QBr0xXqu2s5jiQIXNvE/xwd0vUizYT2Hzqe4BksNNoWllFVXJf4eLZ+UlVQmXfB4lWrc+t18g==",
      "dev": true,
      "requires": {
-        "esbuild": "^0.14.47",
+        "esbuild": "^0.15.9",
        "fsevents": "~2.3.2",
-        "postcss": "^8.4.16",
+        "postcss": "^8.4.18",
        "resolve": "^1.22.1",
-        "rollup": ">=2.75.6 <2.77.0 || ~2.77.0"
+        "rollup": "^2.79.1"
      }
    },
    "wrappy": {
--- a/lib/SvelteUi/app/package.json
+++ b/lib/SvelteUi/app/package.json
@@ -19,7 +19,7 @@
    "svelte-navigator": "^3.2.2",
    "svelte-preprocess": "^4.10.7",
    "tailwindcss": "^3.1.5",
-    "vite": "^3.0.7"
+    "vite": "^3.2.7"
  },
  "dependencies": {
    "cssnano": "^5.1.14"
--- a/lib/SvelteUi/app/src/lib/BarChart.svelte
+++ b/lib/SvelteUi/app/src/lib/BarChart.svelte
@@ -8,12 +8,13 @@
    let yScale;
    let heightAvailable;
    let labelOffset;
+    let vertSwitch = 30;

    $: {
        heightAvailable = height-(config.title ? 20 : 0);
 	    let innerWidth = width - (config.padding.left + config.padding.right);
 	    barWidth = innerWidth / config.points.length;
-        labelOffset = barWidth < 25 ? 28 : 17;
+        labelOffset = barWidth < vertSwitch ? 30 : 15;

        let yPerUnit = (heightAvailable-config.padding.top-config.padding.bottom)/(config.y.max-config.y.min);

@@ -78,13 +79,11 @@

                            {#if barWidth > 15}
                                <text 
-                                    y="{yScale(point.value) > yScale(0)-labelOffset ? yScale(point.value) - labelOffset : yScale(point.value)+10}" 
-                                    x="{xScale(i) + barWidth/2}" 
                                    width="{barWidth - 4}"
                                    dominant-baseline="middle"
-                                    text-anchor="{barWidth < 25 ? 'left' : 'middle'}"
+                                    text-anchor="{barWidth < vertSwitch ? 'left' : 'middle'}"
                                    fill="{yScale(point.value) > yScale(0)-labelOffset ? point.color : 'white'}"
-                                    transform="rotate({barWidth < 25 ? 90 : 0}, {xScale(i) + (barWidth/2)}, {yScale(point.value) > yScale(0)-labelOffset ? yScale(point.value) - labelOffset : yScale(point.value)+9})"
+                                    transform="translate({xScale(i) + barWidth/2} {yScale(point.value) > yScale(0) - labelOffset ? yScale(point.value) - labelOffset : yScale(point.value) + 10}) rotate({barWidth < vertSwitch ? 90 : 0})"
                                    
                                >{point.label}</text>
                                {#if point.title}
@@ -104,13 +103,11 @@
                            />
                            {#if barWidth > 15}
                                <text 
-                                    y="{yScale(-point.value2) < yScale(0)+12 ? yScale(-point.value2) + 12 : yScale(-point.value2)-10}" 
-                                    x="{xScale(i) + barWidth/2}" 
                                    width="{barWidth - 4}"
                                    dominant-baseline="middle"
-                                    text-anchor="{barWidth < 25 ? 'left' : 'middle'}"
-                                    fill="{yScale(-point.value2) < yScale(0)+12 ? point.color : 'white'}"
-                                    transform="rotate({barWidth < 25 ? 90 : 0}, {xScale(i) + (barWidth/2)}, {yScale(point.value2 - config.y.min) > yScale(0)-12 ? yScale(point.value2 - config.y.min) - 12 : yScale(point.value2 - config.y.min)+9})"
+                                    text-anchor="{'middle'}"
+                                    fill="{yScale(-point.value2) < yScale(0) + 15 ? point.color : 'white'}"
+                                    transform="translate({xScale(i) + (barWidth/2)} {yScale(-point.value2) < yScale(0) + 15 ? yScale(-point.value2) + 15 : yScale(-point.value2) - 14}) rotate({barWidth < vertSwitch ? 90 : 0})"
                                >{point.label2}</text>
                                {#if point.title2}
                                <title>{point.title2}</title>
--- a/lib/SvelteUi/app/src/lib/Clock.svelte
+++ b/lib/SvelteUi/app/src/lib/Clock.svelte
@@ -1,11 +1,19 @@
 <script>
-    import { zeropad, monthnames } from './Helpers.js';
+    import { zeropad, monthnames, addHours } from './Helpers.js';

    export let timestamp;
    export let fullTimeColor;
+    export let offset;
+
+    let showFull;
+    $:{
+        showFull = Math.abs(new Date().getTime()-timestamp.getTime()) < 300000;
+        if(!isNaN(offset))
+            addHours(timestamp, offset - (timestamp.getHours() - timestamp.getUTCHours()));
+    }
 </script>

-{#if Math.abs(new Date().getTime()-timestamp.getTime()) < 300000 }
+{#if showFull }
 {`${zeropad(timestamp.getDate())}. ${monthnames[timestamp.getMonth()]} ${zeropad(timestamp.getHours())}:${zeropad(timestamp.getMinutes())}`}
 {:else}
 <span class="{fullTimeColor}">{`${zeropad(timestamp.getDate())}.${zeropad(timestamp.getMonth()+1)}.${timestamp.getFullYear()} ${zeropad(timestamp.getHours())}:${zeropad(timestamp.getMinutes())}`}</span>
--- a/lib/SvelteUi/app/src/lib/Dashboard.svelte
+++ b/lib/SvelteUi/app/src/lib/Dashboard.svelte
@@ -82,17 +82,17 @@
    {/if}
    {#if uiVisibility(sysinfo.ui.p, data.pe && !Number.isNaN(data.p))}
        <div class="cnt gwf">
-            <PricePlot json={prices}/>
+            <PricePlot json={prices} sysinfo={sysinfo}/>
        </div>
    {/if}
    {#if uiVisibility(sysinfo.ui.d, dayPlot)}
        <div class="cnt gwf">
-            <DayPlot json={dayPlot} />
+            <DayPlot json={dayPlot} sysinfo={sysinfo}/>
        </div>
    {/if}
    {#if uiVisibility(sysinfo.ui.m, monthPlot)}
        <div class="cnt gwf">
-            <MonthPlot json={monthPlot} />
+            <MonthPlot json={monthPlot} sysinfo={sysinfo}/>
        </div>
    {/if}
    {#if uiVisibility(sysinfo.ui.s, data.t && data.t != -127 && temperatures.c > 1)}
--- a/lib/SvelteUi/app/src/lib/DataStores.js
+++ b/lib/SvelteUi/app/src/lib/DataStores.js
@@ -59,7 +59,7 @@ export const dataStore = readable(data, (set) => {
                }
                if(lastPrice != data.p && data.pe) {
                    lastPrice = data.p;
-                    setTimeout(getPrices, 4000);
+                    setTimeout(getPrices, 1000);
                }
                if(sysinfo.upgrading) {
                    window.location.reload();
--- a/lib/SvelteUi/app/src/lib/DayPlot.svelte
+++ b/lib/SvelteUi/app/src/lib/DayPlot.svelte
@@ -3,6 +3,7 @@
    import BarChart from './BarChart.svelte';

    export let json;
+    export let sysinfo;

    let config = {};
    let max = 0;
@@ -15,6 +16,7 @@
        let points = [];
        let cur = addHours(new Date(), -24);
        let currentHour = new Date().getUTCHours();
+        addHours(cur, sysinfo.clock_offset);
        for(i = currentHour; i<24; i++) {
            let imp = json["i"+zeropad(i)];
            let exp = json["e"+zeropad(i)];
@@ -22,7 +24,7 @@
            if(exp === undefined) exp = 0;

            xTicks.push({
-                label: zeropad(cur.getHours())
+                label: zeropad(cur.getUTCHours())
            });
            points.push({
                label: imp.toFixed(1), 
@@ -44,7 +46,7 @@
            if(exp === undefined) exp = 0;

            xTicks.push({
-                label: zeropad(cur.getHours())
+                label: zeropad(cur.getUTCHours())
            });
            points.push({
                label: imp.toFixed(1), 
--- a/lib/SvelteUi/app/src/lib/Header.svelte
+++ b/lib/SvelteUi/app/src/lib/Header.svelte
@@ -73,7 +73,7 @@
            <a class="float-right" href='https://github.com/UtilitechAS/amsreader-firmware' target='_blank' rel="noreferrer" aria-label="GitHub"><img class="gh-logo" src={GitHubLogo} alt="GitHub repo"/></a>
          </div>
          <div class="flex-none my-auto px-2">
-            <Clock timestamp={ data.c ? new Date(data.c * 1000) : new Date(0) } fullTimeColor="text-red-500" />
+            <Clock timestamp={ data.c ? new Date(data.c * 1000) : new Date(0) } offset={sysinfo.clock_offset} fullTimeColor="text-red-500" />
          </div>
          {#if sysinfo.vndcfg && sysinfo.usrcfg}
          <div class="flex-none px-1 mt-1" title="Configuration">
--- a/lib/SvelteUi/app/src/lib/MonthPlot.svelte
+++ b/lib/SvelteUi/app/src/lib/MonthPlot.svelte
@@ -1,8 +1,9 @@
 <script>
-    import { zeropad } from './Helpers.js';
+    import { zeropad, addHours } from './Helpers.js';
    import BarChart from './BarChart.svelte';

    export let json;
+    export let sysinfo;

    let config = {};
    let max = 0;
@@ -15,6 +16,8 @@
        let points = [];
        let cur = new Date();
        let lm = new Date();
+        addHours(cur, sysinfo.clock_offset);
+        addHours(lm, sysinfo.clock_offset);
        lm.setDate(0);

        for(i = cur.getDate(); i<=lm.getDate(); i++) {
@@ -86,7 +89,7 @@
        }

        config = {
-            title: "Energy use last month (kWh)",
+            title: "Energy use last " + lm.getDate() + " days (kWh)",
            height: 226,
            width: 1520,
            padding: { top: 20, right: 15, bottom: 20, left: 35 },
--- a/lib/SvelteUi/app/src/lib/PricePlot.svelte
+++ b/lib/SvelteUi/app/src/lib/PricePlot.svelte
@@ -3,36 +3,30 @@
    import BarChart from './BarChart.svelte';

    export let json;
+    export let sysinfo;

    let config = {};
    let max = 0;
    let min = 0;

    $: {
+        let currency = json.currency;
        let hour = new Date().getUTCHours();
        let i = 0;
        let val = 0;
        let h = 0;
-        let d = json["20"] == null ? 2 : 1;
        let yTicks = [];
        let xTicks = [];
-        let points = [];
+        let values = [];
        let cur = new Date();
+        addHours(cur, sysinfo.clock_offset);
        for(i = hour; i<24; i++) {
            val = json[zeropad(h++)];
            if(val == null) break;
            xTicks.push({
-                label: zeropad(cur.getHours())
-            });
-            points.push({
-                label: val > 0 ? val.toFixed(d) : '', 
-                title: val > 0 ? val.toFixed(2) + ' ' + json.currency : '',
-                value: val > 0 ? Math.abs(val*100) : 0, 
-                label2: val < 0 ? val.toFixed(d) : '', 
-                title2: val < 0 ? val.toFixed(2) + ' ' + json.currency : '',
-                value2: val < 0 ? Math.abs(val*100) : 0, 
-                color: '#7c3aed' 
+                label: zeropad(cur.getUTCHours())
            });
+            values.push(val*100);
            min = Math.min(min, val*100);
            max = Math.max(max, val*100);
            addHours(cur, 1);
@@ -41,26 +35,56 @@
            val = json[zeropad(h++)];
            if(val == null) break;
            xTicks.push({
-                label: zeropad(cur.getHours())
-            });
-            points.push({
-                label: val > 0 ? val.toFixed(d) : '', 
-                value: val > 0 ? Math.abs(val*100) : 0, 
-                label2: val < 0 ? val.toFixed(d) : '', 
-                value2: val < 0 ? Math.abs(val*100) : 0, 
-                color: '#7c3aed' 
+                label: zeropad(cur.getUTCHours())
            });
+            values.push(val*100);
            min = Math.min(min, val*100);
            max = Math.max(max, val*100);
            addHours(cur, 1);
        };

-        max = Math.ceil(max);
-        min = Math.floor(min);
+        if(min > -100 && max < 100) {
+            switch(currency) {
+                case 'NOK':
+                case 'SEK':
+                case 'DKK':
+                    currency = 'øre';
+                    break;
+                case 'EUR':
+                    currency = 'cent';
+                    break;
+                default:
+                    currency = currency+'/100';
+            }
+            min *= 100;
+            max *= 100;
+            for(i = 0; i < values.length; i++) {
+                values[i] *= 100;
+            }
+        }
+
+        let points = [];
+        for(i = 0; i < values.length; i++) {
+            val = values[i];
+            let disp = val * 0.01;
+            let d = Math.abs(val) < 1000 ? 2 : 0;
+            points.push({
+                label: disp >= 0 ? disp.toFixed(d) : '',
+                title: disp >= 0 ? disp.toFixed(2) + ' ' + currency : '',
+                value: val >= 0 ? Math.abs(val) : 0,
+                label2: disp < 0 ? disp.toFixed(d) : '',
+                title2: disp < 0 ? disp.toFixed(2) + ' ' + currency : '',
+                value2: val < 0 ? Math.abs(val) : 0,
+                color: '#7c3aed'
+            });
+        }
+        let range = Math.max(max, Math.abs(min));

        if(min < 0) {
-            let yTickDistDown = min/4;
-            for(i = 1; i < 5; i++) {
+            min = Math.min((range/4)*-1, min);
+            let yTicksNum = Math.ceil((Math.abs(min)/range) * 4);
+            let yTickDistDown = min/yTicksNum;
+            for(i = 1; i < yTicksNum+1; i++) {
                let val = (yTickDistDown*i);
                yTicks.push({
                    value: val,
@@ -69,8 +93,10 @@
            }
        }

-        let yTickDistUp = max/4;
-        for(i = 0; i < 5; i++) {
+        max = Math.max((range/4), max);
+        let xTicksNum = Math.ceil((max/range) * 4);
+        let yTickDistUp = max/xTicksNum;
+        for(i = 0; i < xTicksNum+1; i++) {
            let val = (yTickDistUp*i);
            yTicks.push({
                value: val,
@@ -79,7 +105,7 @@
        }

        config = {
-            title: "Future energy price (" + json.currency + ")",
+            title: "Future energy price (" + currency + ")",
            padding: { top: 20, right: 15, bottom: 20, left: 35 },
            y: {
                min: min,
--- a/lib/SvelteUi/app/vite.config.js
+++ b/lib/SvelteUi/app/vite.config.js
@@ -17,18 +17,18 @@ export default defineConfig({
  plugins: [svelte()],
  server: {
    proxy: {
-      "/data.json": "http://192.168.233.235",
-      "/energyprice.json": "http://192.168.233.235",
-      "/dayplot.json": "http://192.168.233.235",
-      "/monthplot.json": "http://192.168.233.235",
-      "/temperature.json": "http://192.168.233.235",
-      "/sysinfo.json": "http://192.168.233.235",
-      "/configuration.json": "http://192.168.233.235",
-      "/tariff.json": "http://192.168.233.235",
-      "/save": "http://192.168.233.235",
-      "/reboot": "http://192.168.233.235",
-      "/configfile": "http://192.168.233.235",
-      "/upgrade": "http://192.168.233.235"
+      "/data.json": "http://192.168.28.100",
+      "/energyprice.json": "http://192.168.28.100",
+      "/dayplot.json": "http://192.168.28.100",
+      "/monthplot.json": "http://192.168.28.100",
+      "/temperature.json": "http://192.168.28.100",
+      "/sysinfo.json": "http://192.168.28.100",
+      "/configuration.json": "http://192.168.28.100",
+      "/tariff.json": "http://192.168.28.100",
+      "/save": "http://192.168.28.100",
+      "/reboot": "http://192.168.28.100",
+      "/configfile": "http://192.168.28.100",
+      "/upgrade": "http://192.168.28.100"
    }
  }
 })
--- a/lib/SvelteUi/json/sysinfo.json
+++ b/lib/SvelteUi/json/sysinfo.json
@@ -50,5 +50,6 @@
        "c" : %.2f,
        "p" : %.2f,
        "i" : %.2f
-    }
+    },
+    "clock_offset": %d
 }
--- a/lib/SvelteUi/src/AmsWebServer.cpp
+++ b/lib/SvelteUi/src/AmsWebServer.cpp
@@ -261,6 +261,8 @@ void AmsWebServer::sysinfoJson() {
 	if(!meterId.isEmpty())
 		meterId.replace(F("\\"), F("\\\\"));

+	time_t now = time(nullptr);
+
 	int size = snprintf_P(buf, BufferSize, SYSINFO_JSON,
 		FirmwareVersion::VersionString,
 		#if defined(CONFIG_IDF_TARGET_ESP32S2)
@@ -326,7 +328,8 @@ void AmsWebServer::sysinfoJson() {
 		ea->getUseLastMonth(),
 		ea->getCostLastMonth(),
 		ea->getProducedLastMonth(),
-		ea->getIncomeLastMonth()
+		ea->getIncomeLastMonth(),
+		tz == NULL ? 0 : (tz->toLocal(now)-now)/3600
 	);

 	stripNonAscii((uint8_t*) buf, size+1);
--- a/src/AmsToMqttBridge.cpp
+++ b/src/AmsToMqttBridge.cpp
@@ -31,6 +31,7 @@ ADC_MODE(ADC_VCC);

 #if defined(ESP32)
 #include <esp_task_wdt.h>
+#include <lwip/dns.h>
 #endif
 #define WDT_TIMEOUT 60

@@ -158,6 +159,47 @@ void printHanReadError(int pos);
 void debugPrint(byte *buffer, int start, int length);


+#if defined(ESP32)
+uint8_t dnsState = 0;
+ip_addr_t dns0;
+void WiFiEvent(WiFiEvent_t event, WiFiEventInfo_t info) {
+	switch(event) {
+		case ARDUINO_EVENT_WIFI_STA_GOT_IP: {
+			const ip_addr_t* dns = dns_getserver(0);
+			memcpy(&dns0, dns, sizeof(dns0));
+
+			IPAddress res;
+			int ret = WiFi.hostByName("hub.amsleser.no", res);
+			if(ret == 0) {
+				dnsState = 2;
+				debugI_P(PSTR("No DNS, probably a closed network"));
+			} else {
+				debugI_P(PSTR("DNS is present and working, monitoring"));
+				dnsState = 1;
+			}
+			break;
+		}
+		case ARDUINO_EVENT_WIFI_STA_DISCONNECTED:
+			wifi_err_reason_t reason = (wifi_err_reason_t) info.wifi_sta_disconnected.reason;
+			debugI_P(PSTR("WiFi disconnected, reason %s"), WiFi.disconnectReasonName(reason));
+			switch(reason) {
+				case WIFI_REASON_4WAY_HANDSHAKE_TIMEOUT:
+				case WIFI_REASON_AUTH_FAIL:
+					swapWifiMode();
+					break;
+				case WIFI_REASON_NO_AP_FOUND:
+					SystemConfig sys;
+					if(!config.getSystemConfig(sys) || sys.dataCollectionConsent == 0) {
+						swapWifiMode();
+					}
+					break;
+			}
+			break;
+	}
+}
+#endif
+
+
 void setup() {
 	Serial.begin(115200);

@@ -362,15 +404,7 @@ void setup() {
 	if(config.hasConfig()) {
 		if(Debug.isActive(RemoteDebug::INFO)) config.print(&Debug);
 		WiFi_connect();
-		
-		NtpConfig ntp;
-		if(config.getNtpConfig(ntp)) {
-			tz = resolveTimezone(ntp.timezone);
-			ws.setTimezone(tz);
-			ds.setTimezone(tz);
-			ea.setTimezone(tz);
-		}
-
+		handleNtpChange();
 		ds.load();
 	} else {
 		if(Debug.isActive(RemoteDebug::INFO)) {
@@ -632,6 +666,16 @@ void handleSystem(unsigned long now) {
 		if(end - start > 1000) {
 			debugW_P(PSTR("Used %dms to send system update to MQTT"), millis()-start);
 		}
+
+		#if defined(ESP32)
+		if(dnsState == 1) {
+			const ip_addr_t* dns = dns_getserver(0);
+			if(memcmp(&dns0, dns, sizeof(dns0)) != 0) {
+					dns_setserver(0, &dns0);
+					debugI_P(PSTR("Had to reset DNS server"));
+			}
+		}
+		#endif
 	}
 }

@@ -1328,6 +1372,7 @@ void WiFi_connect() {
 			if(strlen(wifi.hostname) > 0) {
 				WiFi.setHostname(wifi.hostname);
 			}	
+			WiFi.onEvent(WiFiEvent);
 		#endif
 		WiFi.mode(WIFI_STA);
Author	SHA1	Message	Date
Gunnar Skjold	ca1c237776	Swap to AP mode if WiFi psk is wrong	2023-06-11 09:45:17 +02:00
Gunnar Skjold	5b6b9879b1	Switch to subunit of currency if price is low	2023-06-11 08:54:03 +02:00
Gunnar Skjold	06a0366762	Fixed negative month cost in realtime calculation	2023-06-11 08:20:09 +02:00
Gunnar Skjold	538624b6eb	Fixed wrong date	2023-06-11 08:08:33 +02:00
Gunnar Skjold	4496b958ff	Fixed overlapping labels in graph	2023-06-11 08:03:07 +02:00
Gunnar Skjold	b2a93c0b4c	Changed label for monthplot	2023-06-11 07:06:03 +02:00
Gunnar Skjold	2cbe566910	Fixed mouseover label on prices for "tomorrow"	2023-06-11 06:59:07 +02:00
Gunnar Skjold	a4b07f4097	Merge branch 'master' of github.com:UtilitechAS/amsreader-firmware	2023-06-11 06:53:17 +02:00
Gunnar Skjold	f8cb9d187f	Adjusted retry delay on prices	2023-06-11 06:41:46 +02:00
Gunnar Skjold	5e9fe74dd0	Merge pull request #586 from UtilitechAS/dependabot/npm_and_yarn/lib/SvelteUi/app/vite-3.2.7 Bump vite from 3.0.9 to 3.2.7 in /lib/SvelteUi/app	2023-06-06 10:58:24 +02:00
dependabot[bot]	5b7b30c0d0	Bump vite from 3.0.9 to 3.2.7 in /lib/SvelteUi/app Bumps [vite](https://github.com/vitejs/vite/tree/HEAD/packages/vite) from 3.0.9 to 3.2.7. - [Release notes](https://github.com/vitejs/vite/releases) - [Changelog](https://github.com/vitejs/vite/blob/v3.2.7/packages/vite/CHANGELOG.md) - [Commits](https://github.com/vitejs/vite/commits/v3.2.7/packages/vite) --- updated-dependencies: - dependency-name: vite dependency-type: direct:development ... Signed-off-by: dependabot[bot] <support@github.com>	2023-06-06 02:25:27 +00:00
Gunnar Skjold	9d902c63de	Fixed NPE	2023-05-22 12:51:26 +02:00
Gunnar Skjold	a57405a7a5	Fixed NaN in clock	2023-05-22 10:26:12 +02:00
Gunnar Skjold	550d32ee33	Fixed issue with new device	2023-05-22 09:55:15 +02:00
Gunnar Skjold	9f7e174c7b	Updated code that fixes broken DNS on IPv6 networks	2023-05-21 13:50:05 +02:00
Gunnar Skjold	104617afd2	Use device timezone in gui	2023-05-21 12:34:00 +02:00
Gunnar Skjold	959664f61d	Even more changes for negative prices	2023-05-21 12:10:00 +02:00
Gunnar Skjold	5834b07393	Adjustments to avoid dns resolving in a closed network	2023-05-20 22:03:26 +02:00
Gunnar Skjold	8dbcf2424a	Hack to fix DNS on networks with IPv6	2023-05-20 21:59:18 +02:00
Gunnar Skjold	74345046b1	Adjustments for negative prices	2023-05-20 21:58:57 +02:00
Gunnar Skjold	516c80e38c	Fixed negative and 0 price	2023-05-16 22:04:51 +02:00
Gunnar Skjold	17bbac8670	Updated exchange rate api call	2023-05-05 19:34:48 +02:00