diff --git a/LapsimAndYMD/Functions/QueensRacingLAP.m b/LapsimAndYMD/Functions/QueensRacingLAP.m index 15a6945..c938e5b 100644 --- a/LapsimAndYMD/Functions/QueensRacingLAP.m +++ b/LapsimAndYMD/Functions/QueensRacingLAP.m @@ -1,4 +1,4 @@ -function [sim] = QueensRacingLAP(veh, tr) + function [sim] = QueensRacingLAP(veh, tr) %% Queens Racing LapSim Code % % Initially written by Maurice Nayman diff --git a/LapsimAndYMD/Functions/QueensRacingVEHICLE.m b/LapsimAndYMD/Functions/QueensRacingVEHICLE.m index 087b0b9..3ed4148 100644 --- a/LapsimAndYMD/Functions/QueensRacingVEHICLE.m +++ b/LapsimAndYMD/Functions/QueensRacingVEHICLE.m @@ -125,7 +125,7 @@ for i=1:veh.nog-1 veh.rownames(i) = {[num2str(i,'%d'),'-',num2str(i+1,'%d')]} ; end -veh.shifting = table(veh.shiftPoints,veh.arrivePoints,veh.revDrops,'RowNames',veh.rownames) ; +veh.shifting = table(veh.shiftPoints,veh.arrivePoints,veh.revDrops) ; % HUD disp('Shift points calculated successfully.') diff --git a/LapsimAndYMD/Templates/FSAE_QueensRacingVEHICLE_AMKDT7-75.xlsx b/LapsimAndYMD/Templates/FSAE_QueensRacingVEHICLE_AMKDT7-75.xlsx new file mode 100644 index 0000000..be2e038 Binary files /dev/null and b/LapsimAndYMD/Templates/FSAE_QueensRacingVEHICLE_AMKDT7-75.xlsx differ diff --git a/LapsimAndYMD/Templates/FSAE_QueensRacingVEHICLE_EMRAX208.xlsx b/LapsimAndYMD/Templates/FSAE_QueensRacingVEHICLE_EMRAX208.xlsx new file mode 100644 index 0000000..8878325 Binary files /dev/null and b/LapsimAndYMD/Templates/FSAE_QueensRacingVEHICLE_EMRAX208.xlsx differ diff --git a/LapsimAndYMD/Templates/FSAE_QueensRacingVEHICLE_EMRAX228.xlsx b/LapsimAndYMD/Templates/FSAE_QueensRacingVEHICLE_EMRAX228.xlsx new file mode 100644 index 0000000..951eabf Binary files /dev/null and b/LapsimAndYMD/Templates/FSAE_QueensRacingVEHICLE_EMRAX228.xlsx differ diff --git a/LapsimAndYMD/Templates/FSAE_QueensRacingVEHICLE_EMRAX268.xlsx b/LapsimAndYMD/Templates/FSAE_QueensRacingVEHICLE_EMRAX268.xlsx new file mode 100644 index 0000000..fd2f787 Binary files /dev/null and b/LapsimAndYMD/Templates/FSAE_QueensRacingVEHICLE_EMRAX268.xlsx differ diff --git a/LapsimAndYMD/Templates/FSAE_QueensRacingVEHICLE_YASAP400.xlsx b/LapsimAndYMD/Templates/FSAE_QueensRacingVEHICLE_YASAP400.xlsx new file mode 100644 index 0000000..a8a3f13 Binary files /dev/null and b/LapsimAndYMD/Templates/FSAE_QueensRacingVEHICLE_YASAP400.xlsx differ diff --git a/LapsimAndYMD/engineComparison.m b/LapsimAndYMD/engineComparison.m new file mode 100644 index 0000000..21b0049 --- /dev/null +++ b/LapsimAndYMD/engineComparison.m @@ -0,0 +1,33 @@ +%ADD PATH +%Add the template and function folders to the path + +addpath('Q:\Formula\VehicleDynamics_Modelling\LapsimAndYMD\Templates') +addpath('Q:\Formula\VehicleDynamics_Modelling\LapsimAndYMD\Functions') + +%FILES +%Input vehicle and track filenames +%Each file has motor weight and torque curves changed. +vehicleFile = 'FSAE_QueensRacingVEHICLE_AMKDT7-75.xlsx'; +% vehicleFile = 'FSAE_QueensRacingVEHICLE_EMRAX208.xlsx'; +% vehicleFile = 'FSAE_QueensRacingVEHICLE_EMRAX228.xlsx'; +% vehicleFile = 'FSAE_QueensRacingVEHICLE_EMRAX268.xlsx'; +% vehicleFile = 'FSAE_QueensRacingVEHICLE_YASAP400.xlsx'; + +trackFile = 'FSAE_Michigan2019_AutoX.xlsx'; + +%VEHICLE +%Run the QueensRacingVehicle file to generate the vehicle data +vehicle = QueensRacingVEHICLE(vehicleFile); + +%TRACK +%Run the QueensRacingTRACK to generate the track data +track = QueensRacingTRACK(trackFile, 'shape data'); + +%LAP +%Run QueensRacingLAP to run a given vehicle through the track +sim = QueensRacingLAP(vehicle, track); + +%MISC +%Useful information we want to extract +%wheel torque, engine torque, engine power, engine speed, gear +