FIx improts and name

zauberzeug · Sep 25, 2024 · 1a1daa2 · 1a1daa2
1 parent 7823f10
commit 1a1daa2
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 9 deletions.
diff --git a/field_friend/automations/navigation/__init__.py b/field_friend/automations/navigation/__init__.py
@@ -1,4 +1,5 @@
 
+from .a_b_field_navigation import ABFieldNavigatoin
 from .a_b_line_navigation import ABLineNavigation
 from .coverage_navigation import CoverageNavigation
 from .follow_crops_navigation import FollowCropsNavigation
@@ -14,4 +15,5 @@
     'FollowCropsNavigation',
     'CoverageNavigation',
     'ABLineNavigation',
+    'ABFieldNavigatoin',
 ]
diff --git a/field_friend/automations/navigation/a_b_field_navigation.py b/field_friend/automations/navigation/a_b_field_navigation.py
@@ -24,7 +24,7 @@ class State(Enum):
     def __init__(self, system: 'System', tool: Implement) -> None:
         super().__init__(system, tool)
 
-        self.name = 'A B field navigation'
+        self.name = 'Field Navigation'
         self.gnss = system.gnss
         self.bms = system.field_friend.bms
         self.automation_watcher = system.automation_watcher

diff --git a/field_friend/system.py b/field_friend/system.py
@@ -8,12 +8,39 @@
 import rosys
 
 from . import localization
-from .automations import (AutomationWatcher, BatteryWatcher, FieldProvider, KpiProvider, PathProvider, PlantLocator,
-                          PlantProvider, Puncher)
-from .automations.implements import ChopAndScrew, ExternalMower, Implement, Recorder, Tornado, WeedingScrew
-from .automations.navigation import (ABLineNavigation, CoverageNavigation, FollowCropsNavigation, Navigation,
-                                     RowsOnFieldNavigation, StraightLineNavigation)
-from .hardware import FieldFriend, FieldFriendHardware, FieldFriendSimulation, TeltonikaRouter
+from .automations import (
+    AutomationWatcher,
+    BatteryWatcher,
+    FieldProvider,
+    KpiProvider,
+    PathProvider,
+    PlantLocator,
+    PlantProvider,
+    Puncher,
+)
+from .automations.implements import (
+    ChopAndScrew,
+    ExternalMower,
+    Implement,
+    Recorder,
+    Tornado,
+    WeedingScrew,
+)
+from .automations.navigation import (
+    ABFieldNavigatoin,
+    ABLineNavigation,
+    CoverageNavigation,
+    FollowCropsNavigation,
+    Navigation,
+    RowsOnFieldNavigation,
+    StraightLineNavigation,
+)
+from .hardware import (
+    FieldFriend,
+    FieldFriendHardware,
+    FieldFriendSimulation,
+    TeltonikaRouter,
+)
 from .interface.components.info import Info
 from .kpi_generator import generate_kpis
 from .localization.geo_point import GeoPoint
@@ -124,19 +151,23 @@ def watch_robot() -> None:
         self.automation_watcher = AutomationWatcher(self)
         self.monitoring = Recorder(self)
         self.timelapse_recorder = rosys.analysis.TimelapseRecorder()
-        self.timelapse_recorder.frame_info_builder = lambda _: f'{self.version}, {self.current_navigation.name}, tags: {", ".join(self.plant_locator.tags)}'
+        self.timelapse_recorder.frame_info_builder = lambda _: f'{self.version}, {
+            self.current_navigation.name}, tags: {", ".join(self.plant_locator.tags)}'
         rosys.NEW_NOTIFICATION.register(self.timelapse_recorder.notify)
         rosys.on_startup(self.timelapse_recorder.compress_video)  # NOTE: cleanup JPEGs from before last shutdown
         self.field_navigation = RowsOnFieldNavigation(self, self.monitoring)
         self.straight_line_navigation = StraightLineNavigation(self, self.monitoring)
         self.follow_crops_navigation = FollowCropsNavigation(self, self.monitoring)
         self.coverage_navigation = CoverageNavigation(self, self.monitoring)
         self.a_b_line_navigation = ABLineNavigation(self, self.monitoring)
+        self.field_navigation = ABFieldNavigatoin(self, self.monitoring)
+
         self.navigation_strategies = {n.name: n for n in [self.field_navigation,
                                                           self.straight_line_navigation,
                                                           self.follow_crops_navigation,
                                                           self.coverage_navigation,
-                                                          self.a_b_line_navigation
+                                                          self.a_b_line_navigation,
+                                                          self.field_navigation
                                                           ]}
         implements: list[Implement] = [self.monitoring]
         match self.field_friend.implement_name: