Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
22 changes: 10 additions & 12 deletions VDCWorkbenchModels/Utilities/Blocks/MapFmuOutputsBusSignals.mo
Original file line number Diff line number Diff line change
Expand Up @@ -215,23 +215,21 @@ equation
index=-1,
extent={{-3,-6},{-3,-6}},
horizontalAlignment=TextAlignment.Right));
connect(orientation_error, orientation_error)
annotation (Line(points={{110,20},{110,20}}, color={0,0,127}));
connect(calc_orientation_error.u1, chassisBus.yawAngle) annotation (Line(
points={{-22,26},{-42,26},{-42,90},{-40,90}}, color={0,0,
127}), Text(
string="%second",
index=1,
extent={{-6,3},{-6,3}},
horizontalAlignment=TextAlignment.Right));
points={{-22,26},{-42,26},{-42,90},{-40,90}}, color={0,0,127}),
Text(
string="%second",
index=1,
extent={{-6,3},{-6,3}},
horizontalAlignment=TextAlignment.Right));
connect(calc_orientation_error.u2, motionDemandBus.psi_path) annotation (Line(
points={{-22,14},{-40,14},{-40,-14},{-58,-14},{-58,-18},{-60,-18},{-60,-20}},
color={0,0,127}),
Text(
string="%second",
index=1,
extent={{-6,3},{-6,3}},
horizontalAlignment=TextAlignment.Right));
string="%second",
index=1,
extent={{-6,3},{-6,3}},
horizontalAlignment=TextAlignment.Right));
connect(calcVelocityError.chassisBus, chassisBus) annotation (Line(
points={{-20,64},{-40,64},{-40,90}},
color={255,204,51},
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
within VDCWorkbenchModels.VehicleComponents.Powertrain.Components;
model SimpleBatteryAging
"Simple battery model based on a inner resistance and SOC_OCV table and aging parameterization"
import Modelica.Math.exp;

parameter VDCWorkbenchModels.Utilities.Types.StateOfCharge SOC_init = 1 "Initial value of SOC"
annotation (Dialog(group="Initialization"));
Expand Down
Loading