eeeck/CANveyor
1
0
Fork 0
Code Issues 1 Pull Requests Projects Releases 6 Wiki Activity

Improve tactic for J1939 metadata parsing on proprietary frames

Browse Source
This commit is contained in:
Erick
2026-07-13 18:43:57 +02:00
parent afe719c030
commit feea06fc35
1 changed files with 22 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
decoder.py
+22 -19
View File
@@ -14,17 +14,14 @@ def decode_j1939_metadata(lf: pl.LazyFrame) -> pl.LazyFrame:
""" """
id_int = pl.col("ID").str.to_integer(base=16).cast(pl.UInt32) id_int = pl.col("ID").str.to_integer(base=16).cast(pl.UInt32)
id_shifted_8 = id_int // 256
id_shifted_16 = id_int // 65536
priority = ((id_int // 67108864) % 8).cast(pl.UInt8) priority = ((id_int // 67108864) % 8).cast(pl.UInt8)
pf = (id_shifted_16 % 256).cast(pl.UInt8) pf = ((id_int // 65536) % 256).cast(pl.UInt8)
ps = (id_shifted_8 % 256).cast(pl.UInt8) ps = ((id_int // 256) % 256).cast(pl.UInt8)
sa = (id_int % 256).cast(pl.UInt8) sa = (id_int % 256).cast(pl.UInt8)
da = pl.when(pf < 240).then(ps).otherwise(pl.lit(255, dtype=pl.UInt8)) da = pl.when(pf < 240).then(ps).otherwise(pl.lit(255, dtype=pl.UInt8)).cast(pl.UInt8)
pgn = pl.when(pf < 240).then(id_shifted_8 % 65536).otherwise(id_shifted_8 % 262144).cast(pl.UInt32) pgn = pl.when(pf < 240).then(((id_int // 256) & 0x3FF00)).otherwise(((id_int // 256) & 0x3FFFF)).cast(pl.UInt32)
return lf.with_columns( return lf.with_columns(
pl.struct([ pl.struct([
@@ -42,21 +39,27 @@ def decode_j1939_frames(df: pl.DataFrame) -> pl.DataFrame:
is_j1939 = id_int > 0x7FF is_j1939 = id_int > 0x7FF
priority = (id_int // 67108864) % 8 priority = ((id_int // 67108864) % 8).cast(pl.UInt8)
pf = (id_int // 65536) % 256 pf = ((id_int // 65536) % 256).cast(pl.UInt8)
ps = (id_int // 256) % 256 ps = ((id_int // 256) % 256).cast(pl.UInt8)
sa = id_int % 256 sa = (id_int % 256).cast(pl.UInt8)
da = pl.when(pf < 240).then(ps).otherwise(255)
pgn = pl.when(pf < 240).then((id_int // 256) % 65536).otherwise((id_int // 256) % 262144) da = pl.when(pf < 240).then(ps).otherwise(pl.lit(255, dtype=pl.UInt8)).cast(pl.UInt8)
pgn = pl.when(pf < 240).then(
((id_int // 256) & 0x3FF00)
).otherwise(
((id_int // 256) & 0x3FFFF)
).cast(pl.UInt32)
j1939_meta = pl.when(is_j1939).then( j1939_meta = pl.when(is_j1939).then(
pl.struct([ pl.struct([
priority.cast(pl.UInt8).alias("Priority"), priority.alias("Priority"),
pf.cast(pl.UInt8).alias("PF"), pf.alias("PF"),
ps.cast(pl.UInt8).alias("PS"), ps.alias("PS"),
sa.cast(pl.UInt8).alias("SA"), sa.alias("SA"),
da.cast(pl.UInt8).alias("DA"), da.alias("DA"),
pgn.cast(pl.UInt32).alias("PGN") pgn.alias("PGN")
]) ])
).otherwise(None) ).otherwise(None)