Skip to content

Commit

Permalink
fix car testing (#38)
Browse files Browse the repository at this point in the history 
* fix car testing

* update
  • Loading branch information
@Juice-XIJ
Juice-XIJ authored Apr 28, 2022
1 parent 167313e commit 582672a
Show file tree
Hide file tree
Showing 2 changed files with 22 additions and 16 deletions.
2 changes: 1 addition & 1 deletion constants.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,7 +92,7 @@ class ConfigVersion(enum.Enum):
delayShifttoClutch = 0.06 # delay between pressing shift and releasing clutch
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
blipThrottleDuration = 0.3 # blip the throttle duration. Should be short since keyboard is 100% acceleration output

# === Gear Shift Settings ===
shift_factor = 0.99
Expand Down
36 changes: 21 additions & 15 deletions forza.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@ def test_gear(self, update_car_gui_func=None):
continue

if fdp.speed > 0.1:
self.__update_forza_info(fdp)
self.__update_forza_info(fdp, dump=False)
if update_car_gui_func is not None:
update_car_gui_func(fdp)
info = {
Expand Down Expand Up @@ -144,7 +144,7 @@ def analyze(self, performance_profile: bool = True, is_gui: bool = False):
finally:
self.logger.debug(f'{self.analyze.__name__} ended')

def __update_forza_info(self, fdp: ForzaDataPacket, update_tree_func=lambda *args: None):
def __update_forza_info(self, fdp: ForzaDataPacket, update_tree_func=lambda *args: None, dump: bool = True):
"""update forza info while running
Args:
Expand All @@ -155,7 +155,10 @@ def __update_forza_info(self, fdp: ForzaDataPacket, update_tree_func=lambda *arg
self.car_perf = fdp.car_performance_index
self.car_class = fdp.car_class
self.car_drivetrain = fdp.drivetrain_type
res = self.__try_auto_load_config(fdp)
res = True
if dump:
res = self.__try_auto_load_config(fdp)

if update_tree_func is not None:
self.threadPool.submit(update_tree_func)
return res
Expand Down Expand Up @@ -208,7 +211,7 @@ def __try_auto_load_config(self, fdp: ForzaDataPacket):
return False

# unknown config
self.logger.warning(f'unknown ({fdp.car_ordinal}) config(s) {self.config_folder}: {configs}')
self.logger.warning(f'valid ({fdp.car_ordinal}) config(s) not found at {self.config_folder}: {configs}. Please run gear test ({constants.collect_data}) and/or analysis ({constants.analysis}) to create a new one!!')
return False
finally:
self.logger.debug(f'{self.__try_auto_load_config.__name__} ended')
Expand Down Expand Up @@ -267,12 +270,13 @@ 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
angle_slip = abs((fdp.tire_slip_angle_RL + fdp.tire_slip_angle_RR) / 2)
f_angle_slip = abs((fdp.tire_slip_angle_FL + fdp.tire_slip_angle_FR) / 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}')
self.logger.debug(f'[{iteration}] at gear {gear}. rpm {rpm}, speed {speed}, FRONT angle slip {f_angle_slip}, REAR angle slip {angle_slip}, slip {slip}, accel {accel}')

# up shift logic
if gear < self.maxGear and accel:
Expand All @@ -287,9 +291,9 @@ def shifting(self, iteration, fdp):
gear_helper.up_shift_handle(gear, self)
fired = True
else:
fired = self.__up_shift(rpm, target_rpm, speed, target_up_speed, slip, iteration, gear, fdp)
fired = self.__up_shift(rpm, target_rpm, speed, target_up_speed, slip, angle_slip, iteration, gear, fdp)
else:
fired = self.__up_shift(rpm, target_rpm, speed, target_up_speed, slip, iteration, gear, fdp)
fired = self.__up_shift(rpm, target_rpm, speed, target_up_speed, slip, angle_slip, iteration, gear, fdp)

# down shift logic
if not fired and gear > self.minGear:
Expand All @@ -300,13 +304,13 @@ 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, fdp)
self.__down_shift(speed, target_down_speed, slip, angle_slip, f_angle_slip, iteration, gear, fdp)
else:
self.__down_shift(speed, target_down_speed, slip, iteration, gear, fdp)
self.__down_shift(speed, target_down_speed, slip, angle_slip, f_angle_slip, iteration, gear, fdp)

return iteration

def __up_shift(self, rpm, target_rpm, speed, target_up_speed, slip, iteration, gear, fdp):
def __up_shift(self, rpm, target_rpm, speed, target_up_speed, slip, angle_slip, iteration, gear, fdp):
"""up shift
Args:
Expand All @@ -315,6 +319,7 @@ def __up_shift(self, rpm, target_rpm, speed, target_up_speed, slip, iteration, g
speed (float): speed
target_up_speed (float): target speed to up shifting
slip (float): total combined slip of rear tires
angle_slip (float): angle_slip
iteration (int): package iteration
gear (int): current gear
fdp (ForzaPackage): Forza Package
Expand All @@ -323,25 +328,26 @@ def __up_shift(self, rpm, target_rpm, speed, target_up_speed, slip, iteration, g
_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}')
self.logger.debug(f'[{iteration}] up shift triggerred. rpm > target rmp({rpm} > {target_rpm}), speed > target up speed ({speed} > {target_up_speed}), slip {slip}, {angle_slip}')
gear_helper.up_shift_handle(gear, self)
return True
else:
return False

def __down_shift(self, speed, target_down_speed, slip, iteration, gear, fdp):
def __down_shift(self, speed, target_down_speed, slip, angle_slip, f_angle_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
angle_slip (float): angle_slip
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}')
if speed < target_down_speed * 0.95 and slip < 1 and angle_slip < 0.9 and f_angle_slip < 0.9:
self.logger.debug(f'[{iteration}] down shift triggerred. speed < target down speed ({speed} < {target_down_speed}), slip {slip}, FRONT angle slip {f_angle_slip}, REAR angle_slip {angle_slip}')
gear_helper.down_shift_handle(gear, self)

def run(self, update_tree_func=lambda *args: None, update_car_gui_func=lambda *args: None):
Expand Down

0 comments on commit 582672a

Please sign in to comment.