Mirror/intercept
1
0
Fork 0
mirror of https://github.com/smittix/intercept.git synced 2026-07-02 06:48:58 -07:00
Code Issues Packages Projects Releases Wiki Activity

fix: meshcore serial connection and battery calculation issues

Browse Source 
- Fix _pollUntilConnected overwriting real error with generic timeout
  message — stop polling once backend reaches error state
- Fix battery % calculation: was battery_mv/42 (71% at empty); now
  (battery_mv-3000)/12 for a proper 0-100% LiPo curve
- Improve auto-detect: scan available ports rather than blindly using
  /dev/ttyUSB0; update label to show fallback so users know what to expect
- Add port refresh button (↻) — previously required switching modes
  and back if device was plugged in after panel opened
- Add baud rate selector to serial config strip (default 115200,
  options up to 921600) and wire it through to the connect request

Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
James Smith
2026-07-01 14:22:10 +01:00
parent f792f2b164
commit 0d45d5ce07
3 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
static/js/modes/meshcore.js
+16 -3
View File
@@ -79,6 +79,7 @@ const MeshCore = (function () {
let body = { transport: _transport };
if (_transport === 'serial') {
body.port = document.getElementById('meshcorePortSelect').value || null;
body.baud = parseInt(document.getElementById('meshcoreBaudSelect')?.value || '115200', 10);
} else if (_transport === 'tcp') {
body.host = document.getElementById('meshcoreTcpHost').value;
body.port = parseInt(document.getElementById('meshcoreTcpPort').value, 10);
@@ -98,13 +99,20 @@ const MeshCore = (function () {
function _pollUntilConnected(attempts) {
if (_connected) return;
if (attempts > 45) {
// Backend retry window (5+15+45s) has elapsed — give up
// Backend retry window (5+15+45s) has elapsed — give up only if
// the backend hasn't already reported a real error (which would
// have been shown by _updateStatusUI and we don't want to overwrite).
const dot = document.getElementById('meshcoreStatusDot');
if (dot && dot.classList.contains('error')) return;
_updateStatusUI('error', 'Connection timed out');
return;
}
setTimeout(async () => {
await _checkStatus();
if (!_connected) _pollUntilConnected(attempts + 1);
// Stop polling once the backend has settled into a terminal state
const dot = document.getElementById('meshcoreStatusDot');
const inTerminal = dot && dot.classList.contains('error');
if (!_connected && !inTerminal) _pollUntilConnected(attempts + 1);
}, 2000);
}
@@ -123,7 +131,7 @@ const MeshCore = (function () {
const sel = document.getElementById('meshcorePortSelect');
if (!sel) return;
const current = sel.value;
sel.innerHTML = '<option value="">Auto-detect</option>';
sel.innerHTML = '<option value="">Auto-detect (/dev/ttyUSB0)</option>';
(d.ports || []).forEach(p => {
const o = document.createElement('option');
o.value = p; o.textContent = p;
@@ -133,6 +141,10 @@ const MeshCore = (function () {
} catch (e) { /* ignore */ }
}
async function refreshPorts() {
await _loadPorts();
}
async function scanBle() {
const btn = document.querySelector('[onclick="MeshCore.scanBle()"]');
const sel = document.getElementById('meshcoreBleSelect');
@@ -522,6 +534,7 @@ const MeshCore = (function () {
connect,
disconnect,
selectTransport,
refreshPorts,
scanBle,
sendMessage,
switchTab,