diff --git a/src/j1939_decoder.py b/src/j1939_decoder.py index 239d100..334a070 100644 --- a/src/j1939_decoder.py +++ b/src/j1939_decoder.py @@ -64,30 +64,6 @@ def decode_j1939_frames(df: pl.DataFrame) -> pl.DataFrame: ]) ).otherwise(None) - b = [pl.col(f"b{i}").fill_null("00").str.to_integer(base=16, strict=False) for i in range(8)] - pgn_j = pl.when(is_j1939).then(pgn).otherwise(None) - - data_1 = pl.when(pgn_j.is_in([61444, 65331])).then(1 * 1) - data_2 = pl.when(pgn_j.is_in([61444, 65331])).then(1 * 1) - data_3 = pl.when(pgn_j == 65265).then(1 * 1) - data_4 = pl.when(pgn_j == 65226).then(1 * 1) - data_5 = pl.when(pgn_j == 65271).then(1 * 1) - - data_col = pl.coalesce( - pl.when(data_1.is_not_null()).then(pl.lit("VALUE 1")), - pl.when(data_2.is_not_null()).then(pl.lit("VALUE 2")), - pl.when(data_3.is_not_null()).then(pl.lit("VALUE 3")), - pl.when(data_4.is_not_null()).then(pl.lit("VALUE 4")), - pl.when(data_5.is_not_null()).then(pl.lit("VALUE 5")), - ) - value_col = pl.coalesce(data_1, data_2, data_3, data_4, data_5) - - return df.with_columns([ - j1939_meta.alias("j1939_metadata"), - data_col.alias("data"), - value_col.alias("value") - ]) - if __name__ == "__main__": parser = argparse.ArgumentParser(description="J1939 decoder") parser.add_argument("input_parquet", help="Path to the raw .parquet file")