Skip to content

Commit 6f60a37

Browse files
authored
Merge pull request #3058 from AHaumer/RenameMachinesControllers
Rename Machines Controllers
2 parents eada1ab + da803f7 commit 6f60a37

File tree

7 files changed

+262
-153
lines changed

7 files changed

+262
-153
lines changed

Modelica/Blocks/package.mo

Lines changed: 11 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -2512,7 +2512,8 @@ random number generator. This block is used in the example
25122512
origin={-50,90},
25132513
extent={{-10,-10},{10,10}},
25142514
rotation=270)));
2515-
Modelica.Electrical.Machines.Utilities.CurrentController currentController(p=smpm.p)
2515+
Modelica.Electrical.Machines.Utilities.DQToThreePhase dqToThreePhase(
2516+
p=smpm.p)
25162517
annotation (Placement(transformation(extent={{-50,40},{-30,60}})));
25172518
Modelica.Electrical.Polyphase.Basic.Star starM(final m=m) annotation (Placement(transformation(
25182519
extent={{-10,-10},{10,10}},
@@ -2604,10 +2605,10 @@ random number generator. This block is used in the example
26042605
points={{-10,60},{-10,90}}, color={0,0,255}));
26052606
connect(angleSensor.flange, rotorDisplacementAngle.flange) annotation (Line(
26062607
points={{10,-10},{10,-40}}));
2607-
connect(angleSensor.phi, currentController.phi) annotation (Line(
2608-
points={{10,11},{10,30},{-40,30},{-40,38}}, color={0,0,127}));
2608+
connect(angleSensor.phi, dqToThreePhase.phi) annotation (Line(points={{10,11},
2609+
{10,30},{-40,30},{-40,38}}, color={0,0,127}));
26092610
connect(groundM.p, terminalBox.starpoint) annotation (Line(
2610-
points={{-70,-28},{-19,-28},{-19,-24}}, color={0,0,255}));
2611+
points={{-70,-28},{-20,-28},{-20,-24}}, color={0,0,255}));
26112612
connect(smpm.flange, torqueSensor.flange_a) annotation (Line(
26122613
points={{0,-40},{40,-40}}));
26132614
connect(voltageQuasiRMSSensor.plug_p, terminalBox.plugSupply) annotation (
@@ -2617,8 +2618,8 @@ random number generator. This block is used in the example
26172618
points={{-50,-10},{-40,-10}}, color={0,0,255}));
26182619
connect(starM.pin_n, groundM.p) annotation (Line(
26192620
points={{-70,-10},{-70,-28}}, color={0,0,255}));
2620-
connect(currentController.y, signalCurrent.i) annotation (Line(
2621-
points={{-29,50},{-24,50},{-17,50}}, color={0,0,127}));
2621+
connect(dqToThreePhase.y, signalCurrent.i) annotation (Line(points={{
2622+
-29,50},{-22,50},{-22,50}}, color={0,0,127}));
26222623
connect(speedSensor.flange, smpm.flange) annotation (Line(
26232624
points={{30,-10},{30,-40},{0,-40}}));
26242625
connect(torqueSensor.flange_b, inertiaLoad.flange_a) annotation (Line(
@@ -2629,10 +2630,6 @@ random number generator. This block is used in the example
26292630
connect(currentQuasiRMSSensor.plug_n, voltageQuasiRMSSensor.plug_p)
26302631
annotation (Line(
26312632
points={{-10,-10},{-20,-10}}, color={0,0,255}));
2632-
connect(id.y, currentController.id_rms) annotation (Line(
2633-
points={{-69,70},{-60,70},{-60,56},{-52,56}}, color={0,0,127}));
2634-
connect(currentController.iq_rms, iq_rms1) annotation (Line(
2635-
points={{-52,44},{-100,44},{-100,60},{-120,60}}, color={0,0,127}));
26362633
connect(inertiaLoad.flange_b, flange) annotation (Line(
26372634
points={{90,-40},{90,-40},{90,0},{100,0}}));
26382635
connect(angleSensor.phi, addNoise.u2) annotation (Line(
@@ -2645,6 +2642,10 @@ random number generator. This block is used in the example
26452642
10}}, color={0,0,127}));
26462643
connect(angleSensor.phi, phi_motor) annotation (Line(points={{10,11},{10,11},{
26472644
10,22},{10,30},{70,30}}, color={0,0,127}));
2645+
connect(id.y, dqToThreePhase.d) annotation (Line(points={{-69,70},{-60,
2646+
70},{-60,56},{-52,56}}, color={0,0,127}));
2647+
connect(iq_rms1, dqToThreePhase.q) annotation (Line(points={{-120,60},
2648+
{-100,60},{-100,44},{-52,44}}, color={0,0,127}));
26482649
annotation (
26492650
Documentation(info="<html>
26502651
<p>

0 commit comments

Comments
 (0)