Skip to content

Commit

Permalink
Merge branch 'develop' of github.com:panoptes/POCS into google-logger
Browse files Browse the repository at this point in the history
  • Loading branch information
wtgee committed Nov 17, 2023
2 parents 71a04bb + 9814757 commit 2a061c1
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 12 deletions.
1 change: 1 addition & 0 deletions src/panoptes/pocs/mount/ioptron/cem40.py
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ def search_for_home(self):

def set_target_coordinates(self, *args, **kwargs):
"""After setting target coordinates, check number of positions.
The CEM40 can determine if there are 0, 1, or 2 possible positions
for the given RA/Dec, with the latter being the case for the meridian
flip.
Expand Down
5 changes: 0 additions & 5 deletions src/panoptes/pocs/mount/ioptron/ieq30pro.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,3 @@ def __init__(self, location, mount_version='0030', *args, **kwargs):
self._mount_version = mount_version
super(Mount, self).__init__(location, *args, **kwargs)
self.logger.success('iOptron iEQ30Pro Mount created')

def search_for_home(self):
"""Search for the home position not supported."""
self.logger.warning('Searching for home position not supported iEQ30Pro.'
'Please set the home position manually via the hand-controller.')
12 changes: 6 additions & 6 deletions src/panoptes/pocs/mount/mount.py
Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@ def update_status(self):
def status(self):
status = {}
try:
status['tracking_rate'] = f'{self.tracking_rate:0.04f}'
status['tracking_rate'] = self.tracking_rate
status['ra_guide_rate'] = self.ra_guide_rate
status['dec_guide_rate'] = self.dec_guide_rate
status['movement_speed'] = self.movement_speed
Expand Down Expand Up @@ -783,6 +783,11 @@ def _setup_commands(self, commands):

self.logger.debug('Mount commands set up')

def search_for_home(self):
"""Search for the home position not supported."""
self.logger.warning('Searching for home position not supported.'
'Please set the home position manually via the hand-controller.')

@abstractmethod
def write(self, cmd):
raise NotImplementedError
Expand All @@ -791,11 +796,6 @@ def write(self, cmd):
def read(self, *args, **kwargs):
raise NotImplementedError

@abstractmethod
def search_for_home(self):
"""Search for the home position if supported. """
raise NotImplementedError

@abstractmethod
def set_tracking_rate(self, direction='ra', delta=1.0):
"""Sets the tracking rate for the mount """
Expand Down
2 changes: 1 addition & 1 deletion src/panoptes/pocs/utils/cli/image.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
from google.cloud import storage
from rich import print

from panoptes.pocs.utils.image import upload_image
from panoptes.pocs.utils.cloud import upload_image

app = typer.Typer()
upload_app = typer.Typer()
Expand Down
1 change: 1 addition & 0 deletions src/panoptes/pocs/utils/cloud.py
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
from pathlib import Path
from google.cloud import storage

from panoptes.pocs.utils.logger import get_logger

logger = get_logger()
Expand Down

0 comments on commit 2a061c1

Please sign in to comment.