v2p15. Compatible with MF-Swift v2306, passenger density parameterized.

mathworks · Sep 18, 2023 · d8270c2 · d8270c2
1 parent e6efa2f
commit d8270c2
Show file tree

Hide file tree

Showing 23 changed files with 12 additions and 5 deletions.
diff --git a/...Harness.type.File/Driveline.type.File.xml → ...le/sm_car_testrig_human.slx.type.File.xml b/...Harness.type.File/Driveline.type.File.xml → ...le/sm_car_testrig_human.slx.type.File.xml
diff --git a/...m_car_harness_driveline.slx.type.File.xml → ...wift.type.File/MFSwift_2306.type.File.xml b/...m_car_harness_driveline.slx.type.File.xml → ...wift.type.File/MFSwift_2306.type.File.xml
diff --git a/...veline.type.File/1.type.DIR_SIGNIFIER.xml → ...t_2306.type.File/1.type.DIR_SIGNIFIER.xml b/...veline.type.File/1.type.DIR_SIGNIFIER.xml → ...t_2306.type.File/1.type.DIR_SIGNIFIER.xml
diff --git a/....File/Steer_Column_Test.slx.type.File.xml → ....type.File/Tire_MFSwift.slx.type.File.xml b/....File/Steer_Column_Test.slx.type.File.xml → ....type.File/Tire_MFSwift.slx.type.File.xml
diff --git a/...linkProject/Root.type.ProjectPath/7225c065-6945-4688-a01e-9bdca0b5545c.type.Reference.xml b/...linkProject/Root.type.ProjectPath/7225c065-6945-4688-a01e-9bdca0b5545c.type.Reference.xml
diff --git a/...40cb-a405-21a28c2d31c8.type.Reference.xml → ...4bec-834e-2c9e5432f4e4.type.Reference.xml b/...40cb-a405-21a28c2d31c8.type.Reference.xml → ...4bec-834e-2c9e5432f4e4.type.Reference.xml
diff --git a/...4b29-af6c-6166567ddc76.type.Reference.xml → ...4200-aae6-379f8aa6b953.type.Reference.xml b/...4b29-af6c-6166567ddc76.type.Reference.xml → ...4200-aae6-379f8aa6b953.type.Reference.xml
diff --git a/Libraries/Vehicle/Body/Human/Human_Models.slx b/Libraries/Vehicle/Body/Human/Human_Models.slx
diff --git a/Libraries/Vehicle/Body/Human/sm_car_data_DriverHuman.xlsx b/Libraries/Vehicle/Body/Human/sm_car_data_DriverHuman.xlsx
diff --git a/Libraries/Vehicle/Body/Human/sm_car_data_Passenger.xlsx b/Libraries/Vehicle/Body/Human/sm_car_data_Passenger.xlsx
diff --git a/Libraries/Vehicle/Body/Human/sm_car_testrig_human.slx b/Libraries/Vehicle/Body/Human/sm_car_testrig_human.slx
diff --git a/Libraries/Vehicle/Driveline/Axle2/Driveline_Axle2_Testrig.slx b/Libraries/Vehicle/Driveline/Axle2/Driveline_Axle2_Testrig.slx
diff --git a/Libraries/Vehicle/Harness/Busses/sm_car_testrig_bus_VehBusWorld.slx b/Libraries/Vehicle/Harness/Busses/sm_car_testrig_bus_VehBusWorld.slx
diff --git a/Libraries/Vehicle/Harness/Driveline/sm_car_harness_driveline.slx b/Libraries/Vehicle/Harness/Driveline/sm_car_harness_driveline.slx
diff --git a/Libraries/Vehicle/Steer/Rack/Steer_Column_Test.slx b/Libraries/Vehicle/Steer/Rack/Steer_Column_Test.slx
diff --git a/Libraries/Vehicle/Tire/MFSwift/MFSwift_2306/Tire_MFSwift.slx b/Libraries/Vehicle/Tire/MFSwift/MFSwift_2306/Tire_MFSwift.slx
diff --git a/README.md b/README.md
@@ -30,6 +30,11 @@ adjust the libraries so that variant can be selected.
 3. Modify parameter values in the "Vehicle" data structure in the MATLAB workspace.
 
 ### **Release History**
+**v2.15 -- September 2023**
+1.  Mass and inertia of driver and passengers are adjustable
+2.  Added test harness to check driver and passenger mass
+3.  Compatible with MF-Swift v2306
+
 **v2.14 -- March 2023**
 1.  Adjusted hardpoints for all linkage suspensions (shorter control arms, shock placement)
 2.  Added linkage parameterizations for Sedan Hamba (Five Link Shock to Rear, Split Lower Arm Shock to Front)

diff --git a/Scripts_Data/Data_Vehicle/Presets/Trailer_01.mat b/Scripts_Data/Data_Vehicle/Presets/Trailer_01.mat
diff --git a/Scripts_Data/Data_Vehicle/Presets/Vehicle_000.mat b/Scripts_Data/Data_Vehicle/Presets/Vehicle_000.mat
diff --git a/Scripts_Data/Data_Vehicle/UI/sm_car_vehcfg.mlapp b/Scripts_Data/Data_Vehicle/UI/sm_car_vehcfg.mlapp
diff --git a/Scripts_Data/shutdown_sm_car.m b/Scripts_Data/shutdown_sm_car.m
@@ -1,6 +1,6 @@
 function shutdown_sm_car
 % Startup file for sm_car.slx Example
-% Copyright 2019-2022 The MathWorks, Inc.
+% Copyright 2019-2023 The MathWorks, Inc.
 
 curr_proj = simulinkproject;
 
@@ -36,7 +36,7 @@
 custom_code = dir('**/custom_abs.ssc');
 cd(custom_code.folder)
 cd('..')
-bdclose all
+bdclose('Custom_lib')
 pause(1)
 ssc_clean Custom
 cd(fileparts(which('sm_car.slx')))

diff --git a/Scripts_Data/sm_car_startupMFSwift.m b/Scripts_Data/sm_car_startupMFSwift.m
@@ -2,7 +2,7 @@
 % DETERMINE IF MF-SWIFT DIRECTORY IS ON PATH
 % CHECK IF TOOLBOX ALREADY ON PATH
 
-% Copyright 2014-2022 The MathWorks, Inc.
+% Copyright 2014-2023 The MathWorks, Inc.
 
 curr_proj = simulinkproject;
 path_preMFSwift = strsplit(path,';');
@@ -64,6 +64,8 @@
             library_path = [curr_proj.RootFolder filesep 'Libraries' filesep 'Vehicle' filesep 'Tire' filesep 'MFSwift' filesep 'MFSwift_2022p1'];
         elseif(mfswift_ver==2212)
             library_path = [curr_proj.RootFolder filesep 'Libraries' filesep 'Vehicle' filesep 'Tire' filesep 'MFSwift' filesep 'MFSwift_2212'];
+        elseif(mfswift_ver==2306)
+            library_path = [curr_proj.RootFolder filesep 'Libraries' filesep 'Vehicle' filesep 'Tire' filesep 'MFSwift' filesep 'MFSwift_2306'];
         end
         addpath(library_path);
         % Add opencrg tools to path
@@ -88,6 +90,8 @@
         library_path = [curr_proj.RootFolder filesep 'Libraries' filesep 'Vehicle' filesep 'Tire' filesep 'MFSwift' filesep 'MFSwift_2022p1'];
 	elseif(mfswift_ver==2212)
     	library_path = [curr_proj.RootFolder filesep 'Libraries' filesep 'Vehicle' filesep 'Tire' filesep 'MFSwift' filesep 'MFSwift_2212'];
+    elseif(mfswift_ver==2306)
+        library_path = [curr_proj.RootFolder filesep 'Libraries' filesep 'Vehicle' filesep 'Tire' filesep 'MFSwift' filesep 'MFSwift_2306'];
     end
     if(isempty(library_path))
         warning('off','backtrace')

diff --git a/Testrigs/Quarter_Car/sm_car_testrig_quarter_car_test_pushrodua_noSteer.slx b/Testrigs/Quarter_Car/sm_car_testrig_quarter_car_test_pushrodua_noSteer.slx