Make app vehicle-agnostic: JSON vehicle profiles + menu bar
Vehicle data is now DATA, not code. PIDs/scaling/DTCs/presets live in profiles/*.json; the app loads them at runtime, so it works across vehicles and others can contribute profiles (open source). Core: - obdcore/formula.py: safe AST evaluator for scaling formulas (A/B/... byte vars, Torque/FORScan convention). Only arithmetic/bitwise + min/max/abs/ round/int/float; names/attrs/arbitrary calls rejected at load -> a community profile CANNOT execute code. - obdcore/profile.py: load/save/list profiles; compiles each formula into a decode callable. registry.py now profile-backed (PidRegistry/DtcDatabase take a Profile); hardcoded Ford table removed. - store.py: clear()/snapshot()/export_csv() for capture management. Profiles: - profiles/ford-6.0-powerstroke.json (27 PIDs, verified formulas, DTCs) - profiles/generic-obd2.json (standard SAE Mode-01 base, any vehicle) - profiles/README.md (schema + formula language + contributing) GUI: - Menu bar: File (new/record/export/replay capture, quit), Profile (switch/ load/import/reload/edit-JSON/export, live profile list), View (Graph/Table views, gauges P2, toggle PID dock, normalize, light/dark theme), Help (about/confidence legend/profile info). - PID browser + presets rebuild on profile switch; added Table view; raw-JSON profile editor dialog (validates schema+formulas before saving). Tests: profiles load+compile, formula sandbox rejects hostile input, decoders still match real truck bytes, crank/derived/dead-PID/replay -- all pass. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_016yT89n4zR4qbrySoSiEyZs
This commit is contained in:
+30
-144
@@ -1,137 +1,49 @@
|
||||
"""PID + DTC registry for the Ford 6.0L Power Stroke (plus generic OBD-II).
|
||||
"""PID + DTC data model and registry, backed by a vehicle Profile.
|
||||
|
||||
Canonical home for the verified Mode-22 addresses, scaling, and the DTC
|
||||
database. Decoders are plain callables on the raw byte list. Confidence:
|
||||
verified -- multi-source AND confirmed on the truck's scan/crank
|
||||
doc -- corroborated in sources, not (yet) read on the truck
|
||||
tentative -- single-source or disputed scaling
|
||||
|
||||
PID numbers/scaling corrected 2026-06-29 by the ford-60-pid-hunt workflow;
|
||||
see diagnostics/2026-06-29-no-start/pid-research.md. 09D0 (FICM Main) was
|
||||
confirmed on-truck 2026-06-30 (read 48.0V during a crank, intermittent).
|
||||
The actual PID numbers, scaling formulas, and DTC meanings live in JSON
|
||||
vehicle profiles under profiles/ (data, not code) so the app is vehicle-
|
||||
agnostic and others can contribute profiles. This module is the in-memory
|
||||
model + lookups; profile.py loads/saves the JSON.
|
||||
"""
|
||||
from dataclasses import dataclass, field
|
||||
from typing import Callable, Tuple
|
||||
|
||||
|
||||
def _u16(b):
|
||||
return (b[0] << 8) + b[1]
|
||||
|
||||
|
||||
@dataclass
|
||||
class Pid:
|
||||
key: str
|
||||
name: str
|
||||
mode: str # "01" | "22" | "atrv" | "derived"
|
||||
mode: str = "22" # "01" | "22" | "atrv" | "derived"
|
||||
pid: str = "" # hex: "1446" (m22) or "0C" (m01)
|
||||
nbytes: int = 2
|
||||
decode: Callable = None # m01/m22: f(raw_bytes); derived: f(dep_values)
|
||||
formula: str = "" # scaling expr in A/B/... (raw) or dep keys (derived)
|
||||
decode: Callable = None # built from formula by profile loader
|
||||
unit: str = ""
|
||||
group: str = "misc" # fuel | ficm | air | engine | driveline | power
|
||||
group: str = "misc" # fuel | ficm | air | engine | driveline | power | misc
|
||||
vmin: float = 0.0
|
||||
vmax: float = 100.0
|
||||
confidence: str = "verified"
|
||||
deps: Tuple[str, ...] = () # for derived channels
|
||||
confidence: str = "verified" # verified | doc | tentative
|
||||
round: int = None # display rounding (None=raw float, 0=int)
|
||||
deps: Tuple[str, ...] = ()
|
||||
notes: str = ""
|
||||
|
||||
|
||||
def _build():
|
||||
P = []
|
||||
a = P.append
|
||||
# ---- Ford-enhanced Mode 22 -- pressures / fuel ----
|
||||
a(Pid("ICP", "Injection Control Pressure", "22", "1446", 2,
|
||||
lambda b: round(_u16(b) * 0.57, 1), "psi", "fuel", 0, 3500,
|
||||
"verified", notes="need ~500+ psi to fire"))
|
||||
a(Pid("ICP_V", "ICP Sensor Voltage", "22", "16AD", 2,
|
||||
lambda b: round(_u16(b) * 0.000072, 4), "V", "fuel", 0, 5,
|
||||
"tentative", notes="single-source"))
|
||||
a(Pid("IPR", "Injection Pressure Regulator", "22", "1434", 1,
|
||||
lambda b: round(b[0] * 13.53 / 35, 1), "%", "fuel", 0, 100,
|
||||
"tentative", notes="KOEO ~14-15%, cranking ~30-40%"))
|
||||
a(Pid("MAP", "Manifold Absolute Pressure", "22", "1440", 2,
|
||||
lambda b: round(_u16(b) * 0.03625, 2), "psia", "air", 0, 60,
|
||||
"verified"))
|
||||
a(Pid("BARO", "Barometric Pressure", "22", "1442", 2,
|
||||
lambda b: round(_u16(b) * 0.03625, 2), "psia", "air", 0, 20,
|
||||
"verified"))
|
||||
a(Pid("EBP", "Exhaust Back Pressure", "22", "1445", 2,
|
||||
lambda b: round(_u16(b) * 0.03625, 2), "psia", "air", 0, 60,
|
||||
"verified", notes="minus BARO = gauge"))
|
||||
a(Pid("EOT", "Engine Oil Temperature", "22", "1310", 2,
|
||||
lambda b: round(_u16(b) / 100.0 - 40, 1), "C", "engine", -40, 160,
|
||||
"verified"))
|
||||
# ---- FICM ----
|
||||
a(Pid("FICM_M", "FICM Main Power", "22", "09D0", 2,
|
||||
lambda b: round(_u16(b) / 256.0, 1), "V", "ficm", 0, 55,
|
||||
"verified", notes="~48V; <45 suspect; reads intermittently while cranking"))
|
||||
a(Pid("FICM_L", "FICM Logic Power", "22", "09CF", 2,
|
||||
lambda b: round(_u16(b) / 256.0, 1), "V", "ficm", 0, 16,
|
||||
"doc"))
|
||||
a(Pid("FICM_V", "FICM Vehicle Power", "22", "09CE", 2,
|
||||
lambda b: round(_u16(b) / 256.0, 1), "V", "ficm", 0, 16,
|
||||
"doc"))
|
||||
a(Pid("FICM_SYNC", "FICM Sync", "22", "09CD", 1,
|
||||
lambda b: (b[0] >> 1) & 1, "", "ficm", 0, 1,
|
||||
"doc", notes="1=in sync, 0=no sync"))
|
||||
# ---- Driveline ----
|
||||
a(Pid("GEAR", "Current Gear", "22", "11B3", 1,
|
||||
lambda b: b[0] // 2, "", "driveline", 0, 6, "verified"))
|
||||
a(Pid("TSS", "Trans Input Shaft Speed", "22", "11B4", 2,
|
||||
lambda b: round(_u16(b) / 4), "rpm", "driveline", 0, 4000, "verified"))
|
||||
# ---- Generic Mode 01 ----
|
||||
a(Pid("RPM", "Engine RPM", "01", "0C", 2,
|
||||
lambda b: round(_u16(b) / 4), "rpm", "engine", 0, 4000, "verified"))
|
||||
a(Pid("ECT", "Engine Coolant Temp", "01", "05", 1,
|
||||
lambda b: b[0] - 40, "C", "engine", -40, 160, "verified"))
|
||||
a(Pid("IAT", "Intake Air Temp", "01", "0F", 1,
|
||||
lambda b: b[0] - 40, "C", "air", -40, 160, "verified"))
|
||||
a(Pid("LOAD", "Engine Load", "01", "04", 1,
|
||||
lambda b: round(b[0] * 100 / 255), "%", "engine", 0, 100, "verified"))
|
||||
a(Pid("VPCM", "Module Voltage", "01", "42", 2,
|
||||
lambda b: round(_u16(b) / 1000.0, 2), "V", "power", 0, 16, "verified"))
|
||||
# ---- More documented PIDs from the workflow (not yet truck-verified) ----
|
||||
a(Pid("VGT", "VGT Duty Cycle", "22", "096D", 2,
|
||||
lambda b: round(_u16(b) * 100 / 32767, 1), "%", "air", 0, 100,
|
||||
"doc", notes="turbo vane duty"))
|
||||
a(Pid("FAN", "Fan Speed", "22", "099F", 2,
|
||||
lambda b: round(_u16(b) / 4), "rpm", "engine", 0, 4000,
|
||||
"doc", notes="real ceiling ~3500"))
|
||||
a(Pid("INJ_TIMING", "Injection Timing", "22", "09CC", 2,
|
||||
lambda b: round(_u16(b) * 10 / 64, 1), "degBTDC", "fuel", -10, 30,
|
||||
"tentative", notes="scaling disputed; using *10/64 (ScanGauge), not /10"))
|
||||
a(Pid("VBAT", "Battery (PCM)", "22", "1172", 1,
|
||||
lambda b: round(b[0] / 16, 1), "V", "power", 0, 16,
|
||||
"tentative", notes="PCM-reported B+; distinct from ATRV port voltage"))
|
||||
a(Pid("FUEL_PUMP", "Fuel Pump Duty (HFCM)", "22", "1672", 1,
|
||||
lambda b: round(b[0] * 100 / 128, 1), "%", "fuel", 0, 100,
|
||||
"tentative", notes="sits ~100%, drops on high EOT"))
|
||||
a(Pid("FUEL_LVL", "Fuel Level", "22", "16C1", 2,
|
||||
lambda b: round(_u16(b) * 100 / 328, 1), "%", "misc", 0, 100,
|
||||
"tentative", notes="UNCALIBRATED -- needs per-truck full/empty cal"))
|
||||
a(Pid("MFDES", "Mass Fuel Desired", "22", "1411", 2,
|
||||
lambda b: _u16(b), "raw", "fuel", 0, 65535,
|
||||
"tentative", notes="~mg/stroke internal count; no verified GPH formula"))
|
||||
# ---- Pseudo / derived ----
|
||||
a(Pid("BATT", "Battery (OBD port)", "atrv", "", 0,
|
||||
None, "V", "power", 0, 16, "verified"))
|
||||
a(Pid("BOOST", "Boost (MGP)", "derived", "", 0,
|
||||
lambda vals: round(vals[0] - vals[1], 2), "psi", "air", -5, 40,
|
||||
"verified", deps=("MAP", "BARO"), notes="MAP - BARO"))
|
||||
return P
|
||||
|
||||
|
||||
# Subscription presets per perspective (key -> default poll Hz set by scheduler)
|
||||
PRESETS = {
|
||||
"crank": ["ICP", "FICM_M", "BATT", "RPM"],
|
||||
"driving": ["BOOST", "VGT", "EOT", "ECT", "EBP", "LOAD", "RPM", "IPR", "BATT"],
|
||||
"vitals": ["ICP", "FICM_M", "FICM_L", "IPR", "BATT", "RPM", "ECT", "EOT",
|
||||
"IAT", "VPCM"],
|
||||
}
|
||||
@dataclass
|
||||
class Dtc:
|
||||
code: str
|
||||
desc: str
|
||||
system: str = "powertrain"
|
||||
no_start: bool = False
|
||||
causes: str = ""
|
||||
|
||||
|
||||
class PidRegistry:
|
||||
def __init__(self):
|
||||
self._by_key = {p.key: p for p in _build()}
|
||||
"""In-memory PID set + presets for the active vehicle profile."""
|
||||
|
||||
def __init__(self, profile):
|
||||
self.profile = profile
|
||||
self._by_key = {p.key: p for p in profile.pids}
|
||||
self.presets = dict(profile.presets)
|
||||
|
||||
def get(self, key):
|
||||
return self._by_key.get(key)
|
||||
@@ -143,41 +55,15 @@ class PidRegistry:
|
||||
return [p for p in self._by_key.values() if p.group == g]
|
||||
|
||||
def preset(self, name):
|
||||
return [self._by_key[k] for k in PRESETS.get(name, []) if k in self._by_key]
|
||||
return [self._by_key[k] for k in self.presets.get(name, []) if k in self._by_key]
|
||||
|
||||
|
||||
# ---------------------------------------------------------------------------
|
||||
# DTC database -- generic SAE + notable Ford 6.0 codes. The full Ford code
|
||||
# DB is being built by a separate cross-verified workflow; this is the seed.
|
||||
# ---------------------------------------------------------------------------
|
||||
@dataclass
|
||||
class Dtc:
|
||||
code: str
|
||||
desc: str
|
||||
system: str = "powertrain"
|
||||
no_start: bool = False
|
||||
causes: str = ""
|
||||
|
||||
|
||||
def _dtcs():
|
||||
rows = [
|
||||
Dtc("P0087", "Fuel rail/system pressure too LOW", "fuel", True),
|
||||
Dtc("P0088", "Fuel rail/system pressure too HIGH", "fuel"),
|
||||
Dtc("P0148", "Fuel delivery error (low pressure / HPOP / IPR)", "fuel", True),
|
||||
Dtc("P0335", "Crankshaft position (CKP) sensor circuit", "engine", True),
|
||||
Dtc("P0340", "Camshaft position (CMP) sensor circuit", "engine", True),
|
||||
Dtc("P0611", "FICM performance", "ficm", True),
|
||||
Dtc("P1316", "Injector circuit/FICM codes detected", "ficm", True),
|
||||
Dtc("P0606", "PCM processor fault", "power", True),
|
||||
Dtc("U0100", "Lost communication with PCM/ECM", "network", True),
|
||||
Dtc("P0670", "Glow plug control module circuit", "engine"),
|
||||
]
|
||||
return {d.code: d for d in rows}
|
||||
def preset_names(self):
|
||||
return list(self.presets.keys())
|
||||
|
||||
|
||||
class DtcDatabase:
|
||||
def __init__(self):
|
||||
self._db = _dtcs()
|
||||
def __init__(self, profile):
|
||||
self._db = {d.code: d for d in profile.dtcs}
|
||||
|
||||
def get(self, code):
|
||||
return self._db.get(code) or Dtc(code, "(unknown - look up this code)")
|
||||
|
||||
Reference in New Issue
Block a user