Changeset 717

Timestamp:

10/18/2007 03:20:55 PM (15 months ago)

Author:

clauss

Message:

error fixed: Within gates the number of inputs was not given to the included Basic model correctly. Additionally: comment in pulse source removed.

Files:

• Modelica/trunk/Modelica/Electrical/Digital.mo (modified) (7 diffs)

Modelica/trunk/Modelica/Electrical/Digital.mo

@@ -3294 +3294 @@
       extends D.Interfaces.MISO;
       extends D.Delay.DelayParams;
-      D.Basic.And G1(final n)     annotation (Placement(transformation(extent={
+      D.Basic.And G1(final n=n)     annotation (Placement(transformation(extent={
                 {-40,-20},{0,20}}, rotation=0)));
       D.Delay.InertialDelaySensitive G2(
@@ -3428 +3428 @@
           Ellipse(extent=[60, -10; 40, 10], style(color=0, thickness=2))),
         Diagram);
-      D.Basic.Nand G1(final n)      annotation (Placement(transformation(extent=
+      D.Basic.Nand G1(final n=n)      annotation (Placement(transformation(extent=
                {{-40,-20},{0,20}}, rotation=0)));
       D.Delay.InertialDelaySensitive G2(
@@ -3448 +3448 @@
       extends D.Delay.DelayParams;
       extends D.Interfaces.MISO;
-      D.Basic.Or G1(final n)    annotation (Placement(transformation(extent={{
+      D.Basic.Or G1(final n=n)    annotation (Placement(transformation(extent={{
                 -40,-20},{0,20}}, rotation=0)));
       D.Delay.InertialDelaySensitive G2(
@@ -3509 +3509 @@
       extends D.Delay.DelayParams;
       extends D.Interfaces.MISO;
-      D.Basic.Nor G1(final n)     annotation (Placement(transformation(extent={
+      D.Basic.Nor G1(final n=n)     annotation (Placement(transformation(extent={
                 {-40,-20},{0,20}}, rotation=0)));
       D.Delay.InertialDelaySensitive G2(
@@ -3576 +3576 @@
       extends D.Delay.DelayParams;
       extends D.Interfaces.MISO;
-      D.Basic.Xor G1(final n)     annotation (Placement(transformation(extent={
+      D.Basic.Xor G1(final n=n)     annotation (Placement(transformation(extent={
                 {-40,-20},{0,20}}, rotation=0)));
       D.Delay.InertialDelaySensitive G2(
@@ -3637 +3637 @@
       extends D.Delay.DelayParams;
       extends D.Interfaces.MISO;
-      D.Basic.Xnor G1(final n)      annotation (Placement(transformation(extent=
+      D.Basic.Xnor G1(final n=n)      annotation (Placement(transformation(extent=
                {{-40,-20},{0,20}}, rotation=0)));
       D.Delay.InertialDelaySensitive G2(
@@ -4125 +4125 @@
               fillPattern=FillPattern.Solid)}));
       
-    /*
-algorithm 
-  if nperiod == 0 then
-    y := quiet;
-  elseif (nperiod >= np) or (nperiod < 0) then
-    when sample(startTime, period) then
-      T0 := time;
-      if (nperiod > 0) then
-        np := np + 1;
-      end if;
-    end when;
-    y := if (time < startTime or time >= T0 + ((width*period)/
-      100)) or not (nperiod >= np or nperiod < 0) then quiet else pulse;
-  else
-    y := quiet;
-  end if;
-*/
     protected 
       Boolean sampling;