Changeset 718
- Timestamp:
- 10/19/2007 10:15:55 AM (15 months ago)
- Files:
-
- 1 modified
-
Modelica/trunk/Modelica/Electrical/Digital.mo (modified) (26 diffs)
Legend:
- Unmodified
- Added
- Removed
-
Modelica/trunk/Modelica/Electrical/Digital.mo
r717 r718 2346 2346 2347 2347 type Logic = enumeration( 2348 'U' "U ninitialized",2349 'X' " Forcing Unknown",2350 '0' " Forcing 0",2351 '1' " Forcing 1",2352 'Z' " High Impedance",2353 'W' "W eak Unknown",2354 'L' " Weak 0",2355 'H' " Weak 1",2356 '-' " Don't care")2348 'U' "U Uninitialized", 2349 'X' "X Forcing Unknown", 2350 '0' "0 Forcing 0", 2351 '1' "1 Forcing 1", 2352 'Z' "Z High Impedance", 2353 'W' "W Weak Unknown", 2354 'L' "L Weak 0", 2355 'H' "H Weak 1", 2356 '-' "- Don't care") 2357 2357 "Logic values and their coding according to IEEE 1164 STD_ULOGIC type" 2358 2358 annotation (Documentation(info="<html> … … 2394 2394 Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{ 2395 2395 100,100}}), graphics={Rectangle( 2396 extent={{-100,-100},{100,100}}, 2397 lineColor={127,0,127}, 2398 fillColor={127,0,127}, 2396 extent={{-100,-100},{100,100}}, 2397 lineColor={127,0,127}, 2398 fillColor={127,0,127}, 2399 2399 fillPattern=FillPattern.Solid)}), 2400 2400 Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100}, 2401 2401 {100,100}}), graphics={Text( 2402 extent={{-150,-100},{150,-160}}, 2403 lineColor={127,0,127}, 2404 fillColor={127,0,127}, 2405 fillPattern=FillPattern.Solid, 2402 extent={{-150,-100},{150,-160}}, 2403 lineColor={127,0,127}, 2404 fillColor={127,0,127}, 2405 fillPattern=FillPattern.Solid, 2406 2406 textString="%name"), Rectangle( 2407 extent={{-100,-100},{100,100}}, 2408 lineColor={127,0,127}, 2409 fillColor={127,0,127}, 2407 extent={{-100,-100},{100,100}}, 2408 lineColor={127,0,127}, 2409 fillColor={127,0,127}, 2410 2410 fillPattern=FillPattern.Solid)}), 2411 2411 Documentation(info="<html> … … 2441 2441 annotation (Placement(transformation(extent={{90,-10},{110, 2442 2442 10}}, rotation=0))); 2443 annotation (Diagram(graphics), Icon( 2443 annotation (Diagram(coordinateSystem(preserveAspectRatio=false, extent={{ 2444 -100,-100},{100,100}}), 2445 graphics), Icon( 2444 2446 coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{ 2445 2447 100,100}}), graphics={Rectangle( 2446 extent={{-50,100},{50,-100}}, 2447 lineColor={0,0,0}, 2448 lineThickness=2, 2449 fillColor={255,255,255}, 2450 fillPattern=FillPattern.Solid), Line(points={{50,0},{92,0}}, 2448 extent={{-50,100},{50,-100}}, 2449 lineColor={0,0,0}, 2450 lineThickness=2, 2451 fillColor={255,255,255}, 2452 fillPattern=FillPattern.Solid), Line(points={{50,0},{92,0}}, 2451 2453 color={127,0,127})}), 2452 2454 Documentation(info="<html> … … 2467 2469 annotation (Icon(coordinateSystem(preserveAspectRatio=false, extent={{ 2468 2470 -100,-100},{100,100}}), graphics={Rectangle( 2469 extent={{-50,100},{50,-100}}, 2470 lineColor={0,0,0}, 2471 lineThickness=2, 2472 fillColor={255,255,255}, 2473 fillPattern=FillPattern.Solid), Line(points={{50,0},{90,0}}, 2471 extent={{-50,100},{50,-100}}, 2472 lineColor={0,0,0}, 2473 lineThickness=2, 2474 fillColor={255,255,255}, 2475 fillPattern=FillPattern.Solid), Line(points={{50,0},{90,0}}, 2474 2476 color={127,0,127})}), 2475 Diagram(graphics), 2477 Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100, 2478 -100},{100,100}}), 2479 graphics), 2476 2480 Documentation(info="<html> 2477 2481 … … 2641 2645 </ul> 2642 2646 </HTML>"), 2643 Icon( graphics={2644 Text(2645 extent={{152,-160},{-148,-100}},2646 lineColor={0,0,255},2647 textString=2648 "%name"),2647 Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{100, 2648 100}}), graphics={ 2649 Text( 2650 extent={{152,-160},{-148,-100}}, 2651 lineColor={0,0,255}, 2652 textString="%name"), 2649 2653 Rectangle( 2650 extent={{-50,100},{50,-100}}, 2651 lineColor={0,0,0}, 2652 lineThickness=2, 2653 fillColor={213,170,255}, 2654 fillPattern=FillPattern.Solid), 2655 Polygon(points={{-6,60},{-16,40},{4,40},{-6,60}}, lineColor={0,0,0}), 2654 extent={{-50,100},{50,-100}}, 2655 lineColor={0,0,0}, 2656 lineThickness=2, 2657 fillColor={213,170,255}, 2658 fillPattern=FillPattern.Solid), 2659 Polygon(points={{-6,60},{-16,40},{4,40},{-6,60}}, lineColor={0,0,0}), 2660 2656 2661 Line( 2657 points={{0,60},{20,60}}, 2658 color={0,0,0}, 2659 fillPattern=FillPattern.Solid), 2662 points={{0,60},{20,60}}, 2663 color={0,0,0}, 2664 fillPattern=FillPattern.Solid), 2660 2665 Line( 2661 points={{10,60},{10,40}}, 2662 color={0,0,0}, 2663 fillPattern=FillPattern.Solid), 2664 Text( 2665 extent={{-50,-40},{50,-20}}, 2666 lineColor={0,0,0}, 2667 lineThickness=2, 2668 fillPattern=FillPattern.Solid, 2669 textString= 2670 "Transport"), 2671 Text( 2672 extent={{-50,-60},{50,-40}}, 2673 lineColor={0,0,0}, 2674 lineThickness=2, 2675 fillPattern=FillPattern.Solid, 2676 textString= 2677 "Delay")})); 2666 points={{10,60},{10,40}}, 2667 color={0,0,0}, 2668 fillPattern=FillPattern.Solid), 2669 Text( 2670 extent={{-50,-40},{50,-20}}, 2671 lineColor={0,0,0}, 2672 lineThickness=2, 2673 fillPattern=FillPattern.Solid, 2674 textString="Transport"), 2675 Text( 2676 extent={{-50,-60},{50,-40}}, 2677 lineColor={0,0,0}, 2678 lineThickness=2, 2679 fillPattern=FillPattern.Solid, 2680 textString="Delay")})); 2678 2681 2679 2682 end TransportDelay; … … 2718 2721 </HTML>"), 2719 2722 Diagram(graphics), 2720 Icon( graphics={2721 Text(2722 extent={{152,-160},{-148,-100}},2723 lineColor={0,0,255},2724 textString=2725 "%name"),2723 Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{ 2724 100,100}}), graphics={ 2725 Text( 2726 extent={{152,-160},{-148,-100}}, 2727 lineColor={0,0,255}, 2728 textString="%name"), 2726 2729 Rectangle( 2727 extent={{-50,100},{50,-100}}, 2728 lineColor={0,0,0}, 2729 lineThickness=2, 2730 fillColor={213,170,255}, 2731 fillPattern=FillPattern.Solid), 2732 Polygon(points={{-6,60},{-16,40},{4,40},{-6,60}}, lineColor={0,0,0}), 2730 extent={{-50,100},{50,-100}}, 2731 lineColor={0,0,0}, 2732 lineThickness=2, 2733 fillColor={213,170,255}, 2734 fillPattern=FillPattern.Solid), 2735 Polygon(points={{-6,60},{-16,40},{4,40},{-6,60}}, lineColor={0,0,0}), 2736 2733 2737 Line( 2734 points={{10,60},{10,40}}, 2735 color={0,0,0}, 2736 fillPattern=FillPattern.Solid), 2738 points={{10,60},{10,40}}, 2739 color={0,0,0}, 2740 fillPattern=FillPattern.Solid), 2737 2741 Line( 2738 points={{0,60},{20,60}}, 2739 color={0,0,0}, 2740 fillPattern=FillPattern.Solid), 2741 Text( 2742 extent={{-50,-40},{50,-20}}, 2743 lineColor={0,0,0}, 2744 lineThickness=2, 2745 fillPattern=FillPattern.Solid, 2746 textString= 2747 "Inertial"), 2748 Text( 2749 extent={{-50,-60},{50,-40}}, 2750 lineColor={0,0,0}, 2751 lineThickness=2, 2752 fillPattern=FillPattern.Solid, 2753 textString= 2754 "Delay")})); 2742 points={{0,60},{20,60}}, 2743 color={0,0,0}, 2744 fillPattern=FillPattern.Solid), 2745 Text( 2746 extent={{-50,-40},{50,-20}}, 2747 lineColor={0,0,0}, 2748 lineThickness=2, 2749 fillPattern=FillPattern.Solid, 2750 textString="Inertial"), 2751 Text( 2752 extent={{-50,-60},{50,-40}}, 2753 lineColor={0,0,0}, 2754 lineThickness=2, 2755 fillPattern=FillPattern.Solid, 2756 textString="Delay")})); 2755 2757 2756 2758 end InertialDelay; … … 2814 2816 </HTML>"), 2815 2817 Diagram(graphics), 2816 Icon( graphics={2817 Text(2818 extent={{152,-160},{-148,-100}},2819 lineColor={0,0,255},2820 textString=2821 "%name"),2818 Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{ 2819 100,100}}), graphics={ 2820 Text( 2821 extent={{152,-160},{-148,-100}}, 2822 lineColor={0,0,255}, 2823 textString="%name"), 2822 2824 Rectangle( 2823 extent={{-50,100},{50,-100}}, 2824 lineColor={0,0,0}, 2825 lineThickness=2, 2826 fillColor={213,170,255}, 2827 fillPattern=FillPattern.Solid), 2828 Text( 2829 extent={{-50,-40},{50,-20}}, 2830 lineColor={0,0,0}, 2831 lineThickness=2, 2832 fillPattern=FillPattern.Solid, 2833 textString= 2834 "Inertial"), 2835 Text( 2836 extent={{-50,-60},{50,-40}}, 2837 lineColor={0,0,0}, 2838 lineThickness=2, 2839 fillPattern=FillPattern.Solid, 2840 textString= 2841 "Delay"), 2842 Text( 2843 extent={{-50,-80},{50,-60}}, 2844 lineColor={0,0,0}, 2845 lineThickness=2, 2846 fillPattern=FillPattern.Solid, 2847 textString= 2848 "sensitive"), 2849 Polygon(points={{-6,60},{-16,40},{4,40},{-6,60}}, lineColor={0,0,0}), 2825 extent={{-50,100},{50,-100}}, 2826 lineColor={0,0,0}, 2827 lineThickness=2, 2828 fillColor={213,170,255}, 2829 fillPattern=FillPattern.Solid), 2830 Text( 2831 extent={{-50,-40},{50,-20}}, 2832 lineColor={0,0,0}, 2833 lineThickness=2, 2834 fillPattern=FillPattern.Solid, 2835 textString="Inertial"), 2836 Text( 2837 extent={{-50,-60},{50,-40}}, 2838 lineColor={0,0,0}, 2839 lineThickness=2, 2840 fillPattern=FillPattern.Solid, 2841 textString="Delay"), 2842 Text( 2843 extent={{-50,-80},{50,-60}}, 2844 lineColor={0,0,0}, 2845 lineThickness=2, 2846 fillPattern=FillPattern.Solid, 2847 textString="sensitive"), 2848 Polygon(points={{-6,60},{-16,40},{4,40},{-6,60}}, lineColor={0,0,0}), 2849 2850 2850 Line( 2851 points={{10,60},{10,40}}, 2852 color={0,0,0}, 2853 fillPattern=FillPattern.Solid), 2851 points={{10,60},{10,40}}, 2852 color={0,0,0}, 2853 fillPattern=FillPattern.Solid), 2854 2854 Line( 2855 points={{0,60},{20,60}}, 2856 color={0,0,0}, 2855 points={{0,60},{20,60}}, 2856 color={0,0,0}, 2857 2857 fillPattern=FillPattern.Solid)})); 2858 2858 … … 2915 2915 100,100}}), graphics={ 2916 2916 Text( 2917 extent={{-50,40},{50,80}}, 2918 lineColor={0,0,0}, 2919 lineThickness=2, 2920 fillPattern=FillPattern.Solid, 2921 textString="1"), 2922 Text( 2923 extent={{152,-160},{-148,-100}}, 2924 lineColor={0,0,255}, 2925 textString="%name"), 2917 extent={{-50,40},{50,80}}, 2918 lineColor={0,0,0}, 2919 lineThickness=2, 2920 fillPattern=FillPattern.Solid, 2921 textString="1"), 2922 Text( 2923 extent={{152,-160},{-148,-100}}, 2924 lineColor={0,0,255}, 2925 textString="%name"), 2926 2926 Ellipse( 2927 extent={{50,6},{62,-6}}, 2928 lineColor={0,0,0}, 2929 lineThickness=2, 2930 fillColor={255,255,255}, 2927 extent={{50,6},{62,-6}}, 2928 lineColor={0,0,0}, 2929 lineThickness=2, 2930 fillColor={255,255,255}, 2931 2931 fillPattern=FillPattern.Solid)}), 2932 2932 Diagram(graphics)); … … 2963 2963 Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{ 2964 2964 100,100}}), graphics={Text( 2965 extent={{-50,40},{50,80}}, 2966 lineColor={0,0,0}, 2967 lineThickness=2, 2968 fillPattern=FillPattern.Solid, 2965 extent={{-50,40},{50,80}}, 2966 lineColor={0,0,0}, 2967 lineThickness=2, 2968 fillPattern=FillPattern.Solid, 2969 2969 textString="&"), Text( 2970 extent={{152,-160},{-148,-100}}, 2971 lineColor={0,0,255}, 2970 extent={{152,-160},{-148,-100}}, 2971 lineColor={0,0,255}, 2972 2972 textString="%name")}), 2973 2973 Diagram(graphics)); … … 3005 3005 100,100}}), graphics={ 3006 3006 Text( 3007 extent={{-50,40},{50,80}}, 3008 lineColor={0,0,0}, 3009 lineThickness=2, 3010 fillPattern=FillPattern.Solid, 3011 textString="&"), 3012 Text( 3013 extent={{152,-160},{-148,-100}}, 3014 lineColor={0,0,255}, 3015 textString="%name"), 3007 extent={{-50,40},{50,80}}, 3008 lineColor={0,0,0}, 3009 lineThickness=2, 3010 fillPattern=FillPattern.Solid, 3011 textString="&"), 3012 Text( 3013 extent={{152,-160},{-148,-100}}, 3014 lineColor={0,0,255}, 3015 textString="%name"), 3016 3016 Ellipse( 3017 extent={{50,6},{62,-6}}, 3018 lineColor={0,0,0}, 3019 lineThickness=2, 3020 fillColor={255,255,255}, 3017 extent={{50,6},{62,-6}}, 3018 lineColor={0,0,0}, 3019 lineThickness=2, 3020 fillColor={255,255,255}, 3021 3021 fillPattern=FillPattern.Solid)}), 3022 3022 Diagram(graphics)); … … 3053 3053 Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{ 3054 3054 100,100}}), graphics={Text( 3055 extent={{-50,40},{50,80}}, 3056 lineColor={0,0,0}, 3057 lineThickness=2, 3058 fillPattern=FillPattern.Solid, 3055 extent={{-50,40},{50,80}}, 3056 lineColor={0,0,0}, 3057 lineThickness=2, 3058 fillPattern=FillPattern.Solid, 3059 3059 textString=">=1"), Text( 3060 extent={{152,-160},{-148,-100}}, 3061 lineColor={0,0,255}, 3060 extent={{152,-160},{-148,-100}}, 3061 lineColor={0,0,255}, 3062 3062 textString="%name")}), 3063 3063 Diagram(graphics)); … … 3095 3095 100,100}}), graphics={ 3096 3096 Text( 3097 extent={{-50,40},{50,80}}, 3098 lineColor={0,0,0}, 3099 lineThickness=2, 3100 fillPattern=FillPattern.Solid, 3101 textString=">=1"), 3102 Text( 3103 extent={{152,-160},{-148,-100}}, 3104 lineColor={0,0,255}, 3105 textString="%name"), 3097 extent={{-50,40},{50,80}}, 3098 lineColor={0,0,0}, 3099 lineThickness=2, 3100 fillPattern=FillPattern.Solid, 3101 textString=">=1"), 3102 Text( 3103 extent={{152,-160},{-148,-100}}, 3104 lineColor={0,0,255}, 3105 textString="%name"), 3106 3106 Ellipse( 3107 extent={{50,6},{62,-6}}, 3108 lineColor={0,0,0}, 3109 lineThickness=2, 3110 fillColor={255,255,255}, 3107 extent={{50,6},{62,-6}}, 3108 lineColor={0,0,0}, 3109 lineThickness=2, 3110 fillColor={255,255,255}, 3111 3111 fillPattern=FillPattern.Solid)}), 3112 3112 Diagram(graphics)); … … 3143 3143 Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{ 3144 3144 100,100}}), graphics={Text( 3145 extent={{-50,40},{50,80}}, 3146 lineColor={0,0,0}, 3147 lineThickness=2, 3148 fillPattern=FillPattern.Solid, 3145 extent={{-50,40},{50,80}}, 3146 lineColor={0,0,0}, 3147 lineThickness=2, 3148 fillPattern=FillPattern.Solid, 3149 3149 textString="=1"), Text( 3150 extent={{152,-160},{-148,-100}}, 3151 lineColor={0,0,255}, 3150 extent={{152,-160},{-148,-100}}, 3151 lineColor={0,0,255}, 3152 3152 textString="%name")}), 3153 3153 Diagram(graphics)); … … 3184 3184 Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{ 3185 3185 100,100}}), graphics={Text( 3186 extent={{-50,40},{50,80}}, 3187 lineColor={0,0,0}, 3188 lineThickness=2, 3189 fillPattern=FillPattern.Solid, 3186 extent={{-50,40},{50,80}}, 3187 lineColor={0,0,0}, 3188 lineThickness=2, 3189 fillPattern=FillPattern.Solid, 3190 3190 textString="="), Text( 3191 extent={{152,-160},{-148,-100}}, 3192 lineColor={0,0,255}, 3191 extent={{152,-160},{-148,-100}}, 3192 lineColor={0,0,255}, 3193 3193 textString="%name")}), 3194 3194 Diagram(graphics)); … … 3249 3249 </ul> 3250 3250 </HTML>"), 3251 Diagram(graphics), 3252 Icon(graphics={ 3253 Text( 3254 extent={{152,-160},{-148,-100}}, 3255 lineColor={0,0,255}, 3256 textString= 3257 "%name"), 3251 Diagram(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100}, 3252 {100,100}}), 3253 graphics), 3254 Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{ 3255 100,100}}), graphics={ 3256 Text( 3257 extent={{152,-160},{-148,-100}}, 3258 lineColor={0,0,255}, 3259 textString="%name"), 3258 3260 Rectangle( 3259 extent={{-50,100},{50,-100}}, 3260 lineColor={0,0,0}, 3261 lineThickness=2, 3262 fillColor={213,170,255}, 3263 fillPattern=FillPattern.Solid), 3264 Text( 3265 extent={{-50,80},{50,40}}, 3266 lineColor={0,0,0}, 3267 lineThickness=2, 3268 fillColor={255,191,127}, 3269 fillPattern=FillPattern.Solid, 3270 textString= 3271 "1"), 3272 Text( 3273 extent={{-18,-60},{20,-100}}, 3274 lineColor={0,0,0}, 3275 textString= 3276 "Gate"), 3261 extent={{-50,100},{50,-100}}, 3262 lineColor={0,0,0}, 3263 lineThickness=2, 3264 fillColor={213,170,255}, 3265 fillPattern=FillPattern.Solid), 3266 Text( 3267 extent={{-50,80},{50,40}}, 3268 lineColor={0,0,0}, 3269 lineThickness=2, 3270 fillColor={255,191,127}, 3271 fillPattern=FillPattern.Solid, 3272 textString="1"), 3273 Text( 3274 extent={{-18,-60},{20,-100}}, 3275 lineColor={0,0,0}, 3276 textString="Gate"), 3277 3277 Ellipse( 3278 extent={{50,6},{62,-6}}, 3279 lineColor={0,0,0}, 3280 lineThickness=2, 3281 fillColor={255,255,255}, 3278 extent={{50,6},{62,-6}}, 3279 lineColor={0,0,0}, 3280 lineThickness=2, 3281 fillColor={255,255,255}, 3282 3282 fillPattern=FillPattern.Solid)})); 3283 3283 equation … … 3317 3317 </ul> 3318 3318 </HTML>"), 3319 Icon( graphics={3320 Text(3321 extent={{152,-160},{-148,-100}},3322 lineColor={0,0,255},3323 textString=3324 "%name"),3319 Icon(coordinateSystem(preserveAspectRatio=false, extent={{-100,-100},{ 3320 100,100}}), graphics={ 3321 Text( 3322 extent={{152,-160},{-148,-100}}, 3323 lineColor={0,0,255}, 3324 textString="%name"), 3325 3325 Rectangle( 3326 extent={{-50,100},{50,-100}}, 3327 lineColor={0,0,0}, 3328 lineThickness=2, 3329 fillColor={213,170,255}, 3330 fillPattern=FillPattern.Solid), 3331 Text( 3332 extent={{-50,80},{50,40}}, 3333 lineColor={0,0,0}, 3334 lineThickness=2, 3335 textString= 3336 "&"),3337 Text(3338 extent={{-20,-60},{20,-100}},3339 line Color={0,0,0},3340 lineThickness=2,3341 textString=3342 "Gate")}),3343 Diagram(graphics));
