Release v0.1.5

Author: AdrianEddy

Cargo.lock

@@ -1,6 +1,6 @@
 [package]
 name = "telemetry-parser"
-version = "0.1.4"
+version = "0.1.5"
 authors = ["Adrian <[email protected]>"]
 edition = "2018"
 license = "MPL-2.0"
@@ -18,6 +18,8 @@ serde = { version = "1", features = ["derive"] }
 serde_json = { version = "1", features = ["preserve_order"] }
 argh = "0.1"
 memchr = "2.4"
+fc-blackbox = { version = "*", git = "https://github.com/AdrianEddy/fc-blackbox.git" }
+csv = "1.1"
 
 quick-xml = { version = "0.22", optional = true }
 

Cargo.toml

@@ -7,8 +7,8 @@ Work in progress, the code is already working but I plan to add much more input
 - [x] Sony (RX0 II, a7s III, RX100 VII, ZV1, a7c, a7r IV, a6600, a9 II, a1, FX3, ZV-E10, FX6)
 - [x] GoPro (All models with gyro metadata, starting with HERO 5)
 - [x] Insta360 (OneR, SMO 4k, GO2)
-- [ ] TODO Betaflight blackbox (CSV and Binary)
-- [ ] TODO Runcam CSV
+- [x] Betaflight blackbox (CSV and Binary)
+- [x] Runcam CSV (Runcam 5 Orange, iFlight GOCam GR)
 - [ ] TODO DJI flight logs (*.dat, *.txt)
 
 # Example usage
@@ -21,6 +21,12 @@ Dump all metadata found in the source file.
 gyro2bb --dump file.mp4
 ```
 
+
+# Python module
+Python module is available on [PyPI](https://pypi.org/project/telemetry-parser/).
+Details in [bin/python-module](https://github.com/AdrianEddy/telemetry-parser/tree/master/bin/python-module)
+
+
 # Building
 1. Get latest stable Rust language from: https://rustup.rs/
 2. Clone the repo: `git clone https://github.com/AdrianEddy/telemetry-parser.git`

README.md

@@ -1,6 +1,6 @@
 [package]
 name = "gyro2bb"
-version = "0.1.4"
+version = "0.1.5"
 authors = ["Adrian <[email protected]>"]
 edition = "2018"
 

bin/gyro2bb/Cargo.lock

@@ -4,7 +4,7 @@ use argh::FromArgs;
 use telemetry_parser::*;
 use telemetry_parser::tags_impl::*;
 
-/** gyro2bb v0.1.4
+/** gyro2bb v0.1.5
 Author: Adrian <[email protected]>
 
 Extract gyro data from Sony, GoPro and Insta360 cameras to betaflight blackbox csv log
@@ -31,7 +31,9 @@ fn main() {
     let mut stream = std::fs::File::open(&opts.input).unwrap();
     let filesize = stream.metadata().unwrap().len() as usize;
 
-    let input = Input::from_stream(&mut stream, filesize).unwrap();
+    let filename = std::path::Path::new(&opts.input).file_name().unwrap().to_str().unwrap();
+
+    let input = Input::from_stream(&mut stream, filesize, filename).unwrap();
 
     let mut i = 0;
     println!("Detected camera: {} {}", input.camera_type(), input.camera_model().unwrap_or(&"".into()));
@@ -54,6 +56,8 @@ fn main() {
     let imu_data = util::normalized_imu(&input, opts.imuo).unwrap();
 
     let mut csv = String::with_capacity(2*1024*1024);
+    csv.push_str(r#""Product","Blackbox flight data recorder by Nicholas Sherlock""#);
+    csv.push('\n');
     crate::try_block!({
         let map = samples[0].tag_map.as_ref()?;
         let json = (map.get(&GroupId::Default)?.get_t(TagId::Metadata) as Option<&serde_json::Value>)?;

bin/gyro2bb/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "telemetry-parser-py"
-version = "0.1.4"
+version = "0.1.5"
 authors = ["Adrian <[email protected]>"]
 edition = "2018"
 

bin/gyro2bb/gyro2bb.rs

@@ -1,5 +1,4 @@
 # telemetry-parser-py
-`telemetry-parser` python module
 Library to parse real-time metadata embedded in video files or telemetry from other sources.
 
 Work in progress, the code is already working but I plan to add much more input and output formats.
@@ -8,8 +7,8 @@ Work in progress, the code is already working but I plan to add much more input
 - [x] Sony (RX0 II, a7s III, RX100 VII, ZV1, a7c, a7r IV, a6600, a9 II, a1, FX3, ZV-E10, FX6)
 - [x] GoPro (All models with gyro metadata, starting with HERO 5)
 - [x] Insta360 (OneR, SMO 4k, GO2)
-- [ ] TODO Betaflight blackbox (CSV and Binary)
-- [ ] TODO Runcam CSV
+- [x] Betaflight blackbox (CSV and Binary)
+- [x] Runcam CSV (Runcam 5 Orange, iFlight GOCam GR)
 - [ ] TODO DJI flight logs (*.dat, *.txt)
 
 # Example usage:

bin/python-module/Cargo.toml

@@ -20,7 +20,9 @@ impl Parser {
         let mut stream = std::fs::File::open(&path)?;
         let filesize = stream.metadata()?.len() as usize;
 
-        let input = Input::from_stream(&mut stream, filesize)?;
+        let filename = std::path::Path::new(&path).file_name().unwrap_or_default().to_str().unwrap_or_default();
+
+        let input = Input::from_stream(&mut stream, filesize, filename)?;
 
         Ok(Self {
             camera: Some(input.camera_type()),
@@ -42,7 +44,7 @@ impl Parser {
             let groups_map = info.tag_map.as_ref().unwrap();
 
             for (group, map) in groups_map {
-                let group_map = groups.entry(group).or_insert(BTreeMap::new());
+                let group_map = groups.entry(group).or_insert_with(BTreeMap::new);
                 for (tagid, info) in map {
                     let value = if human_readable.unwrap_or(false) {
                         serde_json::to_value(info.value.to_string())

bin/python-module/README.md

@@ -0,0 +1,72 @@
+use std::rc::*;
+use std::io::*;
+
+use crate::tags_impl::*;
+use crate::*;
+use memchr::memmem;
+use fc_blackbox::BlackboxRecord;
+
+pub fn parse<T: Read + Seek>(stream: &mut T, _size: usize) -> Result<Vec<SampleInfo>> {
+    let mut samples = Vec::new();
+    let mut bytes = Vec::new();
+    stream.read_to_end(&mut bytes)?;
+
+    for index in memmem::find_iter(&bytes, b"H Product:Blackbox") {
+        if let Some(end) = memmem::find(&bytes[index..], b"End of log\0") {
+            let log = &bytes[index..index+end+11];
+
+            let mut bbox = fc_blackbox::BlackboxReader::from_bytes(log).unwrap();
+            
+            // Remove acc_1G from `other_headers` because we will have it in Accelerometer/Scale tag, instead of in metadata
+            let accl_scale = bbox.header.other_headers.remove("acc_1G").unwrap_or("1.0".to_owned()).parse::<f64>().unwrap();
+            let gyro_scale = bbox.header.org_gyro_scale as f64;
+
+            let mut map = GroupedTagMap::new();
+
+            util::insert_tag(&mut map, tag!(parsed GroupId::Default, TagId::Metadata, "Extra metadata", Json, |v| format!("{:?}", v), {
+                serde_json::to_value(&bbox.header.other_headers).map_err(|_| Error::new(ErrorKind::Other, "Serialize error"))?
+            }, vec![]));
+            util::insert_tag(&mut map, tag!(parsed GroupId::Gyroscope,     TagId::Scale, "Gyroscope scale",     f64, |v| format!("{:?}", v), gyro_scale, vec![]));
+            util::insert_tag(&mut map, tag!(parsed GroupId::Accelerometer, TagId::Scale, "Accelerometer scale", f64, |v| format!("{:?}", v), accl_scale, vec![]));
+
+            let headers = bbox.header.ip_fields_in_order.iter().map(|x| x.name.as_str()).collect::<Vec<&str>>();
+            let mut column_struct = super::BlackBox::prepare_vectors_from_headers(&headers);
+            
+            while let Some(record) = bbox.next() {
+                match record {
+                    BlackboxRecord::Main(values) => {
+                        let time = values[1] as f64 / 1_000_000.0;
+                        for (col, &value) in column_struct.columns.iter().zip(values) {
+                            let mut desc = col.desc.as_ref().borrow_mut();
+                            super::BlackBox::insert_value_to_vec(&mut desc, time, value as f64, col.index);
+                        }
+                    }
+                    BlackboxRecord::GNSS(_values) => {
+                        // time,GPS_numSat,GPS_coord[0],GPS_coord[1],GPS_altitude,GPS_speed,GPS_ground_course
+                        // TODO
+                    }
+                    BlackboxRecord::Slow(_values) => {
+                        // TODO
+                    }
+                    BlackboxRecord::Event(_event) => {
+                        // TODO
+                    }
+                    BlackboxRecord::Garbage(_length) => {
+                        // TODO
+                    }
+                }
+            }
+            drop(column_struct.columns); // Release all weak pointers
+
+            // Add filled vectors to the tag map
+            for desc in column_struct.descriptions.drain(..) {
+                let desc = Rc::try_unwrap(desc).unwrap().into_inner();
+                util::insert_tag(&mut map, desc);
+            }
+
+            samples.push(SampleInfo { index: 0, timestamp_ms: 0.0, duration_ms: 0.0, tag_map: Some(map) });
+        }
+    }
+
+    Ok(samples)
+}