Three independent improvements to the WiFi/webserver stability: 1. /api/register called registerDevice() directly inside the AsyncWebServer body handler. That function does a blocking HTTPClient POST with a 5s timeout, freezing the AsyncTCP task and tearing down every in-flight HTTP and WebSocket connection. It now goes through the existing apiQueue / filamanApiTask machinery: the endpoint answers 202 immediately (or 503 if the queue is full, which would otherwise leave the UI waiting forever) and the outcome is pushed to the browser as a "registerResult" WebSocket message. setup.html waits for that message instead of the HTTP response. 2. TX power raised from 17dBm to the 19.5dBm maximum. The reduced setting was a compromise against heat, but at marginal signal levels it invites AP-side auth/assoc kicks (reason=2/4/9/202). 3. Disconnect/GOT_IP logging now includes BSSID, RSSI and channel, so a device bouncing between two APs (mesh/repeater with separate DHCP scopes) can be told apart from webserver-induced drops. Both build environments verified.
233 lines
10 KiB
HTML
233 lines
10 KiB
HTML
<!DOCTYPE html>
|
|
<html lang="en">
|
|
<head>
|
|
<meta charset="UTF-8">
|
|
<meta name="viewport" content="width=device-width, initial-scale=1.0">
|
|
<title>FilaMan - Device Setup</title>
|
|
<link rel="icon" type="image/png" href="/favicon.ico">
|
|
<link rel="stylesheet" href="style.css">
|
|
</head>
|
|
<body>
|
|
<div class="fm-page">
|
|
<aside class="fm-sidebar">
|
|
<div class="sidebar-brand">
|
|
<img src="/logo.png" alt="Logo" class="sidebar-logo">
|
|
<div class="brand-text">
|
|
<h1>FilaMan <span class="version"></span></h1>
|
|
</div>
|
|
</div>
|
|
<nav class="fm-nav">
|
|
<a href="/">Start</a>
|
|
<a href="/waage">Scale</a>
|
|
<a href="/setup" class="active">Setup</a>
|
|
<a href="/upgrade">Upgrade</a>
|
|
</nav>
|
|
<div class="sidebar-status">
|
|
<div class="status-item">
|
|
<span class="status-dot" id="filamanDot"></span>
|
|
<span>System Sync</span>
|
|
</div>
|
|
<div class="status-item">
|
|
<span id="ramStatus"></span>
|
|
</div>
|
|
</div>
|
|
</aside>
|
|
|
|
<main class="fm-main">
|
|
<header>
|
|
<h1>Device Setup</h1>
|
|
<p>Register your device to connect it with your FilaMan-System account.</p>
|
|
</header>
|
|
|
|
<div class="fm-card">
|
|
<h2>System Registration</h2>
|
|
<p>Current Status: <strong style="color: var(--accent);">%registered%</strong></p>
|
|
|
|
<div class="fm-form-group" style="margin-top: 2rem;">
|
|
<label class="fm-label" for="filamanUrl">FilaMan API URL</label>
|
|
<input type="text" id="filamanUrl" class="fm-input" value="%filamanUrl%" placeholder="e.g. http://192.168.1.10:8000">
|
|
</div>
|
|
|
|
<div class="fm-form-group">
|
|
<label class="fm-label" for="deviceCode">Registration Code</label>
|
|
<input type="text" id="deviceCode" class="fm-input" maxlength="6" placeholder="6-digit code">
|
|
<p style="font-size: 0.8rem; margin-top: 0.5rem;">Enter the 6-digit code shown in your FilaMan Dashboard.</p>
|
|
</div>
|
|
|
|
<button id="registerBtn" class="fm-btn fm-btn-primary">Register Device</button>
|
|
<div id="statusMessage" style="margin-top: 1.5rem;"></div>
|
|
</div>
|
|
|
|
<div class="fm-card">
|
|
<h2>General Settings</h2>
|
|
|
|
<div class="fm-form-group" style="margin-top: 1rem;">
|
|
<label class="fm-label" for="languageSelect">Display Language</label>
|
|
<select id="languageSelect" class="fm-input">
|
|
<option value="en">English</option>
|
|
<option value="de">Deutsch</option>
|
|
</select>
|
|
</div>
|
|
</div>
|
|
|
|
<div class="fm-card">
|
|
<h2>Display Settings</h2>
|
|
|
|
<div class="fm-form-group" style="margin-top: 1rem;">
|
|
<label class="fm-label" for="sleepTimeoutSelect">OLED Sleep Timeout</label>
|
|
<select id="sleepTimeoutSelect" class="fm-input">
|
|
<option value="0">Disabled (always on)</option>
|
|
<option value="30">30 seconds</option>
|
|
<option value="60">1 minute</option>
|
|
<option value="120">2 minutes</option>
|
|
<option value="300">5 minutes</option>
|
|
<option value="600">10 minutes</option>
|
|
</select>
|
|
<p style="font-size: 0.8rem; margin-top: 0.5rem;">Display wakes automatically on weight change or NFC tag read.</p>
|
|
</div>
|
|
<div id="sleepStatusMessage" style="margin-top: 0.5rem;"></div>
|
|
</div>
|
|
</main>
|
|
</div>
|
|
|
|
<script>
|
|
// Fetch Version
|
|
fetch('/api/version')
|
|
.then(response => response.json())
|
|
.then(data => {
|
|
const versionSpan = document.querySelector('.version');
|
|
if (versionSpan) versionSpan.textContent = 'v' + data.version;
|
|
})
|
|
.catch(error => console.error('Error fetching version:', error));
|
|
|
|
// Language setting
|
|
fetch('/api/language')
|
|
.then(response => response.json())
|
|
.then(data => {
|
|
document.getElementById('languageSelect').value = data.lang;
|
|
})
|
|
.catch(error => console.error('Error fetching language:', error));
|
|
|
|
document.getElementById('languageSelect').addEventListener('change', function() {
|
|
fetch('/api/language', {
|
|
method: 'POST',
|
|
headers: { 'Content-Type': 'application/json' },
|
|
body: JSON.stringify({ lang: this.value })
|
|
})
|
|
.then(response => response.json())
|
|
.then(data => {
|
|
if (data.success) {
|
|
console.log('Language saved');
|
|
}
|
|
})
|
|
.catch(error => console.error('Error saving language:', error));
|
|
});
|
|
|
|
// Display sleep timeout setting
|
|
fetch('/api/display')
|
|
.then(response => response.json())
|
|
.then(data => {
|
|
const sel = document.getElementById('sleepTimeoutSelect');
|
|
const val = String(data.sleepTimeout);
|
|
// Select closest matching option
|
|
let matched = false;
|
|
for (let i = 0; i < sel.options.length; i++) {
|
|
if (sel.options[i].value === val) { sel.value = val; matched = true; break; }
|
|
}
|
|
if (!matched) sel.value = '0';
|
|
})
|
|
.catch(error => console.error('Error fetching display settings:', error));
|
|
|
|
document.getElementById('sleepTimeoutSelect').addEventListener('change', function() {
|
|
const msg = document.getElementById('sleepStatusMessage');
|
|
fetch('/api/display', {
|
|
method: 'POST',
|
|
headers: { 'Content-Type': 'application/json' },
|
|
body: JSON.stringify({ sleepTimeout: parseInt(this.value) })
|
|
})
|
|
.then(response => response.json())
|
|
.then(data => {
|
|
if (data.success) {
|
|
msg.textContent = 'Saved.';
|
|
msg.style.color = 'var(--success-text)';
|
|
setTimeout(() => { msg.textContent = ''; }, 2000);
|
|
}
|
|
})
|
|
.catch(error => {
|
|
msg.textContent = 'Error saving setting.';
|
|
msg.style.color = 'var(--error-text)';
|
|
console.error('Error saving display settings:', error);
|
|
});
|
|
});
|
|
|
|
document.getElementById('registerBtn').addEventListener('click', () => {
|
|
const url = document.getElementById('filamanUrl').value;
|
|
const code = document.getElementById('deviceCode').value;
|
|
const statusMessage = document.getElementById('statusMessage');
|
|
|
|
if (!url || !code) {
|
|
statusMessage.textContent = 'Please provide both URL and Code';
|
|
statusMessage.style.color = 'var(--error-text)';
|
|
return;
|
|
}
|
|
|
|
statusMessage.textContent = 'Registering device...';
|
|
statusMessage.style.color = 'var(--text-muted)';
|
|
|
|
fetch('/api/register', {
|
|
method: 'POST',
|
|
headers: { 'Content-Type': 'application/json' },
|
|
body: JSON.stringify({ url: url, code: code })
|
|
})
|
|
.then(response => response.json())
|
|
.then(data => {
|
|
if (data.success) {
|
|
// 202 Accepted: Registrierung wurde nur eingereiht. Das
|
|
// tatsaechliche Ergebnis kommt per WebSocket ('registerResult').
|
|
statusMessage.textContent = 'Registering device...';
|
|
statusMessage.style.color = 'var(--text-muted)';
|
|
} else {
|
|
statusMessage.textContent = 'Registration failed. Please check your code and URL.';
|
|
statusMessage.style.color = 'var(--error-text)';
|
|
}
|
|
})
|
|
.catch(error => {
|
|
console.error('Error:', error);
|
|
statusMessage.textContent = 'Network error. Please check connection.';
|
|
statusMessage.style.color = 'var(--error-text)';
|
|
});
|
|
});
|
|
|
|
// WebSocket handling
|
|
let ws = null;
|
|
function connectWebSocket() {
|
|
ws = new WebSocket(`ws://${window.location.hostname}/ws`);
|
|
ws.onmessage = (event) => {
|
|
const data = JSON.parse(event.data);
|
|
if (data.type === 'heartbeat') {
|
|
const dot = document.getElementById('filamanDot');
|
|
dot.className = data.filaman_connected ? 'status-dot online' : 'status-dot offline';
|
|
document.getElementById('ramStatus').textContent = data.freeHeap + ' KB free';
|
|
}
|
|
else if (data.type === 'registerResult') {
|
|
// Die Registrierung laeuft asynchron im API-Task; /api/register
|
|
// antwortet sofort mit 202, das Ergebnis kommt hier an.
|
|
const statusMessage = document.getElementById('statusMessage');
|
|
if (data.success) {
|
|
statusMessage.textContent = 'Registration successful!';
|
|
statusMessage.style.color = 'var(--success-text)';
|
|
setTimeout(() => location.reload(), 2000);
|
|
} else {
|
|
statusMessage.textContent = 'Registration failed. Please check your code and URL.';
|
|
statusMessage.style.color = 'var(--error-text)';
|
|
}
|
|
}
|
|
};
|
|
ws.onclose = () => setTimeout(connectWebSocket, 2000);
|
|
}
|
|
connectWebSocket();
|
|
setInterval(() => { if(ws && ws.readyState === WebSocket.OPEN) ws.send(JSON.stringify({type:'heartbeat'})); }, 5000);
|
|
</script>
|
|
</body>
|
|
</html>
|