Enrich per-event RST/VCC labels (ATR STARTS / power-up) + decode server-side
- decode_line_event adds human label: RST de-asserted->ATR STARTS, VCC applied->VCC ON (power-up); keep canonical event string - Enable rst/vcc in DB decode dispatch so PWA receives decoded (fixes bare RESET/VCC fallback and a latent showDetail crash) - PWA line_event_label/showDetail render decoded.label - Bump 1.22.1, SW cache v32->v33; +1 test
This commit is contained in:
1 parent
e4ac80fb34
commit
674a979645
8 files changed
+43
-11
No files matched your search
+4
-4
@@ -416,8 +416,8 @@ const INS_NAMES = {
|
|||||||
// ──────────────────── UI Helpers ────────────────────
|
// ──────────────────── UI Helpers ────────────────────
|
||||||
function line_event_label(msg) {
|
function line_event_label(msg) {
|
||||||
const d = msg.decoded;
|
const d = msg.decoded;
|
||||||
if (msg.type === 'rst') return d && d.event ? 'RESET ' + (d.event === 'reset asserted' ? 'ASSERTED' : 'DE-ASSERTED') : 'RESET';
|
if (msg.type === 'rst') return d && d.label ? d.label : 'RESET';
|
||||||
if (msg.type === 'vcc') return d && d.event ? 'VCC ' + (d.event === 'power applied' ? 'ON' : 'OFF') : 'VCC';
|
if (msg.type === 'vcc') return d && d.label ? d.label : 'VCC';
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1518,7 +1518,7 @@ function showDetail(msg, entry) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
if (decoded.type === 'rst' || decoded.type === 'vcc') {
|
if (decoded.type === 'rst' || decoded.type === 'vcc') {
|
||||||
const evName = decoded.event || (decoded.type === 'rst' ? 'reset event' : 'power event');
|
const evName = decoded.label || decoded.event || (decoded.type === 'rst' ? 'reset event' : 'power event');
|
||||||
d.innerHTML = `<div class="detail-header"><strong>${ins_label(msg)}</strong><span style="color:var(--text-muted)">${detail_time_html(msg)}</span></div>
|
d.innerHTML = `<div class="detail-header"><strong>${ins_label(msg)}</strong><span style="color:var(--text-muted)">${detail_time_html(msg)}</span></div>
|
||||||
<div class="detail-body">
|
<div class="detail-body">
|
||||||
<table>
|
<table>
|
||||||
@@ -2511,7 +2511,7 @@ function onFilterChange() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// ──────────────────── Versioning ────────────────────
|
// ──────────────────── Versioning ────────────────────
|
||||||
const PWA_VERSION = '1.22.0';
|
const PWA_VERSION = '1.22.1';
|
||||||
const MIN_SERVER_VERSION = '1.0.0';
|
const MIN_SERVER_VERSION = '1.0.0';
|
||||||
|
|
||||||
function parseVersion(v) {
|
function parseVersion(v) {
|
||||||
|
|||||||
+1
-1
@@ -1,4 +1,4 @@
|
|||||||
const CACHE = 'simtrace-analyser-v32';
|
const CACHE = 'simtrace-analyser-v33';
|
||||||
|
|
||||||
const PRECACHE = [
|
const PRECACHE = [
|
||||||
'index.html',
|
'index.html',
|
||||||
|
|||||||
+1
-1
@@ -4,7 +4,7 @@ build-backend = "setuptools.backends._legacy:_Backend"
|
|||||||
|
|
||||||
[project]
|
[project]
|
||||||
name = "simtrace2-pysniff"
|
name = "simtrace2-pysniff"
|
||||||
version = "1.22.0"
|
version = "1.22.1"
|
||||||
description = "Python-based sniffing tool for SIMtrace2 hardware (SIM card communication sniffer)"
|
description = "Python-based sniffing tool for SIMtrace2 hardware (SIM card communication sniffer)"
|
||||||
readme = {file = "README.md", content-type = "text/markdown"}
|
readme = {file = "README.md", content-type = "text/markdown"}
|
||||||
license = {text = "GPL-2.0-or-later"}
|
license = {text = "GPL-2.0-or-later"}
|
||||||
|
|||||||
@@ -6,7 +6,7 @@ from .gsmtap import GsmtapSender, GsmtapReceiver
|
|||||||
from .pcap import PcapWriter
|
from .pcap import PcapWriter
|
||||||
from .dump import FileDumper, format_message
|
from .dump import FileDumper, format_message
|
||||||
|
|
||||||
__version__ = '1.22.0'
|
__version__ = '1.22.1'
|
||||||
__all__ = [
|
__all__ = [
|
||||||
'SniffSession',
|
'SniffSession',
|
||||||
'DeviceDisconnected',
|
'DeviceDisconnected',
|
||||||
|
|||||||
@@ -230,7 +230,7 @@ class Database:
|
|||||||
'data': data_blob.hex(),
|
'data': data_blob.hex(),
|
||||||
'flags': flags,
|
'flags': flags,
|
||||||
}
|
}
|
||||||
if row[3] in ('tpdu', 'change', 'fidi', 'atr', 'pps'):
|
if row[3] in ('tpdu', 'change', 'fidi', 'atr', 'pps', 'rst', 'vcc'):
|
||||||
try:
|
try:
|
||||||
from .decode import decode_sniff_msg
|
from .decode import decode_sniff_msg
|
||||||
msg['decoded'] = decode_sniff_msg(data_blob, row[3], flags, prev=prev)
|
msg['decoded'] = decode_sniff_msg(data_blob, row[3], flags, prev=prev)
|
||||||
|
|||||||
@@ -4018,14 +4018,28 @@ def decode_line_event(raw_data, kind):
|
|||||||
direction — RST: 1 = asserted (high→low), 0 = de-asserted (low→high);
|
direction — RST: 1 = asserted (high→low), 0 = de-asserted (low→high);
|
||||||
VCC: 1 = power applied (low→high), 0 = removed (high→low).
|
VCC: 1 = power applied (low→high), 0 = removed (high→low).
|
||||||
level — resulting line level: 0 = low, 1 = high.
|
level — resulting line level: 0 = low, 1 = high.
|
||||||
|
|
||||||
|
``event`` is the canonical value; ``label`` is the human-facing
|
||||||
|
summary (e.g. RST de-asserted → "ATR STARTS", VCC applied →
|
||||||
|
"VCC ON (power-up)").
|
||||||
"""
|
"""
|
||||||
result = {'type': kind}
|
result = {'type': kind}
|
||||||
if raw_data and len(raw_data) >= 2:
|
if raw_data and len(raw_data) >= 2:
|
||||||
direction, level = raw_data[0], raw_data[1]
|
direction, level = raw_data[0], raw_data[1]
|
||||||
if kind == 'rst':
|
if kind == 'rst':
|
||||||
result['event'] = 'reset asserted' if direction else 'reset de-asserted'
|
if direction:
|
||||||
|
result['event'] = 'reset asserted'
|
||||||
|
result['label'] = 'RESET ASSERTED'
|
||||||
else:
|
else:
|
||||||
result['event'] = 'power applied' if direction else 'power removed'
|
result['event'] = 'reset de-asserted'
|
||||||
|
result['label'] = 'ATR STARTS'
|
||||||
|
else:
|
||||||
|
if direction:
|
||||||
|
result['event'] = 'power applied'
|
||||||
|
result['label'] = 'VCC ON (power-up)'
|
||||||
|
else:
|
||||||
|
result['event'] = 'power removed'
|
||||||
|
result['label'] = 'VCC OFF (power-down)'
|
||||||
result['level'] = 'high' if level else 'low'
|
result['level'] = 'high' if level else 'low'
|
||||||
result['raw'] = raw_data.hex().upper()
|
result['raw'] = raw_data.hex().upper()
|
||||||
return result
|
return result
|
||||||
|
|||||||
@@ -2357,23 +2357,41 @@ class TestLineEvents(unittest.TestCase):
|
|||||||
r = self._dec('rst', '010000')
|
r = self._dec('rst', '010000')
|
||||||
self.assertEqual(r['type'], 'rst')
|
self.assertEqual(r['type'], 'rst')
|
||||||
self.assertEqual(r['event'], 'reset asserted')
|
self.assertEqual(r['event'], 'reset asserted')
|
||||||
|
self.assertEqual(r['label'], 'RESET ASSERTED')
|
||||||
self.assertEqual(r['level'], 'low')
|
self.assertEqual(r['level'], 'low')
|
||||||
|
|
||||||
def test_rst_deasserted(self):
|
def test_rst_deasserted(self):
|
||||||
r = self._dec('rst', '000100')
|
r = self._dec('rst', '000100')
|
||||||
self.assertEqual(r['event'], 'reset de-asserted')
|
self.assertEqual(r['event'], 'reset de-asserted')
|
||||||
|
self.assertEqual(r['label'], 'ATR STARTS')
|
||||||
self.assertEqual(r['level'], 'high')
|
self.assertEqual(r['level'], 'high')
|
||||||
|
|
||||||
def test_vcc_on(self):
|
def test_vcc_on(self):
|
||||||
r = self._dec('vcc', '010100')
|
r = self._dec('vcc', '010100')
|
||||||
self.assertEqual(r['event'], 'power applied')
|
self.assertEqual(r['event'], 'power applied')
|
||||||
|
self.assertEqual(r['label'], 'VCC ON (power-up)')
|
||||||
self.assertEqual(r['level'], 'high')
|
self.assertEqual(r['level'], 'high')
|
||||||
|
|
||||||
def test_vcc_off(self):
|
def test_vcc_off(self):
|
||||||
r = self._dec('vcc', '000000')
|
r = self._dec('vcc', '000000')
|
||||||
self.assertEqual(r['event'], 'power removed')
|
self.assertEqual(r['event'], 'power removed')
|
||||||
|
self.assertEqual(r['label'], 'VCC OFF (power-down)')
|
||||||
self.assertEqual(r['level'], 'low')
|
self.assertEqual(r['level'], 'low')
|
||||||
|
|
||||||
|
def test_db_roundtrip_label(self):
|
||||||
|
# rst/vcc must be decoded server-side (database.py dispatch) so the
|
||||||
|
# PWA receives decoded.label/event, not just the raw bytes.
|
||||||
|
import tempfile
|
||||||
|
from simtrace2_pysniff.server.database import Database
|
||||||
|
with tempfile.NamedTemporaryFile(suffix='.db') as tmp:
|
||||||
|
db = Database(tmp.name)
|
||||||
|
sid = db.create_session('capture')
|
||||||
|
db.insert_message(sid, 0.1, 'rst', bytes.fromhex('000100'), 0)
|
||||||
|
db.insert_message(sid, 0.2, 'vcc', bytes.fromhex('010100'), 0)
|
||||||
|
msgs = db.get_messages(sid)
|
||||||
|
self.assertEqual(msgs[0]['decoded']['label'], 'ATR STARTS')
|
||||||
|
self.assertEqual(msgs[1]['decoded']['label'], 'VCC ON (power-up)')
|
||||||
|
|
||||||
def test_sniff_routing(self):
|
def test_sniff_routing(self):
|
||||||
from simtrace2_pysniff.server.decode import decode_sniff_msg
|
from simtrace2_pysniff.server.decode import decode_sniff_msg
|
||||||
self.assertEqual(decode_sniff_msg(b'\x01\x00\x00', 'rst')['type'], 'rst')
|
self.assertEqual(decode_sniff_msg(b'\x01\x00\x00', 'rst')['type'], 'rst')
|
||||||
|
|||||||
@@ -224,7 +224,7 @@ class TestImportEndpoint(unittest.TestCase):
|
|||||||
class TestVersion(unittest.TestCase):
|
class TestVersion(unittest.TestCase):
|
||||||
def test_package_version(self):
|
def test_package_version(self):
|
||||||
from simtrace2_pysniff import __version__
|
from simtrace2_pysniff import __version__
|
||||||
self.assertEqual(__version__, '1.22.0')
|
self.assertEqual(__version__, '1.22.1')
|
||||||
|
|
||||||
def test_status_includes_version(self):
|
def test_status_includes_version(self):
|
||||||
import os
|
import os
|
||||||
|
|||||||
Reference in new issue
Block a user