[stn] added more parameters to upload

Author: MrClock8163

src/instrumentman/station/__init__.py

@@ -6,6 +6,11 @@
     option,
     file_path
 )
+from cloup.constraints import (
+    constraint,
+    mutually_exclusive,
+    all_or_none
+)
 
 from ..utils import (
     com_port_argument,
@@ -60,23 +65,43 @@ def cli_calc(**kwargs: Any) -> None:
 @com_port_argument()
 @com_option_group()
 @option(
+    "-c",
     "--coordinates",
     help="station coordinates",
     type=(float, float, float),
-    default=(0, 0, 0)
+    is_flag=False,
+    flag_value=(0, 0, 0)
 )
 @option(
+    "-i",
     "--instrumentheight",
     "--iheight",
     help="instrument height",
     type=float,
-    default=0
+    is_flag=False,
+    flag_value=0
 )
 @option(
+    "-o",
     "--orientation",
     help="instrument orientation correction",
+    type=Angle()
+)
+@option(
+    "-a",
+    "--azimuth",
+    help="current azimuth",
     type=Angle(),
-    default="0-00-00"
+    is_flag=False,
+    flag_value="0-00-00"
+)
+@constraint(
+    mutually_exclusive,
+    ["orientation", "azimuth"]
+)
+@constraint(
+    all_or_none,
+    ["coordinates", "instrumentheight"]
 )
 def cli_upload(**kwargs: Any) -> None:
     """Upload station setup to instrument."""

src/instrumentman/station/upload.py

@@ -12,12 +12,11 @@ def main(
     timeout: int = 15,
     retry: int = 1,
     sync_after_timeout: bool = False,
-    coordinates: tuple[float, float, float] = (0, 0, 0),
-    instrumentheight: float = 0,
-    orientation: str = "0-00-00"
+    coordinates: tuple[float, float, float] | None = None,
+    instrumentheight: float | None = None,
+    orientation: str | None = None,
+    azimuth: str | None = None
 ) -> None:
-    station = Coordinate(*coordinates)
-    ori = Angle.from_dms(orientation)
     with open_serial(
         port=port,
         speed=baud,
@@ -26,21 +25,35 @@ def main(
         sync_after_timeout=sync_after_timeout
     ) as com:
         tps = GeoCom(com)
-        resp_stn = tps.tmc.set_station(station, instrumentheight)
-        if resp_stn.error != GeoComCode.OK:
-            echo_red("Cannot set station")
-            exit(1)
+        if coordinates is not None and instrumentheight is not None:
+            resp_stn = tps.tmc.set_station(
+                Coordinate(*coordinates),
+                instrumentheight
+            )
+            if resp_stn.error != GeoComCode.OK:
+                echo_red("Cannot set station")
+                exit(1)
+            else:
+                echo_green("Station set")
 
-        resp_angle = tps.tmc.get_angle()
-        if resp_angle.error != GeoComCode.OK or resp_angle.params is None:
-            echo_red("Cannot set orientation")
-            exit(1)
+        if azimuth is not None:
+            hz = Angle.from_dms(azimuth)
+        elif orientation is not None:
+            resp_angle = tps.tmc.get_angle()
+            if resp_angle.error != GeoComCode.OK or resp_angle.params is None:
+                echo_red("Could not set orientation")
+                exit(1)
+
+            hz = (
+                resp_angle.params[0]
+                + Angle.from_dms(orientation)
+            ).normalized()
+        else:
+            exit()
 
-        resp_ori = tps.tmc.set_azimuth(
-            (resp_angle.params[0] + ori).normalized()
-        )
+        resp_ori = tps.tmc.set_azimuth(hz)
         if resp_ori.error != GeoComCode.OK:
-            echo_red("Cannot set orientation")
+            echo_red("Could not set orientation/azimuth")
             exit(1)
 
-        echo_green("Station and orientation set")
+        echo_green("Orientation/azimuth set")