Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

MSL 4.1.0 Regressions: OpAmps/SignalGenerator #4485

Draft
wants to merge 2 commits into
base: master
Choose a base branch
from
Draft

MSL 4.1.0 Regressions: OpAmps/SignalGenerator #4485

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ee201fc
MSL 4.1.0 Regressions: Modelica/Electrical/Analog/Examples/OpAmps/Sig…
AHaumer Oct 21, 2024
163b01c
added analytic solution to Modelica/Electrical/Analog/Examples/OpAmps…
AHaumer Oct 22, 2024
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
13 changes: 11 additions & 2 deletions Modelica/Electrical/Analog/Examples/OpAmps/SignalGenerator.mo
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,7 @@ model SignalGenerator "Rectangle-Triangle generator"
Modelica.Electrical.Analog.Ideal.IdealizedOpAmpLimited opAmp1(
Vps=Vps,
Vns=Vns,
strict=false,
homotopyType=Modelica.Blocks.Types.LimiterHomotopy.LowerLimit)
strict=true)
annotation (Placement(transformation(extent={{-60,10},{-40,-10}})));
Modelica.Electrical.Analog.Basic.Resistor r2(R=R2, i(start=Vps/R2))
annotation (Placement(transformation(
Expand Down Expand Up @@ -47,6 +46,14 @@ model SignalGenerator "Rectangle-Triangle generator"
extent={{-10,10},{10,-10}},
rotation=270,
origin={60,-18})));
Blocks.Sources.Pulse pulse(
amplitude=Vps - Vns,
period=1/f,
offset=Vns,
startTime=0.025)
annotation (Placement(transformation(extent={{-40,-80},{-20,-60}})));
Blocks.Continuous.Integrator integrator(k=-4*f*VAmp/Vps)
annotation (Placement(transformation(extent={{50,-80},{70,-60}})));
equation
connect(opAmp1.out, r2.n) annotation (Line(
points={{-40,0},{-30,0},{-30,30},{-40,30}}, color={0,0,255}));
Expand Down Expand Up @@ -76,6 +83,8 @@ equation
points={{50,0},{60,0},{60,-8}}, color={0,0,255}));
connect(ground.p, vOutTriangle.n) annotation (Line(
points={{0,-40},{60,-40},{60,-28}}, color={0,0,255}));
connect(pulse.y,integrator. u)
annotation (Line(points={{-19,-70},{48,-70}}, color={0,0,127}));
annotation (Documentation(info="<html>
<p>This signal generator consists of a Schmitt trigger and an integrator. The output of the Schmitt trigger part opamp (opAmp1) is a rectangular signal with the amplitude VAmp and the frequency f.
The output of the integrator part opamp (opAmp2) is a triangular signal of also the amplitude Vamp and the frequency f.</p>
Expand Down