v2p14. Compatible with MF-Swift v2212, updated hardpoints.

mathworks · Mar 19, 2023 · 8c67f2d · 8c67f2d
1 parent cde5197
commit 8c67f2d
Show file tree

Hide file tree

Showing 164 changed files with 488 additions and 218 deletions.
diff --git a/.../sm_car_lib_harnessInfo.xml.type.File.xml → ...linkage_shock_hpu_IMAGE.png.type.File.xml b/.../sm_car_lib_harnessInfo.xml.type.File.xml → ...linkage_shock_hpu_IMAGE.png.type.File.xml
diff --git a/...ot.type.Files/Libraries.type.File/Vehicle.type.File/Linkage.type.File/Shock.type.File.xml b/...ot.type.Files/Libraries.type.File/Vehicle.type.File/Linkage.type.File/Shock.type.File.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Info>
+    <Category UUID="FileClassCategory">
+        <Label UUID="28727d18-c61e-4ad0-97da-d16cf001687d"/>
+    </Category>
+</Info>
diff --git a/...es.type.File/Vehicle.type.File/Linkage.type.File/Shock.type.File/1.type.DIR_SIGNIFIER.xml b/...es.type.File/Vehicle.type.File/Linkage.type.File/Shock.type.File/1.type.DIR_SIGNIFIER.xml
@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Info/>
diff --git a/....File/Vehicle.type.File/Linkage.type.File/Shock.type.File/Linkage_Shock.slx.type.File.xml b/....File/Vehicle.type.File/Linkage.type.File/Shock.type.File/Linkage_Shock.slx.type.File.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Info>
+    <Category UUID="FileClassCategory">
+        <Label UUID="28727d18-c61e-4ad0-97da-d16cf001687d"/>
+    </Category>
+</Info>
diff --git a/...s.type.File/Vehicle.type.File/Tire.type.File/MFSwift.type.File/MFSwift_2212.type.File.xml b/...s.type.File/Vehicle.type.File/Tire.type.File/MFSwift.type.File/MFSwift_2212.type.File.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Info>
+    <Category UUID="FileClassCategory">
+        <Label UUID="28727d18-c61e-4ad0-97da-d16cf001687d"/>
+    </Category>
+</Info>
diff --git a/...ype.File/Tire.type.File/MFSwift.type.File/MFSwift_2212.type.File/1.type.DIR_SIGNIFIER.xml b/...ype.File/Tire.type.File/MFSwift.type.File/MFSwift_2212.type.File/1.type.DIR_SIGNIFIER.xml
@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Info/>
diff --git a/...le/Tire.type.File/MFSwift.type.File/MFSwift_2212.type.File/Tire_MFSwift.slx.type.File.xml b/...le/Tire.type.File/MFSwift.type.File/MFSwift_2212.type.File/Tire_MFSwift.slx.type.File.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Info>
+    <Category UUID="FileClassCategory">
+        <Label UUID="28727d18-c61e-4ad0-97da-d16cf001687d"/>
+    </Category>
+</Info>
diff --git a/.../Data_Vehicle.type.File/Assemble_Vehicle.type.File/sm_car_vehcfg_checkHPs.m.type.File.xml b/.../Data_Vehicle.type.File/Assemble_Vehicle.type.File/sm_car_vehcfg_checkHPs.m.type.File.xml
@@ -0,0 +1,6 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Info>
+    <Category UUID="FileClassCategory">
+        <Label UUID="28727d18-c61e-4ad0-97da-d16cf001687d"/>
+    </Category>
+</Info>
diff --git a/...linkProject/Root.type.ProjectPath/75249e23-34c6-40ea-b90c-fb5bbd726d83.type.Reference.xml b/...linkProject/Root.type.ProjectPath/75249e23-34c6-40ea-b90c-fb5bbd726d83.type.Reference.xml
@@ -0,0 +1,2 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<Info Ref="Libraries/Vehicle/Linkage/Shock" Type="Relative"/>
diff --git a/...483b-86a4-77064fdafff3.type.Reference.xml → ...400b-b780-80dbc6ecf3eb.type.Reference.xml b/...483b-86a4-77064fdafff3.type.Reference.xml → ...400b-b780-80dbc6ecf3eb.type.Reference.xml
diff --git a/...461b-b9e9-22a3b2704dca.type.Reference.xml → ...436d-b16a-77d2dd91bdbb.type.Reference.xml b/...461b-b9e9-22a3b2704dca.type.Reference.xml → ...436d-b16a-77d2dd91bdbb.type.Reference.xml
diff --git a/Libraries/Images/sm_car_vehicle_linkage_shock_hpu_IMAGE.png b/Libraries/Images/sm_car_vehicle_linkage_shock_hpu_IMAGE.png
diff --git a/Libraries/Vehicle/AntiRollBar/sm_car_data_AntiRollBar_Droplink.xlsx b/Libraries/Vehicle/AntiRollBar/sm_car_data_AntiRollBar_Droplink.xlsx
diff --git a/Libraries/Vehicle/Brakes/Axle2/Brakes_Axle2_HydraulicValves_Channel4.slx b/Libraries/Vehicle/Brakes/Axle2/Brakes_Axle2_HydraulicValves_Channel4.slx
diff --git a/Libraries/Vehicle/Dampers/Damper/sm_car_data_Damper_Decoupled.xlsx b/Libraries/Vehicle/Dampers/Damper/sm_car_data_Damper_Decoupled.xlsx
diff --git a/Libraries/Vehicle/Dampers/Damper/sm_car_data_Damper_Linear.xlsx b/Libraries/Vehicle/Dampers/Damper/sm_car_data_Damper_Linear.xlsx
diff --git a/Libraries/Vehicle/Dampers/Damper/sm_car_data_Damper_Nonlinear.xlsx b/Libraries/Vehicle/Dampers/Damper/sm_car_data_Damper_Nonlinear.xlsx
diff --git a/Libraries/Vehicle/Harness/Body/sm_car_harness_body_to_world.slx b/Libraries/Vehicle/Harness/Body/sm_car_harness_body_to_world.slx
diff --git a/Libraries/Vehicle/Harness/Linkage/sm_car_harness_linkage.slx b/Libraries/Vehicle/Harness/Linkage/sm_car_harness_linkage.slx
diff --git a/Libraries/Vehicle/Harness/Utilities/sm_car_harness_transform_align2pts.slx b/Libraries/Vehicle/Harness/Utilities/sm_car_harness_transform_align2pts.slx
diff --git a/Libraries/Vehicle/Linkage/DW_A/Linkage_DW_A.slx b/Libraries/Vehicle/Linkage/DW_A/Linkage_DW_A.slx
diff --git a/Libraries/Vehicle/Linkage/DW_A/sm_car_data_Linkage_DW_A.xlsx b/Libraries/Vehicle/Linkage/DW_A/sm_car_data_Linkage_DW_A.xlsx
diff --git a/Libraries/Vehicle/Linkage/DW_B/Linkage_DW_B.slx b/Libraries/Vehicle/Linkage/DW_B/Linkage_DW_B.slx
diff --git a/Libraries/Vehicle/Linkage/DW_B/sm_car_data_Linkage_DW_B.xlsx b/Libraries/Vehicle/Linkage/DW_B/sm_car_data_Linkage_DW_B.xlsx
diff --git a/Libraries/Vehicle/Linkage/DW_Decoupled/Linkage_DW_Decoupled.slx b/Libraries/Vehicle/Linkage/DW_Decoupled/Linkage_DW_Decoupled.slx
diff --git a/Libraries/Vehicle/Linkage/DW_Decoupled/Linkage_DW_Decoupled_NoSteer.slx b/Libraries/Vehicle/Linkage/DW_Decoupled/Linkage_DW_Decoupled_NoSteer.slx
diff --git a/Libraries/Vehicle/Linkage/DW_PushUA/Linkage_DW_PushUA.slx b/Libraries/Vehicle/Linkage/DW_PushUA/Linkage_DW_PushUA.slx
diff --git a/Libraries/Vehicle/Linkage/DW_PushUA/Linkage_DW_PushUA_NoSteer.slx b/Libraries/Vehicle/Linkage/DW_PushUA/Linkage_DW_PushUA_NoSteer.slx
diff --git a/Libraries/Vehicle/Linkage/DW_PushUA/sm_car_data_Linkage_DW_PushUA.xlsx b/Libraries/Vehicle/Linkage/DW_PushUA/sm_car_data_Linkage_DW_PushUA.xlsx
diff --git a/Libraries/Vehicle/Linkage/DW_PushUA/sm_car_data_Linkage_DW_PushUA_noSteer.xlsx b/Libraries/Vehicle/Linkage/DW_PushUA/sm_car_data_Linkage_DW_PushUA_noSteer.xlsx
diff --git a/Libraries/Vehicle/Linkage/Link5C_S2LAF/Linkage_Link5C_S2LAF.slx b/Libraries/Vehicle/Linkage/Link5C_S2LAF/Linkage_Link5C_S2LAF.slx
diff --git a/Libraries/Vehicle/Linkage/Link5_Decoupled/Linkage_Link5_Decoupled.slx b/Libraries/Vehicle/Linkage/Link5_Decoupled/Linkage_Link5_Decoupled.slx
diff --git a/Libraries/Vehicle/Linkage/Link5_S2LAF/Linkage_Link5_S2LAF.slx b/Libraries/Vehicle/Linkage/Link5_S2LAF/Linkage_Link5_S2LAF.slx
diff --git a/Libraries/Vehicle/Linkage/Link5_S2LAF/sm_car_data_Linkage_Link5_S2LAF.xlsx b/Libraries/Vehicle/Linkage/Link5_S2LAF/sm_car_data_Linkage_Link5_S2LAF.xlsx
diff --git a/Libraries/Vehicle/Linkage/Link5_S2LAR/Linkage_Link5_S2LAR.slx b/Libraries/Vehicle/Linkage/Link5_S2LAR/Linkage_Link5_S2LAR.slx
diff --git a/Libraries/Vehicle/Linkage/Link5_S2LAR/sm_car_data_Linkage_Link5_S2LAR.xlsx b/Libraries/Vehicle/Linkage/Link5_S2LAR/sm_car_data_Linkage_Link5_S2LAR.xlsx
diff --git a/Libraries/Vehicle/Linkage/Linkage_Decoupled_Systems.slx b/Libraries/Vehicle/Linkage/Linkage_Decoupled_Systems.slx
diff --git a/Libraries/Vehicle/Linkage/Linkage_Systems.slx b/Libraries/Vehicle/Linkage/Linkage_Systems.slx
diff --git a/Libraries/Vehicle/Linkage/RollHeave_Decoupled/RollHeave_Decoupled.slx b/Libraries/Vehicle/Linkage/RollHeave_Decoupled/RollHeave_Decoupled.slx
diff --git a/Libraries/Vehicle/Linkage/Shock/Linkage_Shock.slx b/Libraries/Vehicle/Linkage/Shock/Linkage_Shock.slx
diff --git a/Libraries/Vehicle/Linkage/SpLA_S2LAF/Linkage_SpLA_S2LAF.slx b/Libraries/Vehicle/Linkage/SpLA_S2LAF/Linkage_SpLA_S2LAF.slx
diff --git a/Libraries/Vehicle/Linkage/SpLA_S2LAF/sm_car_data_Linkage_SpLA_S2LAF.xlsx b/Libraries/Vehicle/Linkage/SpLA_S2LAF/sm_car_data_Linkage_SpLA_S2LAF.xlsx
diff --git a/Libraries/Vehicle/Linkage/SpLA_S2LAR/Linkage_SpLA_S2LAR.slx b/Libraries/Vehicle/Linkage/SpLA_S2LAR/Linkage_SpLA_S2LAR.slx
diff --git a/Libraries/Vehicle/Linkage/SpLA_S2LAR/sm_car_data_Linkage_SpLA_S2LAR.xlsx b/Libraries/Vehicle/Linkage/SpLA_S2LAR/sm_car_data_Linkage_SpLA_S2LAR.xlsx
diff --git a/Libraries/Vehicle/Linkage/Suspension_Linkage.slx b/Libraries/Vehicle/Linkage/Suspension_Linkage.slx
diff --git a/Libraries/Vehicle/Linkage/Suspension_Linkage_Decoupled.slx b/Libraries/Vehicle/Linkage/Suspension_Linkage_Decoupled.slx
diff --git a/Libraries/Vehicle/Springs/Axle2/sm_car_data_Springs_Axle2_Linear.xlsx b/Libraries/Vehicle/Springs/Axle2/sm_car_data_Springs_Axle2_Linear.xlsx
diff --git a/Libraries/Vehicle/Springs/Spring/sm_car_data_Spring_Decoupled.xlsx b/Libraries/Vehicle/Springs/Spring/sm_car_data_Spring_Decoupled.xlsx
diff --git a/Libraries/Vehicle/Springs/Spring/sm_car_data_Spring_Linear.xlsx b/Libraries/Vehicle/Springs/Spring/sm_car_data_Spring_Linear.xlsx
diff --git a/Libraries/Vehicle/Springs/Spring/sm_car_data_Spring_Nonlinear.xlsx b/Libraries/Vehicle/Springs/Spring/sm_car_data_Spring_Nonlinear.xlsx
diff --git a/Libraries/Vehicle/Steer/Rack/sm_car_data_Steer_Rack.xlsx b/Libraries/Vehicle/Steer/Rack/sm_car_data_Steer_Rack.xlsx
diff --git a/Libraries/Vehicle/Steer/Rack/sm_car_data_Steer_Rack_Column.xlsx b/Libraries/Vehicle/Steer/Rack/sm_car_data_Steer_Rack_Column.xlsx
diff --git a/Libraries/Vehicle/Steer/Rack/sm_car_testrig_steering.slx b/Libraries/Vehicle/Steer/Rack/sm_car_testrig_steering.slx
diff --git a/Libraries/Vehicle/Tire/Data_TIR/Truck_430_50R38.tir b/Libraries/Vehicle/Tire/Data_TIR/Truck_430_50R38.tir
@@ -92,9 +92,6 @@ $--------------------------------------------------------contact_patch
 [CONTACT_PATCH]
 Q_RA1                    = 0.6715            $Square root term in contact length equation
 Q_RA2                    = 0.7308            $Linear term in contact length equation
-Q_LBF                    = 1                 $Length of basic function
-Q_LOS1                   = 0                 $Basic function offset threshold
-Q_LOS2                   = 0.2               $Basic function offset scaling factor with basic function length
 Q_RB1                    = 1.0588            $Root term in contact width equation
 ELLIPS_SHIFT             = 0.8               $Scaling of distance between front and rear ellipsoid
 ELLIPS_LENGTH            = 1                 $Semi major axis of ellipsoid

diff --git a/Libraries/Vehicle/Tire/MFSwift/MFSwift_2212/Tire_MFSwift.slx b/Libraries/Vehicle/Tire/MFSwift/MFSwift_2212/Tire_MFSwift.slx
diff --git a/Libraries/Vehicle/Tire/MFSwift/sm_car_check_mfswiftversion.m b/Libraries/Vehicle/Tire/MFSwift/sm_car_check_mfswiftversion.m
@@ -8,6 +8,9 @@
 bdclose('mfswift_simscape_library');
 
 check_string = 'MF-Swift v';
+NL = regexp(mask_descr, '[\n]');
+
 vers_str_index = strfind(mask_descr,check_string)+length(check_string);
 
-mfswift_ver = mask_descr(vers_str_index:vers_str_index+5);
+%mfswift_ver = mask_descr(vers_str_index:vers_str_index+5);
+mfswift_ver = mask_descr(vers_str_index:NL(end)-1);
diff --git a/Libraries/Vehicle/Tire/TireBody/TireBody_Models.slx b/Libraries/Vehicle/Tire/TireBody/TireBody_Models.slx
diff --git a/Libraries/Vehicle/Utilities/Camera/sm_car_testrig_Camera.slx b/Libraries/Vehicle/Utilities/Camera/sm_car_testrig_Camera.slx
diff --git a/Libraries/Vehicle/Vehicle/Vehicle_Axle1_Testrig.slx b/Libraries/Vehicle/Vehicle/Vehicle_Axle1_Testrig.slx
diff --git a/Libraries/sm_car_lib.slx b/Libraries/sm_car_lib.slx
diff --git a/Libraries/sm_car_lib_harnessInfo.xml b/Libraries/sm_car_lib_harnessInfo.xml