Merge remote-tracking branch 'origin/indi_mount_control' into indi_mount_control

Author: jscheidtmann

install-indi-pifinder.sh

@@ -63,9 +63,46 @@ else
     git clone --branch v2.1.6 --depth 1 https://github.com/indilib/indi.git
 fi
 
+# Build with-out camera drivers to save time and resources. 
 mkdir -p ./indi/build
 cd ./indi/build
-cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr ..
+cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=/usr \
+      -DWITH_WEBCAM=OFF \
+      -DWITH_SX=OFF \
+      -DWITH_MI=OFF \
+      -DWITH_FLI=OFF \
+      -DWITH_SBIG=OFF \
+      -DWITH_INOVAPLX=OFF \
+      -DWITH_APOGEE=OFF \
+      -DWITH_FFMV=OFF \
+      -DWITH_QHY=OFF \
+      -DWITH_GPHOTO=OFF \
+      -DWITH_QSI=OFF \
+      -DWITH_FISHCAMP=OFF \
+      -DWITH_DSI=OFF \
+      -DWITH_ASICAM=OFF \
+      -DWITH_GIGE=OFF \
+      -DWITH_NIGHTSCAPE=OFF \
+      -DWITH_ATIK=OFF \
+      -DWITH_TOUPCAM=OFF \
+      -DWITH_ALTAIRCAM=OFF \
+      -DWITH_BRESSERCAM=OFF \
+      -DWITH_MALLINCAM=OFF \
+      -DWITH_MEADECAM=OFF \
+      -DWITH_NNCAM=OFF \
+      -DWITH_OGMACAM=OFF \
+      -DWITH_OPENOGMA=OFF \
+      -DWITH_OMEGONPROCAM=OFF \
+      -DWITH_STARSHOOTG=OFF \
+      -DWITH_TSCAM=OFF \
+      -DWITH_SVBONYCAM=OFF \
+      -DWITH_PENTAX=OFF \
+      -DWITH_ORION_SSG3=OFF \
+      -DWITH_SVBONY=OFF \
+      -DWITH_PLAYERONE=OFF \
+      -DWITH_MGEN=OFF \
+      -DWITH_ASTROASIS=OFF \
+      ..
 make -j2
 sudo make install
 
@@ -86,10 +123,45 @@ else
 fi
 
 
-# Build libs
+# Build libs, with-out camera drivers, to save time and resources.
 mkdir -p ./indi-3rdparty/build-libs
 cd ./indi-3rdparty/build-libs
-cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Debug -DBUILD_LIBS=1 ..
+cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Debug -DBUILD_LIBS=1 \
+      -DWITH_WEBCAM=OFF \
+      -DWITH_SX=OFF \
+      -DWITH_MI=OFF \
+      -DWITH_FLI=OFF \
+      -DWITH_SBIG=OFF \
+      -DWITH_INOVAPLX=OFF \
+      -DWITH_APOGEE=OFF \
+      -DWITH_FFMV=OFF \
+      -DWITH_QHY=OFF \
+      -DWITH_GPHOTO=OFF \
+      -DWITH_QSI=OFF \
+      -DWITH_FISHCAMP=OFF \
+      -DWITH_DSI=OFF \
+      -DWITH_ASICAM=OFF \
+      -DWITH_GIGE=OFF \
+      -DWITH_NIGHTSCAPE=OFF \
+      -DWITH_ATIK=OFF \
+      -DWITH_TOUPCAM=OFF \
+      -DWITH_ALTAIRCAM=OFF \
+      -DWITH_BRESSERCAM=OFF \
+      -DWITH_MALLINCAM=OFF \
+      -DWITH_MEADECAM=OFF \
+      -DWITH_NNCAM=OFF \
+      -DWITH_OGMACAM=OFF \
+      -DWITH_OPENOGMA=OFF \
+      -DWITH_OMEGONPROCAM=OFF \
+      -DWITH_STARSHOOTG=OFF \
+      -DWITH_TSCAM=OFF \
+      -DWITH_SVBONYCAM=OFF \
+      -DWITH_PENTAX=OFF \
+      -DWITH_ORION_SSG3=OFF \
+      -DWITH_SVBONY=OFF \
+      -DWITH_PLAYERONE=OFF \
+      -DWITH_MGEN=OFF \
+      -DWITH_ASTROASIS=OFF \
 make -j2
 sudo make install
 
@@ -102,7 +174,43 @@ cd ./indi-3rdparty/build-drivers
 export LDFLAGS="-ludev"
 export CXXFLAGS="-DUSE_UDEV"
 
-cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Debug -DCMAKE_SHARED_LINKER_FLAGS="-ludev" ..
+cmake -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_BUILD_TYPE=Debug -DCMAKE_SHARED_LINKER_FLAGS="-ludev" \
+      -DWITH_WEBCAM=OFF \
+      -DWITH_SX=OFF \
+      -DWITH_MI=OFF \
+      -DWITH_FLI=OFF \
+      -DWITH_SBIG=OFF \
+      -DWITH_INOVAPLX=OFF \
+      -DWITH_APOGEE=OFF \
+      -DWITH_FFMV=OFF \
+      -DWITH_QHY=OFF \
+      -DWITH_GPHOTO=OFF \
+      -DWITH_QSI=OFF \
+      -DWITH_FISHCAMP=OFF \
+      -DWITH_DSI=OFF \
+      -DWITH_ASICAM=OFF \
+      -DWITH_GIGE=OFF \
+      -DWITH_NIGHTSCAPE=OFF \
+      -DWITH_ATIK=OFF \
+      -DWITH_TOUPCAM=OFF \
+      -DWITH_ALTAIRCAM=OFF \
+      -DWITH_BRESSERCAM=OFF \
+      -DWITH_MALLINCAM=OFF \
+      -DWITH_MEADECAM=OFF \
+      -DWITH_NNCAM=OFF \
+      -DWITH_OGMACAM=OFF \
+      -DWITH_OPENOGMA=OFF \
+      -DWITH_OMEGONPROCAM=OFF \
+      -DWITH_STARSHOOTG=OFF \
+      -DWITH_TSCAM=OFF \
+      -DWITH_SVBONYCAM=OFF \
+      -DWITH_PENTAX=OFF \
+      -DWITH_ORION_SSG3=OFF \
+      -DWITH_SVBONY=OFF \
+      -DWITH_PLAYERONE=OFF \
+      -DWITH_MGEN=OFF \
+      -DWITH_ASTROASIS=OFF \
+      ..
 make -j2
 sudo make install
 
@@ -158,7 +266,8 @@ echo "PiFinder: Install time synchronization..."
 echo "==============================================================================="
 
 sudo apt install chrony -y
-sudo bash -c 'echo -e "\n# Sync time from GPSD\nrefclock SHM 0 poll 3 refid gps1" >> /etc/chrony/chrony.conf'
+
+sudo grep -q "refclock.*gps1" /etc/chrony/chrony.conf || sudo bash -c 'echo -e "\n# Sync time from GPSD\nrefclock SHM 0 poll 3 refid gps1" >> /etc/chrony/chrony.conf'
 sudo systemctl restart chrony
 
 

python/PiFinder/catalogs.py

@@ -757,7 +757,7 @@ def do_timed_task(self):
             with self._init_lock:
                 if not self.initialized:
                     logger.debug("Comets not yet initialized, skip periodic update...")
-                    
+
     def stop(self) -> None:
         """Stop background loading gracefully"""
         self._stop_flag.set()

python/PiFinder/display_message.py

@@ -16,7 +16,6 @@
 import argparse
 from PIL import Image, ImageDraw
 from PiFinder import displays
-from PiFinder import config
 
 
 def display_message(lines, brightness=255, display_type=None):
@@ -107,26 +106,28 @@ def main():
   %(prog)s --brightness 200 "Bright message"
   %(prog)s --display st7789 "Message for LCD"
         """,
-        formatter_class=argparse.RawDescriptionHelpFormatter
+        formatter_class=argparse.RawDescriptionHelpFormatter,
     )
 
     parser.add_argument(
         "message",
         nargs="+",
-        help="Message text (multiple arguments will be displayed on separate lines)"
+        help="Message text (multiple arguments will be displayed on separate lines)",
     )
 
     parser.add_argument(
-        "-b", "--brightness",
+        "-b",
+        "--brightness",
         type=int,
         default=125,
-        help="Display brightness (0-255, default: 125)"
+        help="Display brightness (0-255, default: 125)",
     )
 
     parser.add_argument(
-        "-d", "--display",
+        "-d",
+        "--display",
         choices=["ssd1351", "st7789", "pg_128", "pg_320"],
-        help="Display hardware type (auto-detected from config if not specified)"
+        help="Display hardware type (auto-detected from config if not specified)",
     )
 
     args = parser.parse_args()
@@ -138,11 +139,16 @@ def main():
 
     # Display the message
     try:
-        display_message(args.message, brightness=args.brightness, display_type=args.display)
-        print(f"Message displayed successfully on {args.display or 'auto-detected'} display")
+        display_message(
+            args.message, brightness=args.brightness, display_type=args.display
+        )
+        print(
+            f"Message displayed successfully on {args.display or 'auto-detected'} display"
+        )
     except Exception as e:
         print(f"Error displaying message: {e}")
         import traceback
+
         traceback.print_exc()
         sys.exit(1)
 

python/PiFinder/mountcontrol_alignment.py

@@ -51,6 +51,7 @@
 # Config loading and merging
 # ---------------------------------------------------------------------------
 
+
 def _load_yaml_safe(path: Path) -> Optional[dict]:
     """Load a YAML file, returning None on any error."""
     try:
@@ -133,6 +134,7 @@ def load_merged_config() -> dict:
 # Status persistence
 # ---------------------------------------------------------------------------
 
+
 def _save_status(status: dict) -> None:
     try:
         STATUS_FILE_PATH.parent.mkdir(parents=True, exist_ok=True)
@@ -160,6 +162,7 @@ def read_status() -> dict:
 # PyIndi helpers
 # ---------------------------------------------------------------------------
 
+
 def _get_switch_value(device, prop_name: str, elem_name: str) -> Optional[str]:
     """
     Read a single switch element from a PyIndi device.
@@ -200,6 +203,7 @@ def _apply_switch_command(
 # Main entry point (called from mountcontrol_indi.init_mount)
 # ---------------------------------------------------------------------------
 
+
 def check_and_disable_alignment(client, device, console_queue=None) -> None:
     """
     Detect active INDI alignment subsystems on *device* and optionally disable
@@ -257,7 +261,10 @@ def check_and_disable_alignment(client, device, console_queue=None) -> None:
         if current_val is None:
             logger.debug(
                 "Driver '%s': property '%s' / element '%s' not found on '%s'",
-                key, detect_prop, detect_elem, device_name,
+                key,
+                detect_prop,
+                detect_elem,
+                device_name,
             )
             status["drivers"][key] = result
             continue
@@ -269,7 +276,8 @@ def check_and_disable_alignment(client, device, console_queue=None) -> None:
         if not is_active:
             logger.info(
                 "Driver '%s' (%s): alignment subsystem is already inactive",
-                key, device_name,
+                key,
+                device_name,
             )
             status["drivers"][key] = result
             continue
@@ -284,7 +292,9 @@ def check_and_disable_alignment(client, device, console_queue=None) -> None:
             "INDI alignment subsystem ACTIVE on '%s' (%s)%s",
             device_name,
             drv.get("description", key),
-            " — will disable" if disable_commands else " — no disable commands configured",
+            " — will disable"
+            if disable_commands
+            else " — no disable commands configured",
         )
         _push_console(console_queue, msg)
 
@@ -308,7 +318,10 @@ def check_and_disable_alignment(client, device, console_queue=None) -> None:
 
             logger.info(
                 "Sending: device=%s prop=%s element=%s value=%s",
-                device_name, prop, elem, val,
+                device_name,
+                prop,
+                elem,
+                val,
             )
             ok = _apply_switch_command(client, device, prop, elem, val)
             result["commands_sent"].append(
@@ -329,7 +342,9 @@ def check_and_disable_alignment(client, device, console_queue=None) -> None:
             _push_console(console_queue, f"INDI: alignment disabled on {device_name}")
         else:
             logger.error("Alignment disable INCOMPLETE on '%s'", device_name)
-            _push_console(console_queue, f"INDI: alignment disable FAILED on {device_name}")
+            _push_console(
+                console_queue, f"INDI: alignment disable FAILED on {device_name}"
+            )
 
         status["drivers"][key] = result
 
@@ -349,6 +364,7 @@ def _push_console(console_queue, message: str) -> None:
 # Utility functions for the web server
 # ---------------------------------------------------------------------------
 
+
 def get_repo_config_path() -> Path:
     return REPO_CONFIG_PATH
 

python/PiFinder/server.py

@@ -952,7 +952,9 @@ def indi_copy_config():
         @auth_required
         def indi_status_json():
             response.content_type = "application/json"
-            return json.dumps(mountcontrol_alignment.read_status(), indent=2, default=str)
+            return json.dumps(
+                mountcontrol_alignment.read_status(), indent=2, default=str
+            )
 
         @app.route("/key_callback", method="POST")
         @auth_required

python/PiFinder/sys_utils.py

@@ -327,12 +327,15 @@ def is_mountcontrol_active() -> bool:
     """
     Returns True if mount control service is active
     """
-    status = sh.sudo("systemctl", "is-active", "indiwebmanager.service", _ok_code=(0, 3))
+    status = sh.sudo(
+        "systemctl", "is-active", "indiwebmanager.service", _ok_code=(0, 3)
+    )
     if status.exit_code == 0:
         return True
     else:
         return False
-    
+
+
 def mountcontrol_activate() -> None:
     """
     Activates the mount control service
@@ -353,6 +356,8 @@ def mountcontrol_deactivate() -> None:
     # sh.sudo("systemctl", "stop", "indiwebmanager.service")
     # We do NOT need to start the mount control process during startup, so reboot
     sh.sudo("shutdown", "-r", "now")
+
+
 def check_and_sync_gpsd_config(baud_rate: int) -> bool:
     """
     Checks if GPSD configuration matches the desired baud rate,

python/PiFinder/sys_utils_fake.py

@@ -162,16 +162,17 @@ def switch_cam_imx296() -> None:
     logger.info('sh.sudo("python", "-m", "PiFinder.switch_camera", "imx296")')
 
 
-
 mountcontrol_active = True
 
+
 def is_mountcontrol_active() -> bool:
     """
     Returns True if mount control service is active
     """
     global mountcontrol_active
     return mountcontrol_active
-    
+
+
 def mountcontrol_activate() -> None:
     """
     Activates the mount control service
@@ -180,10 +181,11 @@ def mountcontrol_activate() -> None:
     global mountcontrol_active
     mountcontrol_active = True
 
+
 def mountcontrol_deactivate() -> None:
     """
     Deactivates the mount control service
     """
     logger.info("SYS: Deactivating Mount Control")
     global mountcontrol_active
-    mountcontrol_active= False
+    mountcontrol_active = False