flightdata 0.2.24__tar.gz → 0.2.26__tar.gz

{flightdata-0.2.24 → flightdata-0.2.26}/PKG-INFO

@@ -1,12 +1,15 @@
-Metadata-Version: 2.3
+Metadata-Version: 2.4
 Name: flightdata
-Version: 0.2.24
+Version: 0.2.26
 Summary: Python tools for handling flight data
 Author-email: Thomas David <thomasdavid0@gmail.com>
+License-File: LICENSE
 Requires-Python: >=3.12
 Requires-Dist: numpy>=2.1.3
 Requires-Dist: pandas>=2.2.3
 Requires-Dist: pfc-geometry>=0.2.13
+Provides-Extra: dataflash
+Requires-Dist: ardupilot-log-reader>=0.3.5; extra == 'dataflash'
 Description-Content-Type: text/markdown
 
 ## FlightData
@@ -28,11 +31,14 @@ Further documentation will be provided here: https://pfcdocumentation.readthedoc
 ### Installation
 
 ```bash
-pip install pfc-geometry
+    pip install flightdata
+    # or to include ardupilot dataflash log parsing capability:
+    pip install flightdata[dataflash]
 ```
 
 ### Setup from source
 
 ```bash
-pip install .
-```
+    pip install .
+```
+

{flightdata-0.2.24 → flightdata-0.2.26}/README.md

@@ -17,11 +17,14 @@ Further documentation will be provided here: https://pfcdocumentation.readthedoc
 ### Installation
 
 ```bash
-pip install pfc-geometry
+    pip install flightdata
+    # or to include ardupilot dataflash log parsing capability:
+    pip install flightdata[dataflash]
 ```
 
 ### Setup from source
 
 ```bash
-pip install .
-```
+    pip install .
+```
+

{flightdata-0.2.24 → flightdata-0.2.26}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "flightdata"
-version = "v0.2.24"
+version = "0.2.26"
 description = "Python tools for handling flight data"
 readme = "README.md"
 authors = [{ name = "Thomas David", email = "thomasdavid0@gmail.com" }]
@@ -15,9 +15,9 @@ dependencies = [
 requires = ["hatchling"]
 build-backend = "hatchling.build"
 
-[tool.uv.sources]
-pfc-geometry = { path = "../geometry" , editable = true }
-ardupilot_log_reader = { path = "../ArdupilotLogReader" , editable = true  }
+
+[project.optional-dependencies]
+dataflash = ["ardupilot_log_reader>=0.3.5"]
 
 [dependency-groups]
-dev = ["ardupilot_log_reader>=0.3.5", "pymavlink>=2.4.42", "pytest>=8.3.3"]
+dev = ["pytest>=8.3.3"]

{flightdata-0.2.24 → flightdata-0.2.26}/src/flightdata/scripts/flightline.py

@@ -1,8 +1,10 @@
+from ast import In
+import sys
 from flightdata import Flight, Origin
 from geometry import GPS
 from pathlib import Path
 import argparse
-
+import re
 
 
 def get_con_groups(log: Flight, channel: int):
@@ -14,64 +16,78 @@ def box_from_log(log: Flight, channel: int):
     grps = get_con_groups(log, channel)
     pilot = grps[0]
     centre = grps[1]
-#    c6on = Flight(log.data.loc[log.data[f'rcin_c{channel}']>=1500])
-#    groups = (c6on.time_flight.diff() > 1).cumsum()
-#    pilot = Flight(c6on.data.loc[groups==0])
-#    centre = Flight(c6on.data.loc[groups==1])
 
     return Origin.from_points("new", GPS(pilot.pos)[-1], GPS(centre.pos)[-1])
 
 def box_from_logs(pilot: Flight, centre: Flight):
     return Origin.from_points("new", GPS(*pilot.pos.iloc[-1]), GPS(*centre.pos.iloc[-1]))
 
+re_logid = re.compile(r'[\d+]$')
+def get_bin_from_number(folder: Path, number: str):
+    try:
+        return list(folder.glob(f"*{number}.BIN"))[0]
+    except IndexError:
+        return list(folder.glob(f"*{number}.bin"))[0]
 
-def main():
-    parser = argparse.ArgumentParser(description='A tool for creating a flightline .f3a file from bin logs')
 
-    parser.add_argument('-l', '--logdir', default='', help='folder to look for logs in')
-    parser.add_argument('-p', '--pilot', default=None, help='flight log bin file to use, None for first')
-    parser.add_argument('-c', '--centre', default=None, help='centre position bin file to use if input==None')
-    parser.add_argument('-d', '--direction', default=None, help='heading of the box, if this is specified only pilot will be read')
-    parser.add_argument('-i', '--input', default=6, help='channel used to indicate pilot or centre postions (pwm>=1500), None for two files')
 
-    args = parser.parse_args()
+def create_flightline(args) -> argparse.Namespace:
+    logdir = Path(args.logdir)
 
-    print(args)
+    plog = logdir / args.pilot
+    if not plog.exists():
+        if args.pilot is None:
+            plog=sorted(list(logdir.glob("*.BIN")))[0]
+        elif args.pilot.isdigit():
+            plog = get_bin_from_number(logdir, args.pilot)
+        else:
+            raise FileNotFoundError(f'Could not find pilot log file: {args.pilot}')
     
-    logs = sorted(list(Path(args.logdir).glob("*.BIN")))
-    logids = [int(log.stem) for log in logs]
-
-    if args.pilot in logs:
-        plog = args.pilot
-    elif args.pilot is None:
-        plog=logs[0]
-    elif args.pilot.isdigit():
-        plog = logs[logids.index(int(args.pilot))]
-
     pilot = Flight.from_log(plog)
 
     print(f'Pilot position log: {plog}')
 
-    if args.centre in logs:
-        clog = args.centre
-    elif args.centre is None:
-        clog=None
-    elif args.centre.isdigit():
-        clog = logs[logids.index(int(args.centre))]
-    if clog:
-        centre = Flight.from_log(clog)
-    print(f'Centre position log: {clog}')
-
     if args.centre:
+        clog = logdir / args.centre
+        if not clog.exists():
+            if args.centre is None:
+                clog=None
+            elif args.centre.isdigit():
+                clog = get_bin_from_number(logdir, args.centre)
+        
+        print(f'Centre position log: {clog}' if clog else "No centre position log")
+        centre = Flight.from_log(clog) if clog else None
+        
         box = Origin.from_points("new", GPS(*pilot.pos.iloc[-1]), GPS(*centre.pos.iloc[-1]))
     else:
-        groups = get_con_groups(pilot, args.input)
         if args.direction:
-            box = Origin("new", GPS(groups[0].pos)[-1], float(args.direction))
+            box = Origin("new", GPS(plog.pos)[-1], float(args.direction))
         else:
+            groups = get_con_groups(pilot, args.input)
             box = Origin.from_points("new", GPS(groups[0].pos)[-1], GPS(groups[1].pos)[-1])
             
-    box.to_f3a_zone(Path(args.logdir) / f'box_{plog.stem}.f3a')
+    return box, plog.stem
+
+
+def parse_args(args):
+    parser = argparse.ArgumentParser(description='A tool for creating a flightline .f3a file from bin logs')
+
+    parser.add_argument('-l', '--logdir', default='', help='folder to look for logs in')
+    parser.add_argument('-p', '--pilot', default=None, help='flight log bin file to use, None for first')
+    parser.add_argument('-c', '--centre', default=None, help='centre position bin file to use if input==None')
+    parser.add_argument('-d', '--direction', default=None, help='heading of the box, if this is specified only pilot will be read')
+    parser.add_argument('-i', '--input', default=6, help='channel used to indicate pilot or centre postions (pwm>=1500), None for two files')
+
+    args = parser.parse_args(args)
+
+    return args
+
+
+def main():
+    args = parse_args(sys.argv[1:])
+    box, name = create_flightline(args)
+    box.to_f3a_zone(Path(args.logdir) / f'box_{name}.f3a')
+    
 
 if __name__ == '__main__':
     main()

flightdata-0.2.26/test/test_scripts.py

@@ -0,0 +1,25 @@
+from flightdata.scripts import flightline as fl
+import geometry as g
+from pathlib import Path
+import numpy as np
+from pytest import approx
+
+def test_get_bin_from_number():
+    bin = fl.get_bin_from_number(Path("test/data/script_tests"), 1)
+    assert bin.stem == "c6_on_0001"
+
+    bin = fl.get_bin_from_number(Path("test/data/script_tests"), 3)
+    assert bin.stem == "center_0003"
+
+
+
+def test_flightline_two_bins():
+    box, name  = fl.create_flightline(fl.parse_args(["-l", "test/data/script_tests", "-p", "pilot_0004.BIN", "-c", "3"]))
+    assert name == "pilot_0004"
+    assert isinstance(box.pos, g.GPS)
+
+def test_flightline_c6on():
+    box, name  = fl.create_flightline(fl.parse_args(["-l", "test/data/script_tests", "-p", "1"]))
+    assert name == "c6_on_0001"
+
+    assert np.degrees(box.heading) == approx(-34.44699010)

{flightdata-0.2.24 → flightdata-0.2.26}/uv.lock

@@ -4,24 +4,17 @@ requires-python = ">=3.12"
 [[package]]
 name = "ardupilot-log-reader"
 version = "0.3.5"
-source = { editable = "../ArdupilotLogReader" }
+source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "numpy" },
     { name = "pandas" },
     { name = "pymavlink" },
 ]
-
-[package.metadata]
-requires-dist = [
-    { name = "numpy", specifier = ">=2.1.3" },
-    { name = "pandas", specifier = ">=2.2.3" },
-    { name = "pymavlink", specifier = ">=2.4.42" },
+sdist = { url = "https://files.pythonhosted.org/packages/d4/81/f2f4b0d24cfee5b9bda0aa454cb6aaacc92f5cba2afc281be6fc9c466b4c/ardupilot_log_reader-0.3.5.tar.gz", hash = "sha256:8523a963e3c89254b6c7a72b5adedfe152ed1aec256e9fc2c1bbd7dd5c3033a9", size = 76674282 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/00/1f/1f49ca2e43e1e9abce1ff42d22409ccff3321c9dd4cd378d335b945966c3/ardupilot_log_reader-0.3.5-py3-none-any.whl", hash = "sha256:8f4aaae17a81fd6296ff883bc1d924b16ab4aa3783cc68131c10c222f6a87d91", size = 3756 },
 ]
 
-[package.metadata.requires-dev]
-dev = [{ name = "pytest", specifier = ">=8.3.3" }]
-lint = [{ name = "ruff", specifier = ">=0.7.3" }]
-
 [[package]]
 name = "colorama"
 version = "0.4.6"
@@ -33,7 +26,7 @@ wheels = [
 
 [[package]]
 name = "flightdata"
-version = "0.2.24"
+version = "0.2.25"
 source = { editable = "." }
 dependencies = [
     { name = "numpy" },
@@ -41,26 +34,26 @@ dependencies = [
     { name = "pfc-geometry" },
 ]
 
+[package.optional-dependencies]
+dataflash = [
+    { name = "ardupilot-log-reader" },
+]
+
 [package.dev-dependencies]
 dev = [
-    { name = "ardupilot-log-reader" },
-    { name = "pymavlink" },
     { name = "pytest" },
 ]
 
 [package.metadata]
 requires-dist = [
+    { name = "ardupilot-log-reader", marker = "extra == 'dataflash'", specifier = ">=0.3.5" },
     { name = "numpy", specifier = ">=2.1.3" },
     { name = "pandas", specifier = ">=2.2.3" },
-    { name = "pfc-geometry", editable = "../geometry" },
+    { name = "pfc-geometry", specifier = ">=0.2.13" },
 ]
 
 [package.metadata.requires-dev]
-dev = [
-    { name = "ardupilot-log-reader", editable = "../ArdupilotLogReader" },
-    { name = "pymavlink", specifier = ">=2.4.42" },
-    { name = "pytest", specifier = ">=8.3.3" },
-]
+dev = [{ name = "pytest", specifier = ">=8.3.3" }]
 
 [[package]]
 name = "future"
@@ -206,22 +199,14 @@ wheels = [
 [[package]]
 name = "pfc-geometry"
 version = "0.2.13"
-source = { editable = "../geometry" }
+source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "numpy" },
     { name = "pandas" },
 ]
-
-[package.metadata]
-requires-dist = [
-    { name = "numpy", specifier = ">=2.1.3" },
-    { name = "pandas", specifier = ">=2.2.3" },
-]
-
-[package.metadata.requires-dev]
-dev = [
-    { name = "numpy-quaternion", specifier = ">=2023.0.3" },
-    { name = "pytest", specifier = ">=8.3.3" },
+sdist = { url = "https://files.pythonhosted.org/packages/32/fb/496a3e54f846b296d3e52a7b7249e21469ac00209688687378c1ce55e35b/pfc_geometry-0.2.13.tar.gz", hash = "sha256:86fa4966d5e95f28dde75c7f39594ca14e4f3146d53bd9a8ccfbc0db3f5e424d", size = 28602 }
+wheels = [
+    { url = "https://files.pythonhosted.org/packages/fe/2b/38166979e43c98b7b72c7c16d86e6994087a0e924a8f11f772aa2d1f09e6/pfc_geometry-0.2.13-py3-none-any.whl", hash = "sha256:29747fa647b4d72b67bf5d0a90fb0eac2bc973013da329518df1a554a293c2ea", size = 19823 },
 ]
 
 [[package]]