diff --git a/ChangeLog.md b/ChangeLog.md index 864865a..f282b5a 100644 --- a/ChangeLog.md +++ b/ChangeLog.md @@ -1,3 +1,6 @@ +# 12/21/2025 v1.8.0 +- Minor update for release. + # 12/6/2025 v1.8.0 b19 - Rewrite of RPY calibration routines. - RPY movements now uses calibrated sample rates from calibration. diff --git a/EDAPGui.py b/EDAPGui.py index b2af86c..b3812f7 100644 --- a/EDAPGui.py +++ b/EDAPGui.py @@ -62,7 +62,7 @@ # --------------------------------------------------------------------------- # must be updated with a new release so that the update check works properly! # contains the names of the release. -EDAP_VERSION = "V1.8.0 beta 19" +EDAP_VERSION = "V1.8.0" # depending on how release versions are best marked you could also change it to the release tag, see function check_update. # --------------------------------------------------------------------------- diff --git a/ED_AP.py b/ED_AP.py index 55342e0..723734a 100644 --- a/ED_AP.py +++ b/ED_AP.py @@ -1420,7 +1420,7 @@ def sc_disengage_ocr(self, scr_reg) -> bool: elapsed_time = time.time() - start_time abs_rect = scr_reg.reg['disengage']['rect'] self.overlay.overlay_rect1('sc_disengage_active', abs_rect, (0, 255, 0), 2) - self.overlay.overlay_floating_text('sc_disengage_active', f'{str(ocr_textlist)} ({round(elapsed_time, 4)} Secs)', abs_rect[0], abs_rect[1] - 25, (0, 255, 0)) + self.overlay.overlay_floating_text('sc_disengage_active', f'Diseng: {str(ocr_textlist)} ({round(elapsed_time, 4)} Secs)', abs_rect[0], abs_rect[1] - 25, (0, 255, 0)) self.overlay.overlay_paint() if self.cv_view: @@ -1456,6 +1456,11 @@ def _sc_sco_active_loop(self): """ A loop to determine is Supercruise Overcharge is active. This runs on a separate thread monitoring the status in the background. """ while self._sc_sco_active_loop_enable: + # deactivate if not in SC + if not self.status.get_flag(FlagsSupercruise): + self.stop_sco_monitoring() + break + start_time = time.time() # Try to determine if the disengage/sco text is there @@ -2704,7 +2709,7 @@ def sc_assist(self, scr_reg, do_docking=True): sleep(0.05) if self.jn.ship_state()['status'] == 'in_supercruise': # Align and stay on target. If false is returned, we have lost the target behind us. - self.set_speed_50() + # self.set_speed_50() align_res = self.sc_target_align(scr_reg) if align_res == ScTargetAlignReturn.Lost: # Continue ahead before aligning to prevent us circling the target @@ -3019,6 +3024,7 @@ def engine_loop(self): print("Trapped generic:"+str(e)) traceback.print_exc() + self.stop_sco_monitoring() self.fsd_assist_enabled = False self.ap_ckb('fsd_stop') self.update_overlay() @@ -3048,6 +3054,7 @@ def engine_loop(self): logger.debug("SC Assist trapped generic:"+str(e)) traceback.print_exc() + self.stop_sco_monitoring() logger.debug("Completed sc_assist") self.sc_assist_enabled = False self.ap_ckb('sc_stop') @@ -3071,6 +3078,7 @@ def engine_loop(self): logger.debug("Waypoint Assist trapped generic:"+str(e)) traceback.print_exc() + self.stop_sco_monitoring() self.waypoint_assist_enabled = False self.ap_ckb('waypoint_stop') self.update_overlay() @@ -3088,6 +3096,7 @@ def engine_loop(self): logger.debug("Robigo Assist trapped generic:"+str(e)) traceback.print_exc() + self.stop_sco_monitoring() self.robigo_assist_enabled = False self.ap_ckb('robigo_stop') self.update_overlay() @@ -3103,6 +3112,7 @@ def engine_loop(self): logger.debug("AFK Combat Assist trapped generic:" + str(e)) traceback.print_exc() + self.stop_sco_monitoring() self.afk_combat_assist_enabled = False self.ap_ckb('afk_stop') self.update_overlay() @@ -3135,6 +3145,7 @@ def engine_loop(self): logger.debug("Single Waypoint Assist trapped generic:" + str(e)) traceback.print_exc() + self.stop_sco_monitoring() self.single_waypoint_enabled = False self.ap_ckb('single_waypoint_stop') self.update_overlay() diff --git a/readme.md b/readme.md index e61555d..729da6f 100644 --- a/readme.md +++ b/readme.md @@ -293,8 +293,8 @@ The following settings from the AP.json file (in the configs folder) are **not** "target_align_outer_lim": 1.0, "target_align_inner_lim": 0.5, - "FCDepartureTime": 30.0, # When leaving a Fleet Carrier, this is the amount of time in Secs to fly away before enabling SC. "FCDepartureAngle": 90.0, # Angle to pitch up when leaving a Fleet Carrier + "FCDepartureTime": 30.0, # When leaving a Fleet Carrier, the time in Secs to fly away after enabling SC. "OCDepartureAngle": 90.0 # Angle to pitch up when leaving an Orbital Construction Site ```