From 90e60692d7972c74c0aa57c9815960a5c33e8002 Mon Sep 17 00:00:00 2001 From: Richard Date: Mon, 2 Dec 2024 18:44:49 -0800 Subject: [PATCH] Ignore imu on alignment screen, adjust menu, clean up debug --- README.md | 5 ++++- python/PiFinder/solver.py | 4 ++-- python/PiFinder/ui/align.py | 14 +++++++------- python/PiFinder/ui/menu_structure.py | 13 ------------- 4 files changed, 13 insertions(+), 23 deletions(-) diff --git a/README.md b/README.md index 602bcbe3..99f5ffc8 100644 --- a/README.md +++ b/README.md @@ -3,6 +3,10 @@ A plate solving telescope finder based around a Raspberry PI, imx296 camera, and For an overview of what the PiFinder™ is and how it came to be visit the official project website at [PiFinder.io](https://www.pifinder.io/build-yours) +The PiFinder™ uses the [Ceder Detect](https://github.com/smroid/cedar-detect) and +[Cedar Solve](https://github.com/smroid/cedar-solve) libraries with express permission. +Thank you to [smroid] for all your support of the PiFinder project! + ![Banner](./docs/source/images/PiFinder_v3_banner.png) The PiFinder™ is my attempt to improve my time at my telescope. I don't get nearly enough of it and I want to enjoy it as much as possible. So after years of observing with paper charts and, later, a Nexus DSC here is what I felt I was missing: * **Reliable telescope positioning:** The Nexus DSC is great, but my scope just isn't built for solid encoder integration. The slop in the way I have to couple the encoders means poor pointing accuracy. @@ -45,4 +49,3 @@ If you'd like to learn more about how it works, and potentially build your own, ## Discord Join the [PiFinder™ Discord server](https://discord.gg/Nk5fHcAtWD) for support with your build, usage questions, and suggestions for improvement. -Buy Me a Coffee at ko-fi.com diff --git a/python/PiFinder/solver.py b/python/PiFinder/solver.py index 3cb5d7a1..29b01572 100644 --- a/python/PiFinder/solver.py +++ b/python/PiFinder/solver.py @@ -20,8 +20,8 @@ from PiFinder import utils sys.path.append(str(utils.tetra3_dir)) -import tetra3 -from tetra3 import cedar_detect_client +import tetra3 +from tetra3 import cedar_detect_client logger = logging.getLogger("Solver") diff --git a/python/PiFinder/ui/align.py b/python/PiFinder/ui/align.py index 52f651c0..c11aaa85 100644 --- a/python/PiFinder/ui/align.py +++ b/python/PiFinder/ui/align.py @@ -71,6 +71,7 @@ def align_on_radec(ra, dec, command_queues, config_object, shared_state) -> bool return False # success, set all the things... + command_queues["console"].put("Alignment Set") shared_state.set_solve_pixel(target_pixel) config_object.set_option("solve_pixel", target_pixel) return True @@ -97,8 +98,8 @@ def __init__(self, *args, **kwargs): self.star_list = np.empty((0, 2)) self.alignment_star = None self.reticle_position = ( - self.config_object.get_option("solve_pixel", (256, 256))[0] / 4, self.config_object.get_option("solve_pixel", (256, 256))[1] / 4, + self.config_object.get_option("solve_pixel", (256, 256))[0] / 4, ) # Marking menu definition @@ -119,8 +120,9 @@ def draw_reticle(self): return if not self.align_mode: - self.reticle_position = self.starfield.radec_to_xy( - self.solution["RA"], self.solution["Dec"] + self.reticle_position = ( + self.config_object.get_option("solve_pixel", (256, 256))[1] / 4, + self.config_object.get_option("solve_pixel", (256, 256))[0] / 4, ) x_pos = round(self.reticle_position[0]) @@ -179,9 +181,7 @@ def update(self, force=False): if self.shared_state.solve_state(): self.animate_fov() - constellation_brightness = self.config_object.get_option( - "chart_constellations", 64 - ) + constellation_brightness = 64 self.solution = self.shared_state.solution() last_solve_time = self.solution["solve_time"] if ( @@ -206,7 +206,7 @@ def update(self, force=False): self.screen.paste(image_obj) self.last_update = last_solve_time - self.draw_reticle() + self.draw_reticle() else: self.draw.rectangle( diff --git a/python/PiFinder/ui/menu_structure.py b/python/PiFinder/ui/menu_structure.py index 310c68ec..b8e1413f 100644 --- a/python/PiFinder/ui/menu_structure.py +++ b/python/PiFinder/ui/menu_structure.py @@ -857,19 +857,6 @@ }, ], }, - { - "name": "Experimental", - "class": UITextMenu, - "select": "Single", - "items": [ - { - "name": "Align", - "class": UIAlign, - "stateful": True, - "preload": True, - }, - ], - }, ], }, ],