Skip to content

Resolve #11: Eliminate code duplication in BBL parser #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nerdCopter merged 5 commits into from
Dec 2, 2025
Merged

Resolve #11: Eliminate code duplication in BBL parser #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
c86da17
refactor: move sign_extend helpers to crate library (Phase 1)
nerdCopter Dec 1, 2025
1dca257
refactor: unify parse_frame_data and BBLDataStream (Phase 2+3)
nerdCopter Dec 1, 2025
34f0bb9
fix: simplify PREDICT_MINMOTOR logic (remove dead code)
nerdCopter Dec 1, 2025
ed5bc26
refactor: address CodeRabbit nitpick feedback
nerdCopter Dec 2, 2025
1150bb7
refactor: reorganize MAX_REASONABLE_VBAT_RAW constant placement
nerdCopter Dec 2, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
655 changes: 0 additions & 655 deletions src/bbl_format.rs
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@
//! ```

// Module declarations
mod bbl_format;
pub mod conversion;
pub mod error;
pub mod export;
Expand All @@ -25,8 +24,6 @@ pub mod types;

// Re-export everything from modules for convenience
#[allow(ambiguous_glob_reexports)]
pub use bbl_format::*;
#[allow(ambiguous_glob_reexports)]
pub use conversion::*;
#[allow(ambiguous_glob_reexports)]
pub use error::*;
Expand Down
129 changes: 34 additions & 95 deletions src/main.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,3 @@
mod bbl_format;

use anyhow::{Context, Result};
use clap::{Arg, Command};
use glob::glob;
Expand All @@ -15,6 +13,16 @@ use bbl_parser::conversion::{
format_failsafe_phase, format_flight_mode_flags, format_state_flags,
};

// Import parser types from crate library
use bbl_parser::parser::helpers::sign_extend_14bit;
use bbl_parser::parser::{
parse_frame_data, BBLDataStream, ENCODING_NEG_14BIT, ENCODING_NULL, ENCODING_SIGNED_VB,
ENCODING_TAG2_3S32, ENCODING_UNSIGNED_VB,
};

// Import types from crate library
use bbl_parser::types::FrameDefinition;

/// Maximum recursion depth to prevent stack overflow
const MAX_RECURSION_DEPTH: usize = 100;

Expand Down Expand Up @@ -224,72 +232,7 @@ fn find_bbl_files_in_dir_with_depth(
Ok(bbl_files)
}

#[derive(Debug, Clone)]
struct FieldDefinition {
name: String,
signed: bool,
predictor: u8,
encoding: u8,
}

#[derive(Debug, Clone)]
struct FrameDefinition {
fields: Vec<FieldDefinition>,
field_names: Vec<String>,
count: usize,
}

impl FrameDefinition {
fn new() -> Self {
Self {
fields: Vec::new(),
field_names: Vec::new(),
count: 0,
}
}

fn from_field_names(names: Vec<String>) -> Self {
let fields = names
.iter()
.map(|name| FieldDefinition {
name: name.clone(),
signed: false,
predictor: 0,
encoding: 0,
})
.collect();
let count = names.len();
Self {
fields,
field_names: names,
count,
}
}

fn update_signed(&mut self, signed_data: &[bool]) {
for (i, field) in self.fields.iter_mut().enumerate() {
if i < signed_data.len() {
field.signed = signed_data[i];
}
}
}

fn update_predictors(&mut self, predictors: &[u8]) {
for (i, field) in self.fields.iter_mut().enumerate() {
if i < predictors.len() {
field.predictor = predictors[i];
}
}
}

fn update_encoding(&mut self, encodings: &[u8]) {
for (i, field) in self.fields.iter_mut().enumerate() {
if i < encodings.len() {
field.encoding = encodings[i];
}
}
}
}
// FieldDefinition and FrameDefinition now imported from bbl_parser::types

#[derive(Debug)]
struct BBLHeader {
Expand Down Expand Up @@ -1763,7 +1706,7 @@ fn parse_frames(
// GPS frame history for differential encoding
let mut gps_frame_history: Vec<i32> = Vec::new();

let mut stream = bbl_format::BBLDataStream::new(binary_data);
let mut stream = BBLDataStream::new(binary_data);

// Main frame parsing loop - process frames as a stream, don't store all
while !stream.eof {
Expand Down Expand Up @@ -1804,7 +1747,7 @@ fn parse_frames(
// I-frames reset the prediction history
frame_history.current_frame.fill(0);

if bbl_format::parse_frame_data(
if parse_frame_data(
&mut stream,
&header.i_frame_def,
&mut frame_history.current_frame,
Expand Down Expand Up @@ -1886,7 +1829,7 @@ fn parse_frames(
if header.p_frame_def.count > 0 && frame_history.valid {
let mut p_frame_values = vec![0i32; header.p_frame_def.count];

if bbl_format::parse_frame_data(
if parse_frame_data(
&mut stream,
&header.p_frame_def,
&mut p_frame_values,
Expand Down Expand Up @@ -2080,7 +2023,7 @@ fn parse_frames(

let mut g_frame_values = vec![0i32; header.g_frame_def.count];

if bbl_format::parse_frame_data(
if parse_frame_data(
&mut stream,
&header.g_frame_def,
&mut g_frame_values,
Expand Down Expand Up @@ -2354,7 +2297,7 @@ fn parse_frames(

#[allow(dead_code)]
fn parse_i_frame(
stream: &mut bbl_format::BBLDataStream,
stream: &mut BBLDataStream,
frame_def: &FrameDefinition,
debug: bool,
) -> Result<HashMap<String, i32>> {
Expand All @@ -2363,12 +2306,10 @@ fn parse_i_frame(
// Parse each field according to the frame definition
for field in &frame_def.fields {
let value = match field.encoding {
bbl_format::ENCODING_SIGNED_VB => stream.read_signed_vb()?,
bbl_format::ENCODING_UNSIGNED_VB => stream.read_unsigned_vb()? as i32,
bbl_format::ENCODING_NEG_14BIT => {
-(bbl_format::sign_extend_14bit(stream.read_unsigned_vb()? as u16))
}
bbl_format::ENCODING_NULL => 0,
ENCODING_SIGNED_VB => stream.read_signed_vb()?,
ENCODING_UNSIGNED_VB => stream.read_unsigned_vb()? as i32,
ENCODING_NEG_14BIT => -(sign_extend_14bit(stream.read_unsigned_vb()? as u16)),
ENCODING_NULL => 0,
_ => {
if debug {
println!(
Expand All @@ -2387,7 +2328,7 @@ fn parse_i_frame(
}

fn parse_s_frame(
stream: &mut bbl_format::BBLDataStream,
stream: &mut BBLDataStream,
frame_def: &FrameDefinition,
debug: bool,
) -> Result<HashMap<String, i32>> {
Expand All @@ -2398,22 +2339,22 @@ fn parse_s_frame(
let field = &frame_def.fields[field_index];

match field.encoding {
bbl_format::ENCODING_SIGNED_VB => {
ENCODING_SIGNED_VB => {
let value = stream.read_signed_vb()?;
data.insert(field.name.clone(), value);
field_index += 1;
}
bbl_format::ENCODING_UNSIGNED_VB => {
ENCODING_UNSIGNED_VB => {
let value = stream.read_unsigned_vb()? as i32;
data.insert(field.name.clone(), value);
field_index += 1;
}
bbl_format::ENCODING_NEG_14BIT => {
let value = -(bbl_format::sign_extend_14bit(stream.read_unsigned_vb()? as u16));
ENCODING_NEG_14BIT => {
let value = -(sign_extend_14bit(stream.read_unsigned_vb()? as u16));
data.insert(field.name.clone(), value);
field_index += 1;
}
bbl_format::ENCODING_TAG2_3S32 => {
ENCODING_TAG2_3S32 => {
// This encoding handles 3 fields at once
let mut values = [0i32; 8];
stream.read_tag2_3s32(&mut values)?;
Expand All @@ -2427,7 +2368,7 @@ fn parse_s_frame(
}
field_index += 3;
}
bbl_format::ENCODING_NULL => {
ENCODING_NULL => {
data.insert(field.name.clone(), 0);
field_index += 1;
}
Expand All @@ -2450,7 +2391,7 @@ fn parse_s_frame(
}

fn parse_h_frame(
stream: &mut bbl_format::BBLDataStream,
stream: &mut BBLDataStream,
frame_def: &FrameDefinition,
debug: bool,
) -> Result<HashMap<String, i32>> {
Expand All @@ -2467,12 +2408,10 @@ fn parse_h_frame(
}

let value = match field.encoding {
bbl_format::ENCODING_SIGNED_VB => stream.read_signed_vb()?,
bbl_format::ENCODING_UNSIGNED_VB => stream.read_unsigned_vb()? as i32,
bbl_format::ENCODING_NEG_14BIT => {
-(bbl_format::sign_extend_14bit(stream.read_unsigned_vb()? as u16))
}
bbl_format::ENCODING_NULL => 0,
ENCODING_SIGNED_VB => stream.read_signed_vb()?,
ENCODING_UNSIGNED_VB => stream.read_unsigned_vb()? as i32,
ENCODING_NEG_14BIT => -(sign_extend_14bit(stream.read_unsigned_vb()? as u16)),
ENCODING_NULL => 0,
_ => {
if debug {
println!(
Expand All @@ -2494,7 +2433,7 @@ fn parse_h_frame(
// like P frames in the main parsing loop for correct GPS coordinate calculation

// Parse E frames (Event frames) - based on C reference implementation
fn parse_e_frame(stream: &mut bbl_format::BBLDataStream, debug: bool) -> Result<EventFrame> {
fn parse_e_frame(stream: &mut BBLDataStream, debug: bool) -> Result<EventFrame> {
if debug {
println!("Parsing E frame (Event frame)");
}
Expand Down Expand Up @@ -2660,7 +2599,7 @@ fn parse_e_frame(stream: &mut bbl_format::BBLDataStream, debug: bool) -> Result<
})
}

fn skip_frame(stream: &mut bbl_format::BBLDataStream, frame_type: char, debug: bool) -> Result<()> {
fn skip_frame(stream: &mut BBLDataStream, frame_type: char, debug: bool) -> Result<()> {
if debug {
println!("Skipping {frame_type} frame");
}
Expand Down
Loading