Merge pull request #285 from aaronwmorris/dev

Add new mode to assist focusing the camera

Author: aaronwmorris

README.md

@@ -238,6 +238,8 @@ All configuration is read from /etc/indi-allsky/config.json .  You can find conf
 | CCD_EXPOSURE_DEF    | CCD_EXPOSURE_MIN | (float) Default/starting exposure |
 | EXPOSURE_PERIOD     | 15.0        | (float) Seconds between beginning of each exposure (Night) |
 | EXPOSURE_PERIOD_DAY | 15.0        | (float) Seconds between beginning of each exposure (Day) |
+| FOCUS_MODE          | false       | (bool) Focus mode is used to take exposures as quickly as possible to aid in focusing |
+| FOCUS_DELAY         | 4.0         | (float) Delay between exposures during focus mode |
 | AUTO_WB             | false       | (bool) Automatic white balance adjustment |
 | WBR_FACTOR          | 1.0         | (float) Red Balance Adjustment Factor |
 | WBG_FACTOR          | 1.0         | (float) Green Balance Adjustment Factor |

config.json_template

@@ -30,6 +30,9 @@
     "EXPOSURE_PERIOD"      : 15.00000,
     "EXPOSURE_PERIOD_DAY"  : 15.00000,
 
+    "FOCUS_MODE"           : false,
+    "FOCUS_DELAY"          : 4.0,
+
     "AUTO_WB"          : false,
     "WBR_FACTOR"       : 1.0,
     "WBG_FACTOR"       : 1.0,

indi_allsky/allsky.py

@@ -70,6 +70,8 @@ def __init__(self, f_config_file):
         self.moonmode_v = Value('i', -1)  # bogus initial value
         self.moonmode = None
 
+        self.focus_mode = self.config.get('FOCUS_MODE', False)  # focus mode takes images as fast as possible
+
         self.night_sun_radians = math.radians(self.config['NIGHT_SUN_ALT_DEG'])
         self.night_moonmode_radians = math.radians(self.config['NIGHT_MOONMODE_ALT_DEG'])
 
@@ -81,8 +83,6 @@ def __init__(self, f_config_file):
         self.video_worker = None
         self.video_worker_idx = 0
 
-        self.save_images = True
-
         self.upload_q = Queue()
         self.upload_worker = None
         self.upload_worker_idx = 0
@@ -156,6 +156,9 @@ def sighup_handler(self, signum, frame):
         ccd_info = self.indiclient.getCcdInfo(self.ccdDevice)
         self.config['CCD_INFO'] = ccd_info
 
+        # Update focus mode
+        self.focus_mode = self.config.get('FOCUS_MODE', False)
+
         # set minimum exposure
         ccd_min_exp = self.config['CCD_INFO']['CCD_EXPOSURE']['CCD_EXPOSURE_VALUE']['min']
 
@@ -457,7 +460,6 @@ def _startImageWorker(self):
             self.sensortemp_v,
             self.night_v,
             self.moonmode_v,
-            save_images=self.save_images,
         )
         self.image_worker.start()
 
@@ -727,7 +729,11 @@ def run(self):
                     camera_ready = False
                     waiting_for_frame = True
 
-                    if self.night:
+                    if self.focus_mode:
+                        # Start frame immediately in focus mode
+                        logger.warning('*** FOCUS MODE ENABLED ***')
+                        next_frame_time = now + self.config.get('FOCUS_DELAY', 4.0)
+                    elif self.night:
                         next_frame_time = frame_start_time + self.config['EXPOSURE_PERIOD']
                     else:
                         next_frame_time = frame_start_time + self.config['EXPOSURE_PERIOD_DAY']

indi_allsky/flask/forms.py

@@ -129,6 +129,14 @@ def EXPOSURE_PERIOD_DAY_validator(form, field):
         raise ValidationError('Exposure period must be 1.0 or more')
 
 
+def FOCUS_DELAY_validator(form, field):
+    if not isinstance(field.data, (int, float)):
+        raise ValidationError('Please enter valid number')
+
+    if field.data < 1.0:
+        raise ValidationError('Focus delay must be 1.0 or more')
+
+
 def WB_FACTOR_validator(form, field):
     if not isinstance(field.data, (int, float)):
         raise ValidationError('Please enter valid number')
@@ -849,6 +857,8 @@ class IndiAllskyConfigForm(FlaskForm):
     CCD_EXPOSURE_MIN                 = FloatField('Min Exposure', validators=[CCD_EXPOSURE_MIN_validator])
     EXPOSURE_PERIOD                  = FloatField('Exposure Period (Night)', validators=[DataRequired(), EXPOSURE_PERIOD_validator])
     EXPOSURE_PERIOD_DAY              = FloatField('Exposure Period (Day)', validators=[DataRequired(), EXPOSURE_PERIOD_DAY_validator])
+    FOCUS_MODE                       = BooleanField('Focus Mode')
+    FOCUS_DELAY                      = FloatField('Focus Delay', validators=[DataRequired(), FOCUS_DELAY_validator])
     AUTO_WB                          = BooleanField('Auto White Balance')
     WBR_FACTOR                       = FloatField('Red Balance Factor', validators=[DataRequired(), WB_FACTOR_validator])
     WBG_FACTOR                       = FloatField('Green Balance Factor', validators=[DataRequired(), WB_FACTOR_validator])
@@ -1505,3 +1515,26 @@ class IndiAllskySetDateTimeForm(FlaskForm):
 
     NEW_DATETIME = DateTimeLocalField('New Datetime', render_kw={'step' : '1'}, format='%Y-%m-%dT%H:%M:%S', validators=[DataRequired()])
 
+
+
+class IndiAllskyFocusForm(FlaskForm):
+    ZOOM_SELECT_choices = (
+        (2, 'Off'),
+        (3, 'Low'),
+        (5, 'Medium'),
+        (8, 'High'),
+        (12, 'Extreme'),
+    )
+    REFRESH_SELECT_choices = (
+        (2, '2s'),
+        (3, '3s'),
+        (4, '4s'),
+        (5, '5s'),
+        (10, '10s'),
+        (15, '15s'),
+    )
+
+
+    ZOOM_SELECT       = SelectField('Zoom', choices=ZOOM_SELECT_choices, default=ZOOM_SELECT_choices[0][0], validators=[])
+    REFRESH_SELECT    = SelectField('Refresh', choices=REFRESH_SELECT_choices, default=REFRESH_SELECT_choices[3][0], validators=[])
+

indi_allsky/flask/static/svg/stars.svg

@@ -46,6 +46,10 @@
                         <a href="{{ url_for('indi_allsky.sqm_view') }}" class="nav-link px-sm-0 px-2">
                             <img src="{{ url_for('indi_allsky.static', filename='svg/cloud-moon-fill.svg') }}" width="16" height="16"><span class="ms-1 d-none d-sm-inline">SQM</span></a>
                     </li>
+                    <li>
+                        <a href="{{ url_for('indi_allsky.focus_view') }}" class="nav-link px-sm-0 px-2">
+                            <img src="{{ url_for('indi_allsky.static', filename='svg/stars.svg') }}" width="16" height="16"><span class="ms-1 d-none d-sm-inline">Focus</span></a>
+                    </li>
                     <li>
                         <a href="{{ url_for('indi_allsky.chart_view') }}" class="nav-link px-sm-0 px-2">
                             <img src="{{ url_for('indi_allsky.static', filename='svg/graph-up.svg') }}" width="16" height="16"><span class="ms-1 d-none d-sm-inline">Charts</span> </a>

indi_allsky/flask/templates/base.html

@@ -175,6 +175,36 @@
 
     <hr />
 
+    <div class="form-group row">
+        <div class="col-sm-2">
+            {{ form_config.FOCUS_MODE.label }}
+        </div>
+        <div class="col-sm-2">
+            <div class="form-switch">
+                {{ form_config.FOCUS_MODE(class='form-check-input') }}
+                <div id="FOCUS_MODE-error" class="invalid-feedback text-danger" style="display: none;"></div>
+            </div>
+        </div>
+        <div class="col-sm-8">Focus mode removes any pause between exposures so they are taken as quickly as possible</div>
+    </div>
+
+    <div class="form-group row">
+        <div class="col-sm-2">
+            {{ form_config.FOCUS_DELAY.label(class='col-form-label') }}
+        </div>
+        <div class="col-sm-2">
+            {{ form_config.FOCUS_DELAY(class='form-control bg-secondary') }}
+            <div id="FOCUS_DELAY-error" class="invalid-feedback text-danger" style="display: none;"></div>
+        </div>
+        <div class="col-sm-8">
+            <div>Seconds between each frame during focusing. This value should be slightly higher than the download time of images for your camera.</div>
+            <div>RasPi HQ camera is about 3.5 seconds, therefore 4.0 should be sufficient.</div>
+            <div>Astronomy cameras may be able to go as low as 1.0 or 2.0</div>
+        </div>
+    </div>
+
+    <hr />
+
     <div class="form-group row">
         <div class="col-sm-2">
             {{ form_config.AUTO_WB.label }}
@@ -1415,6 +1445,7 @@
     'CCD_EXPOSURE_MIN',
     'EXPOSURE_PERIOD',
     'EXPOSURE_PERIOD_DAY',
+    'FOCUS_DELAY',
     'WBR_FACTOR',
     'WBG_FACTOR',
     'WBB_FACTOR',
@@ -1498,6 +1529,7 @@
 ];
 
 const checkbox_field_names = [
+    'FOCUS_MODE',
     'AUTO_WB',
     'DETECT_STARS',
     'DETECT_METEORS',