Apply signal card system across all message-bearing modes

- Extend signal cards to APRS, Sensors, and utility meter modes
- Add address tracking for automatic new/repeated/burst detection
- Create mode-specific filter bars with status and type filtering
- Add compact card variant for constrained layouts like APRS station list
- Add meter card type with consumption display and type-specific icons
- Refactor filter bar container to be shared across modes
- Add CSS for meter data display and distance display

Co-Authored-By: Claude Opus 4.5 <noreply@anthropic.com>
This commit is contained in:
Smittix
2026-01-20 20:29:30 +00:00
parent 131d054bf8
commit 17acbfa531
3 changed files with 1501 additions and 175 deletions
+285
View File
@@ -851,3 +851,288 @@
margin-top: 8px; margin-top: 8px;
padding-top: 8px; padding-top: 8px;
} }
/* ============================================
SEARCH INPUT
============================================ */
.signal-search-container {
flex: 1;
min-width: 150px;
max-width: 250px;
}
.signal-search-input {
width: 100%;
padding: 6px 10px;
font-family: 'Inter', sans-serif;
font-size: 11px;
color: var(--text-primary);
background: var(--bg-card);
border: 1px solid var(--border-color);
border-radius: 4px;
outline: none;
transition: all 0.15s;
}
.signal-search-input::placeholder {
color: var(--text-dim);
}
.signal-search-input:focus {
border-color: var(--accent-cyan);
background: var(--bg-elevated);
}
/* ============================================
SEEN COUNT BADGE
============================================ */
.signal-seen-count {
font-family: 'JetBrains Mono', monospace;
font-size: 10px;
color: var(--text-dim);
background: var(--bg-secondary);
padding: 2px 5px;
border-radius: 3px;
}
/* ============================================
SENSOR DATA DISPLAY
============================================ */
.signal-sensor-data {
display: flex;
flex-wrap: wrap;
gap: 8px;
padding: 10px;
background: var(--bg-secondary);
border-radius: 4px;
border-left: 2px solid var(--accent-cyan);
}
.signal-sensor-reading {
display: flex;
flex-direction: column;
gap: 2px;
min-width: 70px;
}
.signal-sensor-reading .sensor-label {
font-size: 9px;
text-transform: uppercase;
letter-spacing: 0.04em;
color: var(--text-dim);
}
.signal-sensor-reading .sensor-value {
font-family: 'JetBrains Mono', monospace;
font-size: 14px;
font-weight: 500;
color: var(--text-primary);
}
.signal-sensor-reading .sensor-value.low-battery {
color: var(--accent-red);
}
/* Sensor protocol badge */
.signal-proto-badge.sensor {
background: var(--accent-green-dim);
color: var(--accent-green);
border-color: rgba(34, 197, 94, 0.25);
}
/* ============================================
METER DATA DISPLAY
============================================ */
.signal-meter-data {
display: flex;
flex-wrap: wrap;
gap: 12px;
padding: 12px;
background: var(--bg-secondary);
border-radius: 4px;
border-left: 2px solid var(--accent-yellow);
}
.signal-meter-reading {
display: flex;
flex-direction: column;
gap: 3px;
}
.signal-meter-reading .meter-label {
font-size: 9px;
text-transform: uppercase;
letter-spacing: 0.04em;
color: var(--text-dim);
}
.signal-meter-reading .meter-value {
font-family: 'JetBrains Mono', monospace;
font-size: 18px;
font-weight: 600;
color: var(--text-primary);
}
/* Meter protocol badges */
.signal-proto-badge.meter {
background: rgba(234, 179, 8, 0.15);
color: #eab308;
border-color: rgba(234, 179, 8, 0.25);
}
.signal-proto-badge.meter.electric {
background: rgba(234, 179, 8, 0.15);
color: #eab308;
border-color: rgba(234, 179, 8, 0.25);
}
.signal-proto-badge.meter.gas {
background: rgba(249, 115, 22, 0.15);
color: #f97316;
border-color: rgba(249, 115, 22, 0.25);
}
.signal-proto-badge.meter.water {
background: rgba(59, 130, 246, 0.15);
color: #3b82f6;
border-color: rgba(59, 130, 246, 0.25);
}
/* ============================================
APRS SYMBOL
============================================ */
.signal-aprs-symbol {
font-size: 12px;
padding: 2px 4px;
background: var(--bg-secondary);
border-radius: 3px;
}
/* ============================================
DISTANCE DISPLAY
============================================ */
.signal-distance {
font-family: 'JetBrains Mono', monospace;
font-size: 10px;
color: var(--accent-green);
font-weight: 500;
}
/* ============================================
COMPACT CARD VARIANT
For constrained layouts like APRS station list
============================================ */
.signal-card-compact {
padding: 10px 12px;
}
.signal-card-compact .signal-card-header {
margin-bottom: 6px;
}
.signal-card-compact .signal-proto-badge {
font-size: 9px;
padding: 2px 5px;
}
.signal-card-compact .signal-freq-badge {
font-size: 10px;
padding: 2px 6px;
}
.signal-card-compact .signal-status-pill {
font-size: 9px;
padding: 2px 6px;
}
.signal-card-compact .signal-message {
font-size: 11px;
padding: 6px 8px;
max-height: 40px;
}
.signal-card-compact .signal-meta-row {
font-size: 9px;
}
.signal-card-compact .signal-mini-map {
padding: 6px 8px;
font-size: 10px;
}
.signal-card-compact .signal-card-footer {
margin-top: 6px;
padding-top: 6px;
}
.signal-card-compact .signal-advanced-toggle {
font-size: 9px;
padding: 3px 6px;
}
/* Compact filter bar for APRS */
.signal-filter-bar-compact {
padding: 6px 8px;
margin-bottom: 8px;
gap: 4px;
}
.signal-filter-bar-compact .signal-filter-btn {
padding: 3px 6px;
font-size: 9px;
}
.signal-filter-bar-compact .signal-filter-count {
font-size: 8px;
padding: 1px 3px;
min-width: 14px;
}
.signal-filter-bar-compact .signal-search-input {
padding: 4px 8px;
font-size: 10px;
}
.signal-filter-bar-compact .signal-filter-divider {
margin: 0 4px;
}
/* ============================================
TONE ONLY MESSAGE STYLING
============================================ */
.signal-message.tone-only {
color: var(--text-dim);
font-style: italic;
border-left-color: var(--border-color);
}
/* ============================================
FILTER BAR RESPONSIVE
============================================ */
@media (max-width: 768px) {
.signal-filter-bar {
flex-direction: column;
align-items: stretch;
gap: 8px;
}
.signal-filter-bar > .signal-filter-label {
margin-top: 8px;
}
.signal-filter-bar > .signal-filter-label:first-child {
margin-top: 0;
}
.signal-filter-divider {
display: none;
}
.signal-search-container {
max-width: none;
}
.signal-filter-bar .signal-filter-btn {
flex: 1;
}
}
File diff suppressed because it is too large Load Diff
+190 -102
View File
@@ -995,12 +995,13 @@
<!-- Station List Panel --> <!-- Station List Panel -->
<div class="wifi-visual-panel" <div class="wifi-visual-panel"
style="flex: 1; min-width: 280px; max-width: 350px; display: flex; flex-direction: column;"> style="flex: 1; min-width: 300px; max-width: 400px; display: flex; flex-direction: column;">
<h5 <h5
style="color: var(--accent-green); text-shadow: 0 0 10px var(--accent-green); margin-bottom: 8px;"> style="color: var(--accent-green); text-shadow: 0 0 10px var(--accent-green); margin-bottom: 8px;">
STATION LIST</h5> STATION LIST</h5>
<div id="aprsStationList" style="flex: 1; overflow-y: auto; font-size: 11px;"> <div id="aprsFilterBarContainer"></div>
<div style="padding: 20px; text-align: center; color: var(--text-muted);"> <div id="aprsStationList" class="signal-cards-container" style="flex: 1; overflow-y: auto; font-size: 11px; gap: 8px;">
<div class="signal-cards-placeholder" style="padding: 20px; text-align: center; color: var(--text-muted);">
No stations received yet No stations received yet
</div> </div>
</div> </div>
@@ -1523,6 +1524,9 @@
</div> </div>
</div> </div>
<!-- Filter Bar Container (populated by JavaScript based on active mode) -->
<div id="filterBarContainer" style="display: none;"></div>
<div class="output-content signal-feed" id="output"> <div class="output-content signal-feed" id="output">
<div class="placeholder signal-empty-state"> <div class="placeholder signal-empty-state">
<svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5"> <svg viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="1.5">
@@ -2172,6 +2176,22 @@
reserveDevice(parseInt(device), 'sensor'); reserveDevice(parseInt(device), 'sensor');
setSensorRunning(true); setSensorRunning(true);
startSensorStream(); startSensorStream();
// Initialize sensor filter bar
const filterContainer = document.getElementById('filterBarContainer');
const output = document.getElementById('output');
if (filterContainer) {
filterContainer.innerHTML = '';
const filterBar = SignalCards.createSensorFilterBar(output);
filterContainer.appendChild(filterBar);
filterContainer.style.display = 'block';
}
// Clear address history for fresh session
SignalCards.clearAddressHistory('sensor');
// Clear existing output
output.innerHTML = '<div class="placeholder signal-empty-state" style="display: none;"></div>';
} else { } else {
alert('Error: ' + data.message); alert('Error: ' + data.message);
} }
@@ -2250,40 +2270,51 @@
document.getElementById('deviceCount').textContent = uniqueDevices.size; document.getElementById('deviceCount').textContent = uniqueDevices.size;
} }
const card = document.createElement('div'); // Convert rtl_433 data format to our card format
card.className = 'sensor-card'; const msg = {
model: data.model || 'Unknown',
id: data.id || data.channel || 'N/A',
channel: data.channel,
timestamp: data.time || new Date().toISOString(),
raw: data.raw,
frequency: data.freq
};
let dataItems = ''; // Map common sensor fields
const skipKeys = ['type', 'time', 'model', 'raw']; if (data.temperature_C !== undefined) {
for (const [key, value] of Object.entries(data)) { msg.temperature = data.temperature_C;
if (!skipKeys.includes(key) && value !== null && value !== undefined) { msg.temperature_unit = 'C';
const label = key.replace(/_/g, ' '); } else if (data.temperature_F !== undefined) {
let displayValue = value; msg.temperature = data.temperature_F;
if (key === 'temperature_C') displayValue = value + ' °C'; msg.temperature_unit = 'F';
else if (key === 'temperature_F') displayValue = value + ' °F'; }
else if (key === 'humidity') displayValue = value + ' %'; if (data.humidity !== undefined) msg.humidity = data.humidity;
else if (key === 'pressure_hPa') displayValue = value + ' hPa'; if (data.battery_ok !== undefined) msg.battery = data.battery_ok ? 'OK' : 'LOW';
else if (key === 'wind_avg_km_h') displayValue = value + ' km/h'; if (data.pressure_hPa !== undefined) {
else if (key === 'rain_mm') displayValue = value + ' mm'; msg.pressure = data.pressure_hPa;
else if (key === 'battery_ok') displayValue = value ? 'OK' : 'Low'; msg.pressure_unit = 'hPa';
}
dataItems += '<div class="data-item"><div class="data-label">' + label + '</div><div class="data-value">' + displayValue + '</div></div>'; if (data.wind_avg_km_h !== undefined) {
} msg.wind_speed = data.wind_avg_km_h;
msg.wind_unit = 'km/h';
}
if (data.rain_mm !== undefined) {
msg.rain = data.rain_mm;
msg.rain_unit = 'mm';
} }
const relTime = data.time ? getRelativeTime(data.time.split(' ')[1] || data.time) : 'now'; // Create card using SignalCards component
const card = SignalCards.createSensorCard(msg);
card.innerHTML =
'<div class="header" style="display: flex; justify-content: space-between; margin-bottom: 8px;">' +
'<span class="device-name">' + (data.model || 'Unknown Device') + '</span>' +
'<span class="msg-time" data-timestamp="' + (data.time || '') + '" style="color: #444; font-size: 10px;">' + relTime + '</span>' +
'</div>' +
'<div class="sensor-data">' + dataItems + '</div>';
output.insertBefore(card, output.firstChild); output.insertBefore(card, output.firstChild);
// Update filter counts
SignalCards.updateCounts(output);
if (autoScroll) output.scrollTop = 0; if (autoScroll) output.scrollTop = 0;
while (output.children.length > 100) {
// Keep list manageable
const cards = output.querySelectorAll('.signal-card');
while (cards.length > 100) {
output.removeChild(output.lastChild); output.removeChild(output.lastChild);
} }
} }
@@ -2341,6 +2372,25 @@
reserveDevice(parseInt(device), 'rtlamr'); reserveDevice(parseInt(device), 'rtlamr');
setRtlamrRunning(true); setRtlamrRunning(true);
startRtlamrStream(); startRtlamrStream();
// Initialize meter filter bar (reuse sensor filter bar since same structure)
const filterContainer = document.getElementById('filterBarContainer');
const output = document.getElementById('output');
if (filterContainer) {
filterContainer.innerHTML = '';
const filterBar = SignalCards.createSensorFilterBar(output);
filterBar.id = 'meterFilterBar';
filterBar.querySelector('#sensorSearchInput').id = 'meterSearchInput';
filterBar.querySelector('#meterSearchInput').placeholder = 'Search meter ID...';
filterContainer.appendChild(filterBar);
filterContainer.style.display = 'block';
}
// Clear address history for fresh session
SignalCards.clearAddressHistory('meter');
// Clear existing output
output.innerHTML = '<div class="placeholder signal-empty-state" style="display: none;"></div>';
} else { } else {
alert('Error: ' + data.message); alert('Error: ' + data.message);
} }
@@ -2419,7 +2469,8 @@
document.getElementById('sensorCount').textContent = sensorCount; document.getElementById('sensorCount').textContent = sensorCount;
// Track unique meters by ID // Track unique meters by ID
const meterId = data.Message?.ID || 'Unknown'; const msgData = data.Message || {};
const meterId = msgData.ID || 'Unknown';
if (meterId !== 'Unknown') { if (meterId !== 'Unknown') {
const deviceKey = 'METER_' + meterId; const deviceKey = 'METER_' + meterId;
if (!uniqueDevices.has(deviceKey)) { if (!uniqueDevices.has(deviceKey)) {
@@ -2428,35 +2479,27 @@
} }
} }
const card = document.createElement('div'); // Convert rtlamr data to our card format
card.className = 'sensor-card'; const msg = {
id: String(meterId),
let dataItems = ''; type: data.Type || 'Unknown',
const msg = data.Message || {}; consumption: msgData.Consumption,
unit: 'units',
// Build display from message data endpoint_type: msgData.EndpointType,
for (const [key, value] of Object.entries(msg)) { endpoint_id: msgData.EndpointID,
if (value !== null && value !== undefined) { timestamp: new Date().toISOString()
const label = key.replace(/_/g, ' '); };
let displayValue = value;
if (key === 'Consumption') displayValue = value + ' units';
dataItems += `<div class="sensor-item"><span class="sensor-label">${label}:</span> <span class="sensor-value">${displayValue}</span></div>`;
}
}
const timestamp = new Date().toLocaleTimeString();
card.innerHTML = `
<div class="sensor-header">
<span class="sensor-model">${data.Type || 'Meter'}</span>
<span class="sensor-time">${timestamp}</span>
</div>
<div class="sensor-data">${dataItems}</div>
`;
// Create card using SignalCards component
const card = SignalCards.createMeterCard(msg);
output.insertBefore(card, output.firstChild); output.insertBefore(card, output.firstChild);
// Update filter counts
SignalCards.updateCounts(output);
// Limit output to 50 cards // Limit output to 50 cards
while (output.children.length > 50) { const cards = output.querySelectorAll('.signal-card');
while (cards.length > 50) {
output.removeChild(output.lastChild); output.removeChild(output.lastChild);
} }
} }
@@ -2975,6 +3018,20 @@
reserveDevice(parseInt(device), 'pager'); reserveDevice(parseInt(device), 'pager');
setRunning(true); setRunning(true);
startStream(); startStream();
// Initialize filter bar
const filterContainer = document.getElementById('filterBarContainer');
const output = document.getElementById('output');
if (filterContainer) {
// Clear any existing filter bar and create pager filter
filterContainer.innerHTML = '';
const filterBar = SignalCards.createPagerFilterBar(output);
filterContainer.appendChild(filterBar);
filterContainer.style.display = 'block';
}
// Clear address history for fresh session
SignalCards.clearAddressHistory('pager');
} else { } else {
alert('Error: ' + data.message); alert('Error: ' + data.message);
} }
@@ -3140,21 +3197,23 @@
// Add to waterfall // Add to waterfall
addWaterfallPoint(Date.now(), 0.8); addWaterfallPoint(Date.now(), 0.8);
// Use SignalCards component to create the message card // Use SignalCards component to create the message card (auto-detects status)
const msgEl = SignalCards.createPagerCard(msg, { const msgEl = SignalCards.createPagerCard(msg);
status: 'baseline' // Default status, can be enhanced with detection logic
});
output.insertBefore(msgEl, output.firstChild); output.insertBefore(msgEl, output.firstChild);
// Update filter counts
SignalCards.updateCounts(output);
// Auto-scroll to top (newest messages) // Auto-scroll to top (newest messages)
if (autoScroll) { if (autoScroll) {
output.scrollTop = 0; output.scrollTop = 0;
} }
// Limit messages displayed // Limit messages displayed (keep placeholder/empty-state)
while (output.children.length > 100) { const cards = output.querySelectorAll('.signal-card');
output.removeChild(output.lastChild); while (cards.length > 100) {
output.removeChild(cards[cards.length - 1]);
} }
} }
@@ -6741,6 +6800,19 @@
isAprsRunning = true; isAprsRunning = true;
aprsPacketCount = 0; aprsPacketCount = 0;
aprsStationCount = 0; aprsStationCount = 0;
// Initialize APRS filter bar and clear history
const filterContainer = document.getElementById('aprsFilterBarContainer');
const stationList = document.getElementById('aprsStationList');
if (filterContainer && !document.getElementById('aprsFilterBar')) {
const filterBar = SignalCards.createAprsFilterBar(stationList);
filterContainer.appendChild(filterBar);
}
SignalCards.clearAddressHistory('aprs');
// Clear existing station cards
stationList.innerHTML = '<div class="signal-cards-placeholder" style="padding: 20px; text-align: center; color: var(--text-muted);">Waiting for stations...</div>';
// Update function bar buttons // Update function bar buttons
document.getElementById('aprsStripStartBtn').style.display = 'none'; document.getElementById('aprsStripStartBtn').style.display = 'none';
document.getElementById('aprsStripStopBtn').style.display = 'inline-block'; document.getElementById('aprsStripStopBtn').style.display = 'inline-block';
@@ -7008,60 +7080,76 @@
const callsign = packet.callsign; const callsign = packet.callsign;
// Remove placeholder if present // Remove placeholder if present
const placeholder = listEl.querySelector('div[style*="text-align: center"]'); const placeholder = listEl.querySelector('.signal-cards-placeholder');
if (placeholder && placeholder.textContent.includes('No stations')) { if (placeholder) {
placeholder.remove(); placeholder.remove();
} }
// Calculate distance if user location available
let distance = null;
const hasPos = packet.lat && packet.lon;
if (hasPos && aprsUserLocation.lat && aprsUserLocation.lon) {
distance = aprsCalculateDistanceMi(aprsUserLocation.lat, aprsUserLocation.lon, packet.lat, packet.lon);
}
// Check if station already exists // Check if station already exists
let stationEl = listEl.querySelector(`[data-callsign="${callsign}"]`); let stationEl = listEl.querySelector(`[data-callsign="${callsign}"]`);
const isExisting = !!stationEl;
if (!stationEl) { // Prepare message object for card creation
stationEl = document.createElement('div'); const msg = {
stationEl.dataset.callsign = callsign; callsign: callsign,
stationEl.style.cssText = 'padding: 6px 8px; border-bottom: 1px solid var(--border-color); cursor: pointer;'; packet_type: packet.packet_type || 'unknown',
stationEl.onclick = () => { latitude: packet.lat,
if (aprsMarkers[callsign] && aprsMap) { longitude: packet.lon,
aprsMap.setView(aprsMarkers[callsign].getLatLng(), 10); altitude: packet.altitude,
aprsMarkers[callsign].openPopup(); speed: packet.speed,
} course: packet.course,
}; comment: packet.comment,
listEl.insertBefore(stationEl, listEl.firstChild); symbol: packet.symbol,
} path: packet.path,
raw: packet.raw,
timestamp: new Date().toISOString(),
distance: distance
};
const time = new Date().toLocaleTimeString('en-US', { hour12: false, hour: '2-digit', minute: '2-digit' }); // Create or update the card
const hasPos = packet.lat && packet.lon; const newCard = SignalCards.createAprsCard(msg, { compact: true });
newCard.dataset.callsign = callsign;
// Store lat/lon in dataset for distance updates // Store position for distance updates
if (hasPos) { if (hasPos) {
stationEl.dataset.lat = packet.lat; newCard.dataset.lat = packet.lat;
stationEl.dataset.lon = packet.lon; newCard.dataset.lon = packet.lon;
} }
// Calculate distance if user location available // Add click handler to focus map
let distStr = ''; newCard.style.cursor = 'pointer';
if (hasPos && aprsUserLocation.lat && aprsUserLocation.lon) { newCard.addEventListener('click', (e) => {
const dist = aprsCalculateDistanceMi(aprsUserLocation.lat, aprsUserLocation.lon, packet.lat, packet.lon); // Don't trigger if clicking on buttons
distStr = `<span class="aprs-distance" style="color: var(--accent-green);">${dist.toFixed(1)} mi</span>`; if (e.target.closest('button')) return;
} else if (hasPos) { if (aprsMarkers[callsign] && aprsMap) {
distStr = `<span class="aprs-distance" style="color: var(--text-muted);">-- mi</span>`; aprsMap.setView(aprsMarkers[callsign].getLatLng(), 10);
} aprsMarkers[callsign].openPopup();
}
});
stationEl.innerHTML = ` if (isExisting) {
<div style="display: flex; justify-content: space-between; align-items: center;"> // Replace existing card
<span style="color: var(--accent-cyan); font-weight: bold;">${callsign}</span> stationEl.replaceWith(newCard);
<span style="font-size: 9px; color: var(--text-muted);">${time}</span> } else {
</div> // Insert new card at top
<div style="font-size: 9px; color: var(--text-secondary); margin-top: 2px; display: flex; justify-content: space-between;"> listEl.insertBefore(newCard, listEl.firstChild);
<span>${packet.packet_type || 'unknown'} ${hasPos ? `| ${packet.lat.toFixed(2)}, ${packet.lon.toFixed(2)}` : ''}</span> }
${distStr}
</div>
`;
// Keep list manageable // Keep list manageable
while (listEl.children.length > 50) { const cards = listEl.querySelectorAll('.signal-card');
while (cards.length > 50) {
listEl.removeChild(listEl.lastChild); listEl.removeChild(listEl.lastChild);
} }
// Update filter counts if filter bar exists
SignalCards.updateCounts(listEl);
} }