rwd fix3 to stablize (#35)

Juice-XIJ · web-flow · commit 389f2aa7024e · 2022-04-26T20:08:36.000Z
diff --git a/constants.py b/constants.py
@@ -90,8 +90,8 @@ class ConfigVersion(enum.Enum):
 # === Delay Settings ===
 delayClutchtoShift = 0  # delay between pressing clutch and shift
 delayShifttoClutch = 0.06  # delay between pressing shift and releasing clutch
-downShiftCoolDown = 0.3  # cooldown after down shift
-upShiftCoolDown = 0.2  # cooldown after up shift
+downShiftCoolDown = 0.35  # cooldown after down shift
+upShiftCoolDown = 0.35  # cooldown after up shift
 blipThrottleDuration = 0.1  # blip the throttle duration. Should be short since keyboard is 100% acceleration output
 
 # === Gear Shift Settings ===
diff --git a/forza.py b/forza.py
@@ -150,11 +150,14 @@ def __update_forza_info(self, fdp: ForzaDataPacket):
         Args:
             fdp (ForzaDataPacket): datapackage
         """
-        if self.ordinal != fdp.car_ordinal or self.car_perf != fdp.car_performance_index or self.car_class != fdp.car_class or self.car_drivetrain != fdp.drivetrain_type:
+        if len(self.shift_point) <= 0 or self.ordinal != fdp.car_ordinal or self.car_perf != fdp.car_performance_index or self.car_class != fdp.car_class or self.car_drivetrain != fdp.drivetrain_type:
             self.ordinal = fdp.car_ordinal
             self.car_perf = fdp.car_performance_index
             self.car_class = fdp.car_class
             self.car_drivetrain = fdp.drivetrain_type
+            return self.__try_auto_load_config(fdp)
+        else:
+            return True
 
     def __try_auto_load_config(self, fdp: ForzaDataPacket):
         """auto load config while driving
@@ -180,7 +183,7 @@ def __try_auto_load_config(self, fdp: ForzaDataPacket):
                     if self.__try_loading_config(filename):
                         # remove legacy config if necessary
                         if len(configs) > 1:
-                            self.__cleanup_legacy_config(configs, filename)
+                            self.__cleanup_legacy_config(configs)
 
                         return True
                     else:
@@ -196,7 +199,7 @@ def __try_auto_load_config(self, fdp: ForzaDataPacket):
 
                         # dump to latest config version
                         helper.dump_config(self)
-                        self.__cleanup_legacy_config(configs, '')
+                        self.__cleanup_legacy_config(configs)
                         return True
                     else:
                         return False
@@ -207,9 +210,16 @@ def __try_auto_load_config(self, fdp: ForzaDataPacket):
         finally:
             self.logger.debug(f'{self.__try_auto_load_config.__name__} ended')
 
-    def __cleanup_legacy_config(self, configs, exclude_config):
+    def __cleanup_legacy_config(self, configs, latest_version: ConfigVersion = constants.default_config_version):
+        """cleanup legacy configs
+
+        Args:
+            configs (list): list of configs
+            latest_version (ConfigVersion, optional): config version. Defaults to constants.default_config_version.
+        """
         for config in configs:
-            if config != exclude_config:
+            version = helper.get_config_version(self, config)
+            if version != latest_version:
                 try:
                     self.logger.warning(f'removing legacy config {config}')
                     path = os.path.join(self.config_folder, config)
@@ -254,10 +264,12 @@ def shifting(self, iteration, fdp):
 
             # prepare shifting params
             slip = (fdp.tire_slip_ratio_RL + fdp.tire_slip_ratio_RR) / 2
+            angle_slip = (fdp.tire_slip_angle_RL + fdp.tire_slip_angle_RR) / 2
             speed = fdp.speed * 3.6
             rpm = fdp.current_engine_rpm
             accel = fdp.accel
             fired = False
+            self.logger.debug(f'[{iteration}] at gear {gear}. rpm {rpm}, speed {speed}, angle slip {angle_slip}, slip {slip}, accel {accel}')
 
             # up shift logic
             if gear < self.maxGear and accel:
@@ -267,14 +279,14 @@ def shifting(self, iteration, fdp):
                 # RWD logic
                 if self.car_drivetrain == 1:
                     # at low gear (<= 3)
-                    if gear <= 3 and slip >= 0.9:
-                        self.logger.debug(f'[{iteration}] up shift triggerred since RWD at gear {gear}. rpm {rpm}, speed {speed}, slip {slip}, accel {accel}')
+                    if gear <= 3 and angle_slip >= 1:
+                        self.logger.debug(f'[{iteration}] up shift triggerred since RWD at gear {gear}. rpm {rpm}, speed {speed}, angle slip {angle_slip}, slip {slip}, accel {accel}')
                         gear_helper.up_shift_handle(gear, self)
                         fired = True
                     else:
-                        fired = self.__up_shift(rpm, target_rpm, speed, target_up_speed, slip, iteration, gear)
+                        fired = self.__up_shift(rpm, target_rpm, speed, target_up_speed, slip, iteration, gear, fdp)
                 else:
-                    fired = self.__up_shift(rpm, target_rpm, speed, target_up_speed, slip, iteration, gear)
+                    fired = self.__up_shift(rpm, target_rpm, speed, target_up_speed, slip, iteration, gear, fdp)
 
             # down shift logic
             if not fired and gear > self.minGear:
@@ -285,21 +297,46 @@ def shifting(self, iteration, fdp):
                 if self.car_drivetrain == 1:
                     # don't down shift to gear 1, 2 when RWD
                     if gear >= 4:
-                        self.__down_shift(speed, target_down_speed, slip, iteration, gear)
+                        self.__down_shift(speed, target_down_speed, slip, iteration, gear, fdp)
                 else:
-                    self.__down_shift(speed, target_down_speed, slip, iteration, gear)
+                    self.__down_shift(speed, target_down_speed, slip, iteration, gear, fdp)
 
         return iteration
 
-    def __up_shift(self, rpm, target_rpm, speed, target_up_speed, slip, iteration, gear):
+    def __up_shift(self, rpm, target_rpm, speed, target_up_speed, slip, iteration, gear, fdp):
+        """up shift
+
+        Args:
+            rpm (float): rpm
+            target_rpm (float): target rpm to up shifting
+            speed (float): speed
+            target_up_speed (float): target speed to up shifting
+            slip (float): total combined slip of rear tires
+            iteration (int): package iteration
+            gear (int): current gear
+            fdp (ForzaPackage): Forza Package
+
+        Returns:
+            _type_: _description_
+        """
         if rpm > target_rpm and slip < 1 and speed > target_up_speed:
             self.logger.debug(f'[{iteration}] up shift triggerred. rpm > target rmp({rpm} > {target_rpm}), speed > target up speed ({speed} > {target_up_speed}), slip {slip}')
             gear_helper.up_shift_handle(gear, self)
             return True
         else:
             return False
 
-    def __down_shift(self, speed, target_down_speed, slip, iteration, gear):
+    def __down_shift(self, speed, target_down_speed, slip, iteration, gear, fdp):
+        """down shift
+
+        Args:
+            speed (float): speed
+            target_down_speed (float): target speed to down shifting
+            slip (float): total combined slip of rear tires
+            iteration (int): package iteration
+            gear (int): current gear
+            fdp (ForzaPackage): Forza Package
+        """
         if speed < target_down_speed * 0.95 and slip < 1:
             self.logger.debug(f'[{iteration}] down shift triggerred. speed < target down speed ({speed} < {target_down_speed}), slip {slip}')
             gear_helper.down_shift_handle(gear, self)
@@ -324,23 +361,16 @@ def run(self, update_tree_func=lambda *args: None, update_car_gui_func=lambda *a
                 if fdp is None or fdp.car_ordinal <= 0:
                     continue
 
-                update_car_gui_func(fdp)
+                self.threadPool.submit(update_car_gui_func, fdp)
 
                 # try to load config if:
                 # 1. self.shift_point is empty
                 # or
                 # 2. fdp.car_ordinal is different from self.ordinal => means car switched
-                if len(self.shift_point) <= 0 or self.ordinal != fdp.car_ordinal:
-                    self.__update_forza_info(fdp)
-                    if self.__try_auto_load_config(fdp):
-                        update_tree_func()
-                        continue
-                    else:
-                        return
-
-                self.__update_forza_info(fdp)
-                if iteration == -1:
-                    update_tree_func()
+                if not self.__update_forza_info(fdp):
+                    return
+                else:
+                    self.threadPool.submit(update_tree_func)
 
                 # enable reset car if exp or sp farming is True
                 if self.farming and fdp.car_ordinal > 0 and fdp.speed < 20 and time.time() - reset_time > 10:
diff --git a/helper.py b/helper.py
@@ -179,7 +179,7 @@ def dump_config(forza: CarInfo, config_version: ConfigVersion = constants.defaul
         forza.logger.debug(f'{dump_config.__name__} started')
         config = {
             # === dump data and result ===
-            'version': str(config_version),
+            'version': config_version.name,
             'ordinal': forza.ordinal,
             'perf': forza.car_perf,
             'class': forza.car_class,
@@ -198,6 +198,34 @@ def dump_config(forza: CarInfo, config_version: ConfigVersion = constants.defaul
         forza.logger.debug(f'{dump_config.__name__} ended')
 
 
+def get_config_version(forza: CarInfo, filename):
+    """get config file version
+
+    Args:
+        forza (CarInfo): forza
+        filename (_type_): config file name
+
+    Returns:
+        config version: config version
+    """
+    try:
+        with open(os.path.join(forza.config_folder, filename), "r") as f:
+            config = json.loads(f.read())
+
+        if 'version' in config:
+            if config['version'] == str(ConfigVersion.v2):
+                return ConfigVersion.v2
+            elif config['version'] == str(ConfigVersion.v1):
+                return ConfigVersion.v1
+            else:
+                return ConfigVersion[config['version']]
+        else:
+            return ConfigVersion.v1
+    except Exception as e:
+        forza.logger.warning(f'failed to get version of {filename}: {e}')
+        return ConfigVersion.v1
+
+
 def get_config_name(forza: CarInfo, config_version: ConfigVersion = constants.default_config_version):
     """get config name
 
@@ -232,13 +260,13 @@ def load_config(forza: CarInfo, path: str):
             forza.ordinal = int(config['ordinal'])
 
         if 'perf' in config:
-            forza.car_perf = str(config['perf'])
+            forza.car_perf = int(config['perf'])
 
         if 'class' in config:
-            forza.car_class = str(config['class'])
+            forza.car_class = int(config['class'])
 
         if 'drivetrain' in config:
-            forza.car_drivetrain = str(config['drivetrain'])
+            forza.car_drivetrain = int(config['drivetrain'])
 
         if 'minGear' in config:
             forza.minGear = config['minGear']
