Feature Release 1.3.0 (#202)

* Remove kegscreen service advertisement

* Fix mDNS keys

* Fix for #146

* Use proper div

* Add scanNetworks() to reconnect

* Go back to platform package 1.0.6

* Stub this in for later

* Explicit python decl

* Add post process to zip data files

* Add .gz handler

* Update uptime refresh

* Update proper version.json

* Update Copyright date

* Change partition setup

* Fix active links

* Fix fan control enabled assignment

* Fix button delay/spin

* Fix for #152

* Fix for #149

* Fix for #150

* Restructure reconnect

* Restart serial and telnet

* Restart mDNS

* Restart Web Server

* Reset main loop and filesystem

* Add playDead() for failures

* Cleanup

* Cleanup logging

* Updated Async

* Add some delays to allow Serial to start

* Lockout

* Change logging to use ArduinoLog

* Separate stop and start

* Fix prefixes

* CONFIZG_ASYNC in lib

* Loop logic

* Set autoconnect off

* Initial conversion to MyST

* Update Bootswatch

* Stub in hourly reboots

* Dis/reconnect on iter

* Reverse temperature menu order

* Reboot every 1 hour to avoid panic

* Logging cleanup

* Clean filesystem defines

* Change to 2 hour reboot

* Standardize logic

* Fix for #165

* Tag new alpha

* Close FS after use

* Rearrange menu

* Use single open/close

* Add delay to see startup Serial

* Add drd back in

* Fix John's 'feature'

* Refactor return

* Move theme to info

* Add file list endpoint

* Get rid of some harmless 404 erors

* Reset to 42 day reboot

* No longer need _delay()

* Add new file handler

* Fixed asynch error

* Add notice about 404

* Update LCBUrl to HEAD

* Reverse order of debug

* Reconnect on connecton loss

* Remove debug

* Change execution order

* Rearranged to allow flow load

* Add realm to authentication

* Stylize file buttons

* Stylize filesystem info

* Add link to /fs/

* Style other buttons

* Change type

* Exclude delete/download buttons

* Style/cancel upload

* Toggle sections

* Fix concatenation

* Fix file upload

* Add default TIO labels

* Fix label default

* Limit debug printing when file is missing

* Fix download/delete

* Replace missing file

* Nail down LCBUrl version

* Current versions of libs

* Replace appconfig keys

* Additional FS cleanup - stopping point

* Restyle file list

* Disable/enable buttons

* Timeout messages

* Add confirm

* Disable uploads

* Restore file upload (#182)

* Rearrange events

* Create new file upload

* Add secret to fs actions

* Add filename to prompt

* Toggle both elements

* Document fs (#183)

* Document fs page

* Self-document fs API

* Fix file status display

* Update image

* Add fs api documentation

* Queue saves (#184)

* 404 retry (#185)

* Use updated ArduinoJson

* Add a better 404 handler

* Littlefs (#186)

* Avoid non-reentrant code (#187)

* Fix viewport (#188)

* Logging (#189)

* Rearrange fatal error

* Reset log priorities

* Backup config (#190)

* Add failure detect to app load

* Add copy file function

* Handle LittleFS or SPIFFS

* Use arguments for JSON load/save functions

* Create backup after good file save

* Attempt config reload

* Add config for debug settings

* Add handler for debug settings

* Add loglevel to serial init

* Change URL Target to Generic Rest (#191)

* Add Telnet and Loglevel Config (#192)

* Add debug to models

* Add config for debug settings

* Add handler for debug settings

* Add loglevel to serial init

* Update telnet lib

* Set telnet on app load

* Add telnet to web handler

* Add loglevel to web handler

* Add debug config handler to web pages

* Add telnet and loglevel info

* Fix docs requirements

* Fix settings debug (#193)

* Restore saving theme

* Wrap debug settings in form

* Move telnet changes out of async

* Fs errors (#194)

* Use explicit paths

* Compress PNG too

* Reorder page handlers

* Fix routes

* Turn off core debug

* Home asst (#199)

* Switch MQTT Libs (#198)

* Set up to use generic push

* Protect Includes & Defines (#197)

* New RPints push

* Address templating and push logic

* Get rid of 24hr timer

* Fix RPints template

* Fix pulse reports

* Fix hostname, user, pass

* Add HA config to settings

* Add Home Assist settings to pages

* Add Mosquitto setup steps to troubleshooting

* Update documentation for HA context

* Handle HA config post

* Change field to password

* Initial device discovery

* Overloads for state and discovery

* Allow single tics in templates for clarity

* Add non-blocking delay

* Queue HASS functions

* Queue HASS at proper times

* Update MQTT documentation

* Use initial and ongoing timer for HASS

* Externalize tickers

* Base HASS timer to 5 mins

* Add single point re-broadcast

* MQTT update for only selected sensor

* MQTT update for unavailable too

* Make change on tap post

* Reset control state on sensor unavail

* Kill DRD when we pop portal

* Disable CP when sensor is disabled

* Config kick detect (#200)

* Add kickdetect to model

* Add kickdetect to web settings

* Add kickdetect to settings

* Add kickdetect to API

* Allow skipping kickdetect

* Change verbiage

* Fix context link in temp page

* Templink (#201)

* Allow a reconect

* Fix temp page control link

---------

Co-authored-by: John <[email protected]>

.gitignore

@@ -6,7 +6,8 @@
 *.code-workspace
 *.log
 rpints-arduino/
-/firmware
+/firmware/
+/data/
 
 # Documentation working files
 docs/_build/

LICENSE.md

@@ -0,0 +1,25 @@
+The MIT License (MIT)
+=====================
+
+Copyright © 2019-2023 Lee Bussy
+
+Permission is hereby granted, free of charge, to any person
+obtaining a copy of this software and associated documentation
+files (the “Software”), to deal in the Software without
+restriction, including without limitation the rights to use,
+copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the
+Software is furnished to do so, subject to the following
+conditions:
+
+The above copyright notice and this permission notice shall be
+included in all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND,
+EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES
+OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT
+HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
+OTHER DEALINGS IN THE SOFTWARE.

TODO.md

@@ -0,0 +1,3 @@
+# TODO
+
+- [ ] Enter keg contents by weight

data/404.htm → data_source/404.htm

@@ -93,7 +93,7 @@ <h4 >404 - Page Not Found</h4>
 
     <footer class="footer mt-auto py-3 bg-light">
         <div class="container text-center">
-            <span class="text-muted">Copyright &copy; 2019-2022, Lee C. Bussy</span>
+            <span class="text-muted">Copyright &copy; 2019-2023, Lee C. Bussy</span>
         </div>
     </footer>
 

data/about.htm → data_source/about.htm

@@ -13,27 +13,27 @@
 
     <link rel="canonical" href="https://www.kegcop.com">
 
-    <link rel="apple-touch-icon" sizes="180x180" href="apple-touch-icon.png">
-    <link rel="icon" type="image/png" sizes="32x32" href="favicon-32x32.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="favicon-16x16.png">
-    <link rel="manifest" href="site.webmanifest">
-    <link rel="mask-icon" href="safari-pinned-tab.svg" color="#5bbad5">
+    <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
+    <link rel="manifest" href="/site.webmanifest">
+    <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5">
     <meta name="msapplication-TileColor" content="#da532c">
     <meta id="theme_color" name="theme-color" content="#ffffff">
 
     <link id="theme" rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootswatch@5/dist/cerulean/bootstrap.min.css">
-    <link id="theme_aux" rel="stylesheet" href="cerulean_aux.css">
-    <link rel="stylesheet" href="kegcop.css">
+    <link id="theme_aux" rel="stylesheet" href="/cerulean_aux.css">
+    <link rel="stylesheet" href="/kegcop.css">
     <script src="https://kit.fontawesome.com/e51821420e.js" crossorigin="anonymous"></script>
-    <script src="kegcop_pre.js"></script>
+    <script src="/kegcop_pre.js"></script>
 </head>
 
 <body class="d-flex flex-column h-100">
 
     <header>
         <nav class="navbar navbar-expand-lg navbar-dark bg-primary">
             <a class="navbar-brand" href="/index/">
-                <img src="mstile-150x150.png" style="width:25px;height:25px;">
+                <img src="/mstile-150x150.png" style="width:25px;height:25px;">
                 &nbsp;Keg Cop
             </a>
             <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarColor01"
@@ -54,8 +54,8 @@
                     <li class="nav-item">
                         <a class="nav-link" href="/help/">Help</a>
                     </li>
-                    <li class="nav-item active">
-                        <a class="nav-link" href="/about/">About <span class="visually-hidden">(current)</span></a>
+                    <li class="nav-item">
+                        <a class="nav-link active" href="/about/">About <span class="visually-hidden">(current)</span></a>
                     </li>
                 </ul>
                 <ul class="navbar-nav ms-auto">
@@ -76,11 +76,11 @@
 
         <div class="loader" id="loader"></div> <!-- Load Page Load Spinner Container -->
 
-        <div class="container" id="settingsapp"> <!-- Container -->
+        <div class="container" id="aboutapp"> <!-- Container -->
 
             <div class="card border-dark mb-3">
-                <!-- About Keg Cop Information -->
-                <div class="card-header d-flex">
+
+                <div class="card-header d-flex"> <!-- About Keg Cop Information -->
                     <ul class="navbar me-auto">
                         <h4 >
                             About Keg Cop:
@@ -127,6 +127,7 @@ <h4 >
                             </tr>
                         </tbody>
                     </table>
+                    <p>Access <a href="/fs/">filesystem information</a>.</p>
                 </div>
             </div> <!-- About Keg Cop Information -->
 
@@ -136,7 +137,7 @@ <h4 >
 
     <footer class="footer mt-auto py-3 bg-light">
         <div class="container text-center">
-            <span class="text-muted">Copyright &copy; 2019-2022, Lee C. Bussy</span>
+            <span class="text-muted">Copyright &copy; 2019-2023, Lee C. Bussy</span>
         </div>
     </footer>
 
@@ -150,8 +151,8 @@ <h4 >
         integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous">
         </script>
 
-    <script src="kegcop_post.js"></script>
-    <script src="about.js"></script>
+    <script src="/kegcop_post.js"></script>
+    <script src="/about.js"></script>
 
 </body>
 

data/about.js → data_source/about.js

@@ -6,7 +6,7 @@ toggleLoader("off");
 var numReq = 4 + numReqPre;
 var loaded = 0;
 // Page Variables
-var aboutReloadTimer = 60000;
+var aboutReloadTimer = 10000;
 // Semaphores
 var loadUptimeRunning = false;
 var loadHeapRunning = false;
@@ -124,7 +124,7 @@ function loadUptime(callback = null) { // Get uptime information
             setTimeout(loadUptime, 10000);
         })
         .always(function () {
-            loadUptimerunning = false;
+            loadUptimeRunning = false;
             if (typeof callback == "function") {
                 callback();
             }
@@ -222,24 +222,28 @@ function loadResetReason(callback = null) { // Get last reset reason
 
 function uptimeReload() {
     loadUptime(function callFunction() {
-        setTimeout(uptimeReload, aboutReloadTimer);
+        setTimeout(uptimeReload, aboutReloadTimer + getRandomInt(3));
     });
 }
 
 function heapReload() {
     loadHeap(function callFunction() {
-        setTimeout(heapReload, aboutReloadTimer);
+        setTimeout(heapReload, aboutReloadTimer + getRandomInt(3));
     });
 }
 
 function reasonReload() {
     loadResetReason(function callFunction() {
-        setTimeout(reasonReload, aboutReloadTimer);
+        setTimeout(reasonReload, aboutReloadTimer + getRandomInt(3));
     });
 }
 
 function finishPage() { // Display page
-    setTimeout(heapReload, aboutReloadTimer);
-    setTimeout(uptimeReload, aboutReloadTimer);
-    setTimeout(reasonReload, aboutReloadTimer);
+    setTimeout(heapReload, aboutReloadTimer + getRandomInt(3));
+    setTimeout(uptimeReload, aboutReloadTimer + getRandomInt(3));
+    setTimeout(reasonReload, aboutReloadTimer + getRandomInt(3));
+}
+
+function getRandomInt(max) {
+    return Math.floor(Math.random() * max);
 }

data/appconfig.json → data_source/appconfig.json

@@ -13,7 +13,10 @@
         "serial": false,
         "imperial": true,
         "tapsolenoid": true,
-		"theme": "cerulean"
+		"theme": "cerulean",
+        "loglevel": 4,
+        "telnet": false,
+        "kickdetect": true
     },
     "ota": {
         "dospiffs1": false,
@@ -55,6 +58,14 @@
         "topic": "kegcop",
         "update": false
     },
+    "hatarget": {
+        "host": "",
+        "port": 1883,
+        "username": "",
+        "password": "",
+        "topic": "homeassistant",
+        "update": false
+    },
     "taplistio": {
 		"venue": "",
 		"secret": "",

data/browserconfig.xml → data_source/browserconfig.xml

@@ -2,7 +2,7 @@
 <browserconfig>
     <msapplication>
         <tile>
-            <square150x150logo src="mstile-150x150.png">
+            <square150x150logo src="/mstile-150x150.png">
             <TileColor>#da532c</TileColor>
         </tile>
     </msapplication>

data/controllerreset.htm → data_source/controllerreset.htm

@@ -13,27 +13,27 @@
 
     <link rel="canonical" href="https://www.kegcop.com">
 
-    <link rel="apple-touch-icon" sizes="180x180" href="apple-touch-icon.png">
-    <link rel="icon" type="image/png" sizes="32x32" href="favicon-32x32.png">
-    <link rel="icon" type="image/png" sizes="16x16" href="favicon-16x16.png">
-    <link rel="manifest" href="site.webmanifest">
-    <link rel="mask-icon" href="safari-pinned-tab.svg" color="#5bbad5">
+    <link rel="apple-touch-icon" sizes="180x180" href="/apple-touch-icon.png">
+    <link rel="icon" type="image/png" sizes="32x32" href="/favicon-32x32.png">
+    <link rel="icon" type="image/png" sizes="16x16" href="/favicon-16x16.png">
+    <link rel="manifest" href="/site.webmanifest">
+    <link rel="mask-icon" href="/safari-pinned-tab.svg" color="#5bbad5">
     <meta name="msapplication-TileColor" content="#da532c">
     <meta id="theme_color" name="theme-color" content="#ffffff">
 
     <link id="theme" rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootswatch@5/dist/cerulean/bootstrap.min.css">
-    <link id="theme_aux" rel="stylesheet" href="cerulean_aux.css">
-    <link rel="stylesheet" href="kegcop.css">
+    <link id="theme_aux" rel="stylesheet" href="/cerulean_aux.css">
+    <link rel="stylesheet" href="/kegcop.css">
     <script src="https://kit.fontawesome.com/e51821420e.js" crossorigin="anonymous"></script>
-    <script src="kegcop_pre.js"></script>
+    <script src="/kegcop_pre.js"></script>
 </head>
 
 <body class="d-flex flex-column h-100">
 
     <header>
         <nav class="navbar navbar-expand-lg navbar-dark bg-primary">
             <a class="navbar-brand" href="/index/">
-                <img src="mstile-150x150.png" style="width:25px;height:25px;">
+                <img src="/mstile-150x150.png" style="width:25px;height:25px;">
                 &nbsp;Keg Cop
             </a>
             <button class="navbar-toggler" type="button" data-toggle="collapse" data-target="#navbarColor01"
@@ -75,11 +75,13 @@
 
         <div class="container" id="settingsapp"> <!-- Container -->
 
-            <div class="card border-dark mb-3">
+             <div class="card border-dark mb-3">
 
                 <!-- Controller Reset Information -->
-                <div class="card-header" id="subtitle">
-                    <h4 >Controller Reset In Progress</h4>
+                <div class="card-header d-flex">
+                    <ul class="navbar me-auto">
+                        <h4 >Controller Reset In Progress</h4>
+                    </ul>
                 </div>
                 <div class="card-body" id="message">
                     <p class="card-text">
@@ -94,7 +96,7 @@ <h4 >Controller Reset In Progress</h4>
 
     <footer class="footer mt-auto py-3 bg-light">
         <div class="container text-center">
-            <span class="text-muted">Copyright &copy; 2019-2022, Lee C. Bussy</span>
+            <span class="text-muted">Copyright &copy; 2019-2023, Lee C. Bussy</span>
         </div>
     </footer>
 
@@ -108,8 +110,8 @@ <h4 >Controller Reset In Progress</h4>
         integrity="sha384-JjSmVgyd0p3pXB1rRibZUAYoIIy6OrQ6VrjIEaFf/nJGzIxFDsf4x0xIM+B07jRM" crossorigin="anonymous">
         </script>
 
-    <script src="kegcop_post.js"></script>
-    <script src="controllerreset.js"></script>
+    <script src="/kegcop_post.js"></script>
+    <script src="/controllerreset.js"></script>
 
 </body>