diff --git a/src/panoptes/pocs/camera/gphoto/base.py b/src/panoptes/pocs/camera/gphoto/base.py index e5f1f186f..c0a5ded2e 100644 --- a/src/panoptes/pocs/camera/gphoto/base.py +++ b/src/panoptes/pocs/camera/gphoto/base.py @@ -119,7 +119,7 @@ def get_command_result(self, timeout: float = 10) -> Union[List[str], None]: self.logger.trace(f'gphoto2 output: {outs=!r}') if errs != '': - self.logger.error(f'gphoto2 error: {errs!r}') + self.logger.warning(f'gphoto2 error: {errs!r}') if isinstance(outs, str): outs = outs.split('\n') diff --git a/src/panoptes/pocs/camera/gphoto/canon.py b/src/panoptes/pocs/camera/gphoto/canon.py index 8b9fa26a5..e187e6aea 100644 --- a/src/panoptes/pocs/camera/gphoto/canon.py +++ b/src/panoptes/pocs/camera/gphoto/canon.py @@ -72,8 +72,7 @@ def connect(self): self.set_properties(prop2value=prop2value) - # TODO check this works on all Canon models. - self.model = self.get_property('d402') + self.model = self.get_property('model') self._connected = True