Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion platformio.ini
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
; https://docs.platformio.org/page/projectconf.html

[env]
platform = espressif32
platform = espressif32@6.10.0
framework = arduino
build_type = release
board_build.partitions = partitions.csv
Expand Down
4 changes: 2 additions & 2 deletions src/ConfigHTML.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const char CONFIG_HTML[] PROGMEM = R"rawliteral(
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width,initial-scale=1" />
<title>Configuration &mdash; SpoolSense</title>
<link rel="stylesheet" href="/css/shared.css" />
<link rel="stylesheet" href="/css/shared.css?v=)rawliteral" FIRMWARE_VERSION R"rawliteral(" />
<style>
.toggle-row{
display:flex;align-items:center;justify-content:space-between;
Expand Down Expand Up @@ -250,7 +250,7 @@ const char CONFIG_HTML[] PROGMEM = R"rawliteral(
<div class="footer-note">Settings are saved to NVS and persist across OTA updates.</div>
</div>

<script src="/js/shared.js"></script>
<script src="/js/shared.js?v=)rawliteral" FIRMWARE_VERSION R"rawliteral("></script>
<script>
function togglePass(id, btn) {
var el = document.getElementById(id);
Expand Down
4 changes: 2 additions & 2 deletions src/LandingHTML.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const char LANDING_HTML[] PROGMEM = R"rawliteral(
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width,initial-scale=1" />
<title>SpoolSense Scanner</title>
<link rel="stylesheet" href="/css/shared.css" />
<link rel="stylesheet" href="/css/shared.css?v=)rawliteral" FIRMWARE_VERSION R"rawliteral(" />
</head>
<body>
<div class="wrap">
Expand Down Expand Up @@ -126,7 +126,7 @@ const char LANDING_HTML[] PROGMEM = R"rawliteral(
<div class="footer-note" id="footerHostname" style="margin-top:28px">SpoolSense Scanner &mdash; spoolsense.local</div>
</div>

<script src="/js/shared.js"></script>
<script src="/js/shared.js?v=)rawliteral" FIRMWARE_VERSION R"rawliteral("></script>
<script>
fetch('/api/status').then(function(r){return r.json()}).then(function(d){
if(d.device_id) document.getElementById('deviceId').textContent = d.device_id;
Expand Down
2 changes: 1 addition & 1 deletion src/LogViewerHTML.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const char LOG_VIEWER_HTML[] PROGMEM = R"=====(
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Serial Log &mdash; SpoolSense</title>
<link rel="stylesheet" href="/css/shared.css" />
<link rel="stylesheet" href="/css/shared.css?v=)=====" FIRMWARE_VERSION R"=====(" />
<style>
.subtitle {
color: var(--muted);
Expand Down
4 changes: 2 additions & 2 deletions src/OpenPrintTagWriterHTML.h
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,7 @@ const char OPENPRINTTAG_WRITER_HTML[] PROGMEM = R"rawliteral(
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width,initial-scale=1" />
<title>OpenPrintTag Writer &mdash; SpoolSense</title>
<link rel="stylesheet" href="/css/shared.css" />
<link rel="stylesheet" href="/css/shared.css?v=)rawliteral" FIRMWARE_VERSION R"rawliteral(" />
</head>
<body>
<div class="wrap">
Expand Down Expand Up @@ -273,7 +273,7 @@ const char OPENPRINTTAG_WRITER_HTML[] PROGMEM = R"rawliteral(
<div class="footer-note">OpenPrintTag format &mdash; ISO15693</div>
</div>

<script src="/js/shared.js"></script>
<script src="/js/shared.js?v=)rawliteral" FIRMWARE_VERSION R"rawliteral("></script>
<script>
var writerForm = document.getElementById('writerForm');

Expand Down
4 changes: 2 additions & 2 deletions src/OpenSpoolWriterHTML.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const char OPENSPOOL_WRITER_HTML[] PROGMEM = R"rawliteral(
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width,initial-scale=1" />
<title>OpenSpool Writer &mdash; SpoolSense</title>
<link rel="stylesheet" href="/css/shared.css" />
<link rel="stylesheet" href="/css/shared.css?v=)rawliteral" FIRMWARE_VERSION R"rawliteral(" />
</head>
<body>
<div class="wrap">
Expand Down Expand Up @@ -193,7 +193,7 @@ const char OPENSPOOL_WRITER_HTML[] PROGMEM = R"rawliteral(
<div class="footer-note">OpenSpool V1.0 &mdash; NDEF JSON on NTAG215/216</div>
</div>

<script src="/js/shared.js"></script>
<script src="/js/shared.js?v=)rawliteral" FIRMWARE_VERSION R"rawliteral("></script>
<script>
var writerForm = document.getElementById('writerForm');

Expand Down
4 changes: 2 additions & 2 deletions src/OpenTag3DWriterHTML.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const char OPENTAG3D_WRITER_HTML[] PROGMEM = R"rawliteral(
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width,initial-scale=1" />
<title>OpenTag3D Writer &mdash; SpoolSense</title>
<link rel="stylesheet" href="/css/shared.css" />
<link rel="stylesheet" href="/css/shared.css?v=)rawliteral" FIRMWARE_VERSION R"rawliteral(" />
</head>
<body>
<div class="wrap">
Expand Down Expand Up @@ -322,7 +322,7 @@ const char OPENTAG3D_WRITER_HTML[] PROGMEM = R"rawliteral(
<div class="footer-note">OpenTag3D v1.000 &mdash; NTAG215/216</div>
</div>

<script src="/js/shared.js"></script>
<script src="/js/shared.js?v=)rawliteral" FIRMWARE_VERSION R"rawliteral("></script>
<script>
var writerForm = document.getElementById('writerForm');

Expand Down
4 changes: 2 additions & 2 deletions src/ReaderHTML.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const char READER_HTML[] PROGMEM = R"rawliteral(
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width,initial-scale=1" />
<title>Tag Reader &mdash; SpoolSense</title>
<link rel="stylesheet" href="/css/shared.css" />
<link rel="stylesheet" href="/css/shared.css?v=)rawliteral" FIRMWARE_VERSION R"rawliteral(" />
</head>
<body>
<div class="wrap">
Expand Down Expand Up @@ -63,7 +63,7 @@ const char READER_HTML[] PROGMEM = R"rawliteral(
<div class="footer-note">Stops polling once a tag is detected.</div>
</div>

<script src="/js/shared.js"></script>
<script src="/js/shared.js?v=)rawliteral" FIRMWARE_VERSION R"rawliteral("></script>
<script>
var noTag = document.getElementById('noTag');
var tagView = document.getElementById('tagView');
Expand Down
4 changes: 2 additions & 2 deletions src/TigerTagWriterHTML.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const char TIGERTAG_WRITER_HTML[] PROGMEM = R"rawliteral(
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width,initial-scale=1" />
<title>TigerTag Writer &mdash; SpoolSense</title>
<link rel="stylesheet" href="/css/shared.css" />
<link rel="stylesheet" href="/css/shared.css?v=)rawliteral" FIRMWARE_VERSION R"rawliteral(" />
</head>
<body>
<div class="wrap">
Expand Down Expand Up @@ -331,7 +331,7 @@ const char TIGERTAG_WRITER_HTML[] PROGMEM = R"rawliteral(
<div class="footer-note">TigerTag V1.0 Maker format &mdash; 40 bytes, pages 4-13</div>
</div>

<script src="/js/shared.js"></script>
<script src="/js/shared.js?v=)rawliteral" FIRMWARE_VERSION R"rawliteral("></script>
<script>
var writerForm = document.getElementById('writerForm');

Expand Down
2 changes: 1 addition & 1 deletion src/TroubleshootingHTML.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const char TROUBLESHOOTING_HTML[] PROGMEM = R"rawliteral(
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width,initial-scale=1" />
<title>Troubleshooting &mdash; SpoolSense</title>
<link rel="stylesheet" href="/css/shared.css" />
<link rel="stylesheet" href="/css/shared.css?v=)rawliteral" FIRMWARE_VERSION R"rawliteral(" />
<style>
.device-id-box {
background: rgba(99,102,241,.12);
Expand Down
4 changes: 2 additions & 2 deletions src/UIDRegistrationHTML.h
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ const char UID_REGISTRATION_HTML[] PROGMEM = R"rawliteral(
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width,initial-scale=1" />
<title>UID Registration &mdash; SpoolSense</title>
<link rel="stylesheet" href="/css/shared.css" />
<link rel="stylesheet" href="/css/shared.css?v=)rawliteral" FIRMWARE_VERSION R"rawliteral(" />
</head>
<body>
<div class="wrap">
Expand Down Expand Up @@ -187,7 +187,7 @@ const char UID_REGISTRATION_HTML[] PROGMEM = R"rawliteral(
<div class="footer-note">UID Registration &mdash; Spoolman spool via NFC tag UID</div>
</div>

<script src="/js/shared.js"></script>
<script src="/js/shared.js?v=)rawliteral" FIRMWARE_VERSION R"rawliteral("></script>
<script>
var registerForm = document.getElementById('registerForm');
var uidValue = document.getElementById('uidValue');
Expand Down
4 changes: 2 additions & 2 deletions src/UpdateHTML.h
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const char UPDATE_HTML[] PROGMEM = R"rawliteral(
<meta charset="utf-8" />
<meta name="viewport" content="width=device-width,initial-scale=1" />
<title>Firmware Update &mdash; SpoolSense</title>
<link rel="stylesheet" href="/css/shared.css" />
<link rel="stylesheet" href="/css/shared.css?v=)rawliteral" FIRMWARE_VERSION R"rawliteral(" />
<style>
.progress-wrap{margin:16px 0}
.progress-bar{
Expand Down Expand Up @@ -157,7 +157,7 @@ const char UPDATE_HTML[] PROGMEM = R"rawliteral(
<div class="footer-note">OTA updates write to the active partition. Keep USB cable handy as a fallback.</div>
</div>

<script src="/js/shared.js"></script>
<script src="/js/shared.js?v=)rawliteral" FIRMWARE_VERSION R"rawliteral("></script>
<script>
var currentVersion = '';
var boardType = '';
Expand Down
4 changes: 2 additions & 2 deletions src/WebServerManager.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -229,13 +229,13 @@ void WebServerManager::handleOpenSpoolWriter() {

void WebServerManager::handleSharedCSS() {
_server.sendHeader("Access-Control-Allow-Origin", "*");
_server.sendHeader("Cache-Control", "public, max-age=86400");
_server.sendHeader("Cache-Control", "no-store");
_server.send_P(200, "text/css", SHARED_CSS);
}

void WebServerManager::handleSharedJS() {
_server.sendHeader("Access-Control-Allow-Origin", "*");
_server.sendHeader("Cache-Control", "public, max-age=86400");
_server.sendHeader("Cache-Control", "no-store");
_server.send_P(200, "application/javascript", SHARED_JS);
}

Expand Down