Sync with hev-devel-clean

Author: Isaac-Ito-MW

Components/BatteryHighVoltageBasic/BatteryHVBasic_refsub.slx

@@ -1,18 +1,9 @@
 %% Parameters for Power-Split HEV Speed Tracking Driver
-% Note that this script depends on some work space variables for plant
+% Note that this script depends on some parameters for plant
 % which must be defined upfront elsewhere.
 
 % Copyright 2021 The MathWorks, Inc.
 
-%% Initial Conditions
-% These are for controller/driver only.
-% ICs for plant are defined elsewhere.
-
-initial.driverHVBattSOC_pct = 85;
-
-initial.driverBrakeForce_N = 8000;
-initial.driverBrakeOn_tf = true;
-
 %% Power-Split HEV Speed Tracking Driver
 
 driver.tireRadius_m = vehicle.tireRollingRadius_m;
@@ -22,8 +13,9 @@
 driver.brakeForceMax_N = 8000;
 driver.brakeRate_N_per_s = 1000;
 
-driver.hvbattCapacity_Ahr = batteryHighVoltage.capacity_Ahr;
-driver.hvbattSocHighMid_pct = 90;
+driver.hvbattNominalCapacity_kWh = batteryHighVoltage.nominalCapacity_kWh;
+driver.hvbattVoltagePerCell_V = batteryHighVoltage.voltagePerCell_V;
+driver.hvbattSocHighMid_pct = 80;
 driver.hvbattSocMidLow_pct = 70;
 driver.hvbattSocLowEmpty_pct = 6;
 
@@ -42,10 +34,19 @@
 
 % Engine On Off logic for Engine and MG1 control:
 driver.engOnVehSpd_kph = 50;  % Always use engine above this threshold
-driver.chgSpd_kph = 70;  % Threshold vehicle speed to charge battery if driving while charge level not high
+driver.chgSpd_kph = 60;  % Threshold vehicle speed to charge battery if driving while charge level not high
 
 % Engine Controller:
 driver.engTrqMax_Nm = engine.trqMax_Nm;
 driver.engGenTrqCmd_Nm = 120;
 driver.engKi = 15;
 driver.engKp = 15;
+
+%% Initial Conditions
+% These are for controller/driver only.
+% ICs for plant are defined elsewhere.
+
+initial.driverHVBattSOC_pct = initial.highVoltageBatterySOC_pct;
+
+initial.driverBrakeForce_N = 8000;
+initial.driverBrakeOn_tf = true;

Components/DcDcConverterBasic/DcDcConverterBasic_refsub.slx

@@ -14,7 +14,7 @@
 
 %% Parameters
 
-batteryHighVoltage.capacity_Ahr = 50;
+batteryHighVoltage.capacity_Ahr = 2500;  % about 9kWh in Li-ion (3.5V-3.7V cell)
 batteryHighVoltage.voltage_V = 650;
 batteryHighVoltage.internal_R_Ohm = 0.1;