flightdata 0.2.19__tar.gz → 0.2.21__tar.gz

{flightdata-0.2.19/flightdata.egg-info → flightdata-0.2.21}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flightdata
-Version: 0.2.19
+Version: 0.2.21
 Summary: Module for handling UAV flight log data
 Author-email: Thomas David <thomasdavid0@gmail.com>
 License: GNU GPL v3
@@ -11,13 +11,13 @@ License-File: LICENSE
 Requires-Dist: numpy
 Requires-Dist: pandas
 Requires-Dist: simplejson
-Requires-Dist: pfc-geometry>=0.2.11
+Requires-Dist: pfc-geometry>=0.2.12
 Requires-Dist: json_stream
 Provides-Extra: dev
 Requires-Dist: numpy; extra == "dev"
 Requires-Dist: pandas; extra == "dev"
 Requires-Dist: simplejson; extra == "dev"
-Requires-Dist: pfc-geometry>=0.2.11; extra == "dev"
+Requires-Dist: pfc-geometry>=0.2.12; extra == "dev"
 Requires-Dist: ardupilot-log-reader>=0.3.3; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 

{flightdata-0.2.19 → flightdata-0.2.21}/flightdata/bindata.py

@@ -2,10 +2,10 @@ from __future__ import annotations
 from dataclasses import dataclass
 import numpy as np
 import pandas as pd
-from datetime import datetime
 import logging
 
-logger = logging.getLogger(__name__)    
+logger = logging.getLogger(__name__)
+
 
 @dataclass
 class BinData:
@@ -36,11 +36,10 @@ class BinData:
     @staticmethod
     def parse_json(bindata: dict[str, dict[str, list]]) -> BinData:
         # dfs = {k: pd.DataFrame(v) for k,v in bindata.items()}
-        
+
         dfs: dict[str, pd.DataFrame] = {}
         groups = {}
         for k, v in bindata.items():
-
             if k == "PARM":
                 new_df = pd.DataFrame(
                     [
@@ -50,17 +49,23 @@ class BinData:
                     ],
                     index=["time_boot_s", "Name", "Value"],
                 ).T
-                if 'Default' in v:
+                if "Default" in v:
                     new_df["Default"] = v["Default"]
-
-
+            elif k == "MSG":
+                new_df = pd.DataFrame(
+                    [
+                        pd.Series(v["time_boot_s"]).reset_index(drop=True),
+                        pd.Series(v["Message"]),
+                    ],
+                    index=["time_boot_s", "Message"],
+                ).T
             else:
                 try:
-                    new_df = pd.DataFrame(v)    
+                    new_df = pd.DataFrame(v)
                 except Exception as ex:
                     logger.info(f"Error parsing {k}: {ex}")
                     new_df = None
-            
+
             if new_df is not None:
                 if "[" not in k:
                     dfs[k] = new_df
@@ -69,7 +74,7 @@ class BinData:
                     if nk not in groups:
                         groups[nk] = []
                     groups[nk].append(new_df)
-            
+
         for k, v in groups.items():
             dfs[k] = pd.concat(v).sort_values("time_boot_s")
 
@@ -77,10 +82,12 @@ class BinData:
             start_time = (
                 BinData._gpsTimeToTime(dfs["GPS"].GWk.iloc[0], dfs["GPS"].GMS.iloc[0])
                 - dfs["GPS"].time_boot_s.iloc[0]
-            ) 
+            )
+        else:
+            start_time = 0
 
         def process_df(df: pd.DataFrame) -> pd.DataFrame:
-            df.insert(0, "TimeUS", np.floor(df.time_boot_s * 1e6)) # ms
+            df.insert(0, "TimeUS", np.floor(df.time_boot_s * 1e6))  # ms
             df.insert(0, "timestamp", start_time + df.time_boot_s)
 
             return df.drop(columns="time_boot_s")

{flightdata-0.2.19 → flightdata-0.2.21/flightdata.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: flightdata
-Version: 0.2.19
+Version: 0.2.21
 Summary: Module for handling UAV flight log data
 Author-email: Thomas David <thomasdavid0@gmail.com>
 License: GNU GPL v3
@@ -11,13 +11,13 @@ License-File: LICENSE
 Requires-Dist: numpy
 Requires-Dist: pandas
 Requires-Dist: simplejson
-Requires-Dist: pfc-geometry>=0.2.11
+Requires-Dist: pfc-geometry>=0.2.12
 Requires-Dist: json_stream
 Provides-Extra: dev
 Requires-Dist: numpy; extra == "dev"
 Requires-Dist: pandas; extra == "dev"
 Requires-Dist: simplejson; extra == "dev"
-Requires-Dist: pfc-geometry>=0.2.11; extra == "dev"
+Requires-Dist: pfc-geometry>=0.2.12; extra == "dev"
 Requires-Dist: ardupilot-log-reader>=0.3.3; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 

{flightdata-0.2.19 → flightdata-0.2.21}/flightdata.egg-info/requires.txt

@@ -1,13 +1,13 @@
 numpy
 pandas
 simplejson
-pfc-geometry>=0.2.11
+pfc-geometry>=0.2.12
 json_stream
 
 [dev]
 numpy
 pandas
 simplejson
-pfc-geometry>=0.2.11
+pfc-geometry>=0.2.12
 ardupilot-log-reader>=0.3.3
 pytest

{flightdata-0.2.19 → flightdata-0.2.21}/requirements-dev.txt

@@ -1,6 +1,6 @@
 numpy
 pandas
 simplejson
-pfc-geometry>=0.2.11
+pfc-geometry>=0.2.12
 ardupilot-log-reader>=0.3.3
 pytest

{flightdata-0.2.19 → flightdata-0.2.21}/requirements.txt

@@ -1,5 +1,5 @@
 numpy
 pandas
 simplejson
-pfc-geometry>=0.2.11
+pfc-geometry>=0.2.12
 json_stream