Merge pull request springbok#135 from wonder99/main

Correct pausing/unpausing of OCR.

Author: springbok

src/ball_data.py

@@ -389,7 +389,7 @@ def eq(self, other):
             if (roi != BallMetrics.BACK_SPIN and
                     ((roi != BallMetrics.SIDE_SPIN and self.launch_monitor != LaunchMonitor.TRUGOLF_APOGEE) or
                      self.launch_monitor == LaunchMonitor.TRUGOLF_APOGEE)  and result != previous_result):
-                logging.debug(f'previous_metric: {previous_result} result: {result}')
+                logging.debug('ROI {: <15}   was:{: >6}   is:{: >6}'.format(roi, previous_result, result))
                 diff_count = diff_count + 1
         # Check if all values are 0, some users use practice instead of range and there is a screen flicker
         # that causes an invalid shot with all invalid values so all values are still 0. Check if all values

src/screenshot.py

@@ -69,10 +69,15 @@ def capture_screenshot(self, device: Device, rois_setup=False):
         # Check if new shot
         self.new_shot = False
         self.screenshot_new = False
-        mse = 100
+        if self.settings.device_id == LaunchMonitor.UNEEKOR:
+            mse_min = 400
+        else: 
+            mse_min = 100
+        mse = mse_min
+
         if not self.previous_screenshot_image is None:
             mse = self.mse(self.previous_screenshot_image, self.screenshot_image)
-        if mse >= 100:
+        if mse >= mse_min or self.first:
             self.screenshot_new = True
             self.previous_screenshot_image = self.screenshot_image
             self.image()

src/screenshot_base.py

@@ -243,9 +243,17 @@ def ocr_image(self):
                     self.balldata.process_putt_data(ocr_result, roi, self.previous_balldata)
                 else:
                     self.balldata.process_shot_data(ocr_result, roi, self.previous_balldata, self.selected_club, self.settings.mevo_plus['offline_mode'])
+
             # Correct metrics if invalid smash factor
             if self.balldata.putt_type is None:
                 self.balldata.check_smash_factor(self.selected_club)
+
+            # Ignore first shot at startup
+            if self.first:
+                logging.debug('First shot, ignoring')
+                self.first = False
+                self.previous_balldata = self.balldata.__copy__()
+
             if not self.previous_balldata is None:
                 diff_count = self.balldata.eq(self.previous_balldata)
             else:
@@ -279,12 +287,6 @@ def ocr_image(self):
                         self.previous_balldata = self.balldata.__copy__()
             else:
                 logging.debug('Not a new shot')
-            # Ignore first shot at startup
-            if self.first:
-                logging.debug('First shot, ignoring')
-                self.first = False
-                self.balldata.new_shot = False
-                self.new_shot = False
         finally:
             tesserocr_api.End()