diff --git a/data/about.min.htm b/data/about.min.htm deleted file mode 100644 index 6403562..0000000 --- a/data/about.min.htm +++ /dev/null @@ -1 +0,0 @@ -Beer Gravity Monitor

Beer Gravity Monitor

This is a piece of software for the iSpindle hardware and will work in a similar way. No part of this software is copied from the iSpindle project.

MIT License

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 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.
(C) Copyright 2021 Magnus Persson
\ No newline at end of file diff --git a/data/config.min.htm b/data/config.min.htm deleted file mode 100644 index b0c839c..0000000 --- a/data/config.min.htm +++ /dev/null @@ -1 +0,0 @@ -Beer Gravity Monitor

Temperature Format:

(C) Copyright 2021 Magnus Persson
\ No newline at end of file diff --git a/data/device.min.htm b/data/device.min.htm deleted file mode 100644 index fe90b77..0000000 --- a/data/device.min.htm +++ /dev/null @@ -1 +0,0 @@ -Beer Gravity Monitor
Current version:
Loading...
Host name:
Loading...
Device ID:
Loading...
(C) Copyright 2021 Magnus Persson
\ No newline at end of file diff --git a/data/index.min.htm b/data/index.min.htm deleted file mode 100644 index 144df21..0000000 --- a/data/index.min.htm +++ /dev/null @@ -1 +0,0 @@ -Beer Gravity Monitor
Gravity:
Loading...
Temperature:
Loading...
Angle/Tilt:
Loading...
Battery:
Loading...
(C) Copyright 2021 Magnus Persson
\ No newline at end of file diff --git a/data/about.htm b/html/about.htm similarity index 95% rename from data/about.htm rename to html/about.htm index b8bc86b..ed11c18 100644 --- a/data/about.htm +++ b/html/about.htm @@ -31,6 +31,9 @@
  • Configuration
    • +
  • + Calibration +
  • About
    • @@ -73,6 +76,6 @@ -
    (C) Copyright 2021 Magnus Persson
    +
    (C) Copyright 2021-22 Magnus Persson
    \ No newline at end of file diff --git a/html/about.min.htm b/html/about.min.htm new file mode 100644 index 0000000..d590edd --- /dev/null +++ b/html/about.min.htm @@ -0,0 +1 @@ +Beer Gravity Monitor

    Beer Gravity Monitor

    This is a piece of software for the iSpindle hardware and will work in a similar way. No part of this software is copied from the iSpindle project.

    MIT License

    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 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.
    (C) Copyright 2021-22 Magnus Persson
    \ No newline at end of file diff --git a/data/config.htm b/html/config.htm similarity index 99% rename from data/config.htm rename to html/config.htm index 979e766..cf4f1bc 100644 --- a/data/config.htm +++ b/html/config.htm @@ -31,6 +31,9 @@
  • Configuration
    • +
  • + Calibration +
  • About
    • @@ -378,6 +381,6 @@ -
    (C) Copyright 2021 Magnus Persson
    +
    (C) Copyright 2021-22 Magnus Persson
    \ No newline at end of file diff --git a/html/config.min.htm b/html/config.min.htm new file mode 100644 index 0000000..f7bd12c --- /dev/null +++ b/html/config.min.htm @@ -0,0 +1 @@ +Beer Gravity Monitor

    Temperature Format:

    (C) Copyright 2021-22 Magnus Persson
    \ No newline at end of file diff --git a/data/device.htm b/html/device.htm similarity index 96% rename from data/device.htm rename to html/device.htm index 39acf16..0541eaf 100644 --- a/data/device.htm +++ b/html/device.htm @@ -32,6 +32,9 @@
  • Configuration
    • +
  • + Calibration +
  • About
    • @@ -112,6 +115,6 @@ -
    (C) Copyright 2021 Magnus Persson
    +
    (C) Copyright 2021-22 Magnus Persson
    \ No newline at end of file diff --git a/html/device.min.htm b/html/device.min.htm new file mode 100644 index 0000000..cef397a --- /dev/null +++ b/html/device.min.htm @@ -0,0 +1 @@ +Beer Gravity Monitor
    Current version:
    Loading...
    Host name:
    Loading...
    Device ID:
    Loading...
    (C) Copyright 2021-22 Magnus Persson
    \ No newline at end of file diff --git a/data/index.htm b/html/index.htm similarity index 97% rename from data/index.htm rename to html/index.htm index bcd1cd3..052cb1e 100644 --- a/data/index.htm +++ b/html/index.htm @@ -31,6 +31,9 @@
  • Configuration
    • +
  • + Calibration +
  • About
    • @@ -148,6 +151,6 @@ -
    (C) Copyright 2021 Magnus Persson
    +
    (C) Copyright 2021-22 Magnus Persson
    \ No newline at end of file diff --git a/html/index.min.htm b/html/index.min.htm new file mode 100644 index 0000000..1822cec --- /dev/null +++ b/html/index.min.htm @@ -0,0 +1 @@ +Beer Gravity Monitor
    Gravity:
    Loading...
    Temperature:
    Loading...
    Angle/Tilt:
    Loading...
    Battery:
    Loading...
    (C) Copyright 2021-22 Magnus Persson
    \ No newline at end of file diff --git a/data/upload.htm b/html/upload.htm similarity index 92% rename from data/upload.htm rename to html/upload.htm index 94ab51f..ed73a73 100644 --- a/data/upload.htm +++ b/html/upload.htm @@ -74,6 +74,10 @@
    config.min.htm
    Checking...
    +
    +
    calibration.min.htm
    +
    Checking...
    +
    about.min.htm
    Checking...
    @@ -118,11 +122,16 @@ function getUpload() { else $("#device").text("File is missing."); - if( cfg["config"] ) + if( cfg["config"] ) $("#config").text("Completed."); else $("#config").text("File is missing."); + if( cfg["calibration"] ) + $("#calibration").text("Completed."); + else + $("#calibration").text("File is missing."); + if( cfg["about"] ) $("#about").text("Completed."); else @@ -141,6 +150,6 @@ function getUpload() { -
    (C) Copyright 2021 Magnus Persson
    +
    (C) Copyright 2021-22 Magnus Persson
    \ No newline at end of file diff --git a/data/upload.min.htm b/html/upload.min.htm similarity index 63% rename from data/upload.min.htm rename to html/upload.min.htm index 6eaa0d7..1ee94dd 100644 --- a/data/upload.min.htm +++ b/html/upload.min.htm @@ -1 +1 @@ -Beer Gravity Monitor
    The listed files below needs to be uploaded to the FileSystem in order for the GUI to work. You can also flash the LittleFS filesystem but in that case you will loose your device settings. An OTA upgrade will automatically download the files if they are found in the same location as the firmware.bin. This page is a fallback option.

    Once all the files are confirmed, please reboot the device for normal operation.
    index.min.htm
    Checking...
    device.min.htm
    Checking...
    config.min.htm
    Checking...
    about.min.htm
    Checking...
    (C) Copyright 2021 Magnus Persson
    \ No newline at end of file +Beer Gravity Monitor
    The listed files below needs to be uploaded to the FileSystem in order for the GUI to work. You can also flash the LittleFS filesystem but in that case you will loose your device settings. An OTA upgrade will automatically download the files if they are found in the same location as the firmware.bin. This page is a fallback option.

    Once all the files are confirmed, please reboot the device for normal operation.
    index.min.htm
    Checking...
    device.min.htm
    Checking...
    config.min.htm
    Checking...
    calibration.min.htm
    Checking...
    about.min.htm
    Checking...
    (C) Copyright 2021-22 Magnus Persson
    \ No newline at end of file diff --git a/script/copy_html.py b/script/copy_html.py new file mode 100644 index 0000000..001091a --- /dev/null +++ b/script/copy_html.py @@ -0,0 +1,31 @@ +Import("env") +import shutil + +print( "Executing custom step " ) +dir = env.GetLaunchDir() +source = dir + "/html/" +target = dir + "/data/" +print( "Copy file : " + source + " -> " + target ) + +file = "about.min.htm" +print( "Copy file: " + source + file + "->" + target + file) +shutil.copyfile( source + file, target + file ) +file = "calibration.min.htm" +print( "Copy file: " + source + file + "->" + target + file) +shutil.copyfile( source + file, target + file ) +file = "config.min.htm" +print( "Copy file: " + source + file + "->" + target + file) +shutil.copyfile( source + file, target + file ) +file = "device.min.htm" +print( "Copy file: " + source + file + "->" + target + file) +shutil.copyfile( source + file, target + file ) +file = "index.min.htm" +print( "Copy file: " + source + file + "->" + target + file) +shutil.copyfile( source + file, target + file ) +file = "upload.min.htm" +print( "Copy file: " + source + file + "->" + target + file) +shutil.copyfile( source + file, target + file ) + +#print( "Adding custom build step (copy ./heml/*.min.html to ./data/): ") +#print(env.Dump()) +#env.AddPreAction("buildprog", before_build)