spec: dies und das

diff --git a/spec/Architektur.dia b/spec/Architektur.dia
index 9c0bd63bd328cd508a52d06fe87f560894aed254..527a887146ff5e0caf2ea18865f95dbf46fd2b7f 100644 (file)
--- a/spec/Architektur.dia
+++ b/spec/Architektur.dia
@@ -68,16 +68,16 @@
         <dia:point val="-10.1375,5.4"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-10.1875,5.35;14.5625,20.95"/>
+        <dia:rectangle val="-10.1875,5.35;14.3625,16.05"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
         <dia:point val="-10.1375,5.4"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
-        <dia:real val="24.649999999999991"/>
+        <dia:real val="24.450000000000003"/>
       </dia:attribute>
       <dia:attribute name="elem_height">
-        <dia:real val="15.500000000000004"/>
+        <dia:real val="10.6"/>
       </dia:attribute>
       <dia:attribute name="show_background">
         <dia:boolean val="true"/>
@@ -85,13 +85,13 @@
     </dia:object>
     <dia:object type="ER - Entity" version="0" id="O1">
       <dia:attribute name="obj_pos">
-        <dia:point val="-9.3275,1.73"/>
+        <dia:point val="-9.2275,2.33"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-9.3775,1.68;-5.1825,3.58"/>
+        <dia:rectangle val="-9.2775,2.28;-5.0825,4.18"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-9.3275,1.73"/>
+        <dia:point val="-9.2275,2.33"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="4.0949999999999998"/>
@@ -126,13 +126,13 @@
     </dia:object>
     <dia:object type="ER - Entity" version="0" id="O2">
       <dia:attribute name="obj_pos">
-        <dia:point val="-3.9675,1.73"/>
+        <dia:point val="-3.8675,2.28"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-4.0175,1.68;0.5625,3.58"/>
+        <dia:rectangle val="-3.9175,2.23;0.6625,4.13"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-3.9675,1.73"/>
+        <dia:point val="-3.8675,2.28"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="4.4800000000000004"/>
@@ -249,13 +249,13 @@
     </dia:object>
     <dia:object type="ER - Entity" version="0" id="O5">
       <dia:attribute name="obj_pos">
-        <dia:point val="-3.74375,9.89"/>
+        <dia:point val="-3.64375,9.49"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-3.79375,9.84;0.40125,11.74"/>
+        <dia:rectangle val="-3.69375,9.44;0.50125,11.34"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-3.74375,9.89"/>
+        <dia:point val="-3.64375,9.49"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="4.0949999999999998"/>
@@ -290,13 +290,13 @@
     </dia:object>
     <dia:object type="ER - Entity" version="0" id="O6">
       <dia:attribute name="obj_pos">
-        <dia:point val="9.4925,6.3"/>
+        <dia:point val="10.5425,6.15"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="9.4425,6.25;12.8675,8.15"/>
+        <dia:rectangle val="10.4925,6.1;13.9175,8"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="9.4925,6.3"/>
+        <dia:point val="10.5425,6.15"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="3.3250000000000002"/>
@@ -331,13 +331,13 @@
     </dia:object>
     <dia:object type="ER - Entity" version="0" id="O7">
       <dia:attribute name="obj_pos">
-        <dia:point val="-7.9375,18.05"/>
+        <dia:point val="3.0125,13.5"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-7.9875,18;-5.3325,19.9"/>
+        <dia:rectangle val="2.9625,13.45;5.6175,15.35"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-7.9375,18.05"/>
+        <dia:point val="3.0125,13.5"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="2.5549999999999997"/>
@@ -372,13 +372,13 @@
     </dia:object>
     <dia:object type="ER - Entity" version="0" id="O8">
       <dia:attribute name="obj_pos">
-        <dia:point val="10.1637,1.73"/>
+        <dia:point val="11.1637,2.18"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="10.1137,1.68;12.3837,3.58"/>
+        <dia:rectangle val="11.1137,2.13;13.3837,4.03"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="10.1637,1.73"/>
+        <dia:point val="11.1637,2.18"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="2.1699999999999999"/>
@@ -413,13 +413,13 @@
     </dia:object>
     <dia:object type="ER - Entity" version="0" id="O9">
       <dia:attribute name="obj_pos">
-        <dia:point val="-3.52,15.43"/>
+        <dia:point val="-3.57,13.53"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-3.57,15.38;0.24,17.28"/>
+        <dia:rectangle val="-3.62,13.48;0.19,15.38"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-3.52,15.43"/>
+        <dia:point val="-3.57,13.53"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="3.71"/>
@@ -454,13 +454,13 @@
     </dia:object>
     <dia:object type="ER - Entity" version="0" id="O10">
       <dia:attribute name="obj_pos">
-        <dia:point val="3.6325,12.83"/>
+        <dia:point val="2.5825,11.33"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="3.5825,12.78;7.7775,14.68"/>
+        <dia:rectangle val="2.5325,11.28;6.7275,13.18"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="3.6325,12.83"/>
+        <dia:point val="2.5825,11.33"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="4.0949999999999998"/>
@@ -495,54 +495,13 @@
     </dia:object>
     <dia:object type="ER - Entity" version="0" id="O11">
       <dia:attribute name="obj_pos">
-        <dia:point val="2.3825,18.13"/>
+        <dia:point val="0.9325,6.28"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="2.3325,18.08;10.3775,19.98"/>
+        <dia:rectangle val="0.8825,6.23;8.5425,8.13"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="2.3825,18.13"/>
-      </dia:attribute>
-      <dia:attribute name="elem_width">
-        <dia:real val="7.9450000000000003"/>
-      </dia:attribute>
-      <dia:attribute name="elem_height">
-        <dia:real val="1.8"/>
-      </dia:attribute>
-      <dia:attribute name="border_width">
-        <dia:real val="0.10000000000000001"/>
-      </dia:attribute>
-      <dia:attribute name="border_color">
-        <dia:color val="#000000"/>
-      </dia:attribute>
-      <dia:attribute name="inner_color">
-        <dia:color val="#ffffff"/>
-      </dia:attribute>
-      <dia:attribute name="name">
-        <dia:string>#Bin/Dez-Converter#</dia:string>
-      </dia:attribute>
-      <dia:attribute name="weak">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="associative">
-        <dia:boolean val="false"/>
-      </dia:attribute>
-      <dia:attribute name="font">
-        <dia:font family="monospace" style="0" name="Courier"/>
-      </dia:attribute>
-      <dia:attribute name="font_height">
-        <dia:real val="0.80000000000000004"/>
-      </dia:attribute>
-    </dia:object>
-    <dia:object type="ER - Entity" version="0" id="O12">
-      <dia:attribute name="obj_pos">
-        <dia:point val="4.9325,9.93"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="4.8825,9.88;12.5425,11.78"/>
-      </dia:attribute>
-      <dia:attribute name="elem_corner">
-        <dia:point val="4.9325,9.93"/>
+        <dia:point val="0.9325,6.28"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="7.5600000000000005"/>
@@ -575,16 +534,16 @@
         <dia:real val="0.80000000000000004"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O13">
+    <dia:object type="Standard - Line" version="0" id="O12">
       <dia:attribute name="obj_pos">
-        <dia:point val="-7.18094,6.25164"/>
+        <dia:point val="-7.16098,6.24966"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-7.5698,3.4666;-6.90824,6.30298"/>
+        <dia:rectangle val="-7.50145,4.06854;-6.83966,6.29998"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="-7.18094,6.25164"/>
-        <dia:point val="-7.25406,3.57836"/>
+        <dia:point val="-7.16098,6.24966"/>
+        <dia:point val="-7.17402,4.18034"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
@@ -603,15 +562,15 @@
         <dia:connection handle="1" to="O1" connection="8"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="ER - Entity" version="0" id="O14">
+    <dia:object type="ER - Entity" version="0" id="O13">
       <dia:attribute name="obj_pos">
-        <dia:point val="-9.3275,12.93"/>
+        <dia:point val="-9.1775,11.38"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-9.3775,12.88;-5.1825,14.78"/>
+        <dia:rectangle val="-9.2275,11.33;-5.0325,13.23"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="-9.3275,12.93"/>
+        <dia:point val="-9.1775,11.38"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="4.0949999999999998"/>
@@ -644,16 +603,16 @@
         <dia:real val="0.80000000000000004"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O15">
+    <dia:object type="Standard - Line" version="0" id="O14">
       <dia:attribute name="obj_pos">
-        <dia:point val="-7.2621,12.8807"/>
+        <dia:point val="-7.13467,11.3312"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-7.51411,8.03756;-6.85242,12.9316"/>
+        <dia:rectangle val="-7.47852,8.03698;-6.81673,11.3815"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="-7.2621,12.8807"/>
-        <dia:point val="-7.1729,8.14934"/>
+        <dia:point val="-7.13467,11.3312"/>
+        <dia:point val="-7.15033,8.14878"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
@@ -668,20 +627,20 @@
         <dia:real val="0.5"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O14" connection="8"/>
+        <dia:connection handle="0" to="O13" connection="8"/>
         <dia:connection handle="1" to="O4" connection="8"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O16">
+    <dia:object type="Standard - Line" version="0" id="O15">
       <dia:attribute name="obj_pos">
-        <dia:point val="3.58381,13.7462"/>
+        <dia:point val="2.53231,12.2389"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.29561,13.4787;3.63419,14.1405"/>
+        <dia:rectangle val="-5.14411,11.9378;2.58252,12.5996"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="3.58381,13.7462"/>
-        <dia:point val="-5.18381,13.8138"/>
+        <dia:point val="2.53231,12.2389"/>
+        <dia:point val="-5.03231,12.2711"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
@@ -697,19 +656,19 @@
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O10" connection="8"/>
-        <dia:connection handle="1" to="O14" connection="8"/>
+        <dia:connection handle="1" to="O13" connection="8"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O17">
+    <dia:object type="Standard - Line" version="0" id="O16">
       <dia:attribute name="obj_pos">
-        <dia:point val="-1.70156,3.57836"/>
+        <dia:point val="-1.62162,4.12611"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-1.97426,3.52702;-1.3127,6.3634"/>
+        <dia:rectangle val="-1.9427,4.0758;-1.28091,6.36569"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="-1.70156,3.57836"/>
-        <dia:point val="-1.62844,6.25164"/>
+        <dia:point val="-1.62162,4.12611"/>
+        <dia:point val="-1.60838,6.25389"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
@@ -728,16 +687,16 @@
         <dia:connection handle="1" to="O3" connection="8"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O18">
+    <dia:object type="Standard - Line" version="0" id="O17">
       <dia:attribute name="obj_pos">
-        <dia:point val="11.1744,6.25164"/>
+        <dia:point val="12.2155,6.09966"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="10.8871,3.46658;11.5488,6.30265"/>
+        <dia:rectangle val="11.9013,3.91854;12.5631,6.15021"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="11.1744,6.25164"/>
-        <dia:point val="11.2293,3.57836"/>
+        <dia:point val="12.2155,6.09966"/>
+        <dia:point val="12.2382,4.03034"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
@@ -756,16 +715,16 @@
         <dia:connection handle="1" to="O8" connection="8"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O19">
+    <dia:object type="Standard - Line" version="0" id="O18">
       <dia:attribute name="obj_pos">
-        <dia:point val="-1.62727,8.14833"/>
+        <dia:point val="-1.60064,8.14859"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-1.98792,8.09705;-1.32634,9.95343"/>
+        <dia:rectangle val="-1.93009,8.09849;-1.26829,9.55321"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="-1.62727,8.14833"/>
-        <dia:point val="-1.67148,9.84167"/>
+        <dia:point val="-1.60064,8.14859"/>
+        <dia:point val="-1.59811,9.44141"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
@@ -784,16 +743,16 @@
         <dia:connection handle="1" to="O5" connection="8"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O20">
+    <dia:object type="Standard - Line" version="0" id="O19">
       <dia:attribute name="obj_pos">
-        <dia:point val="9.34698,9.88705"/>
+        <dia:point val="8.54107,7.11357"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="9.27758,8.05019;10.5899,9.95645"/>
+        <dia:rectangle val="8.49021,6.7584;10.6042,7.42011"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="9.34698,9.88705"/>
-        <dia:point val="10.5205,8.14295"/>
+        <dia:point val="8.54107,7.11357"/>
+        <dia:point val="10.4924,7.07971"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
@@ -808,19 +767,19 @@
         <dia:real val="0.5"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O12" connection="8"/>
+        <dia:connection handle="0" to="O11" connection="8"/>
         <dia:connection handle="1" to="O6" connection="8"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="ER - Entity" version="0" id="O21">
+    <dia:object type="ER - Entity" version="0" id="O20">
       <dia:attribute name="obj_pos">
-        <dia:point val="1.9825,1.73"/>
+        <dia:point val="1.5825,2.28"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="1.9325,1.68;8.4375,3.58"/>
+        <dia:rectangle val="1.5325,2.23;8.0375,4.13"/>
       </dia:attribute>
       <dia:attribute name="elem_corner">
-        <dia:point val="1.9825,1.73"/>
+        <dia:point val="1.5825,2.28"/>
       </dia:attribute>
       <dia:attribute name="elem_width">
         <dia:real val="6.4049999999999994"/>
@@ -853,16 +812,16 @@
         <dia:real val="0.80000000000000004"/>
       </dia:attribute>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O22">
+    <dia:object type="Standard - Line" version="0" id="O21">
       <dia:attribute name="obj_pos">
-        <dia:point val="-1.69089,11.7402"/>
+        <dia:point val="-1.62414,11.3388"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-2.00436,11.6899;-1.34257,15.4916"/>
+        <dia:rectangle val="-2.00171,11.2874;-1.34019,13.5929"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="-1.69089,11.7402"/>
-        <dia:point val="-1.67036,15.3798"/>
+        <dia:point val="-1.62414,11.3388"/>
+        <dia:point val="-1.68711,13.4812"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
@@ -881,16 +840,16 @@
         <dia:connection handle="1" to="O9" connection="8"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O23">
+    <dia:object type="Standard - Line" version="0" id="O22">
       <dia:attribute name="obj_pos">
-        <dia:point val="3.58373,14.472"/>
+        <dia:point val="2.53217,12.9574"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.134445,14.4082;3.64755,15.7884"/>
+        <dia:rectangle val="0.083176,12.8938;2.59579,13.9059"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="3.58373,14.472"/>
-        <dia:point val="0.23984,15.6557"/>
+        <dia:point val="2.53217,12.9574"/>
+        <dia:point val="0.18881,13.7699"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
@@ -909,44 +868,16 @@
         <dia:connection handle="1" to="O9" connection="8"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O24">
-      <dia:attribute name="obj_pos">
-        <dia:point val="0.239163,16.9711"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.175823,16.9077;3.63947,18.2209"/>
-      </dia:attribute>
-      <dia:attribute name="conn_endpoints">
-        <dia:point val="0.239163,16.9711"/>
-        <dia:point val="3.53351,18.0801"/>
-      </dia:attribute>
-      <dia:attribute name="numcp">
-        <dia:int val="1"/>
-      </dia:attribute>
-      <dia:attribute name="end_arrow">
-        <dia:enum val="1"/>
-      </dia:attribute>
-      <dia:attribute name="end_arrow_length">
-        <dia:real val="0.5"/>
-      </dia:attribute>
-      <dia:attribute name="end_arrow_width">
-        <dia:real val="0.5"/>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O9" connection="8"/>
-        <dia:connection handle="1" to="O11" connection="8"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O25">
+    <dia:object type="Standard - Line" version="0" id="O23">
       <dia:attribute name="obj_pos">
-        <dia:point val="-3.47593,17.2799"/>
+        <dia:point val="0.187952,14.4205"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.4316,17.2124;-3.40843,18.3235"/>
+        <dia:rectangle val="0.137702,14.0785;3.07501,14.7403"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="-3.47593,17.2799"/>
-        <dia:point val="-5.33259,18.2537"/>
+        <dia:point val="0.187952,14.4205"/>
+        <dia:point val="2.96321,14.4066"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
@@ -965,16 +896,16 @@
         <dia:connection handle="1" to="O7" connection="8"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O26">
+    <dia:object type="Standard - Line" version="0" id="O24">
       <dia:attribute name="obj_pos">
-        <dia:point val="-5.33259,18.2537"/>
+        <dia:point val="2.96321,14.4066"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.4001,17.2101;-3.37692,18.3212"/>
+        <dia:rectangle val="0.0761497,14.0868;3.01346,14.7486"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="-5.33259,18.2537"/>
-        <dia:point val="-3.47593,17.2799"/>
+        <dia:point val="2.96321,14.4066"/>
+        <dia:point val="0.187952,14.4205"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
@@ -993,16 +924,16 @@
         <dia:connection handle="1" to="O9" connection="8"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O27">
+    <dia:object type="Standard - Line" version="0" id="O25">
       <dia:attribute name="obj_pos">
-        <dia:point val="6.67282,12.7806"/>
+        <dia:point val="4.64552,11.28"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="6.60212,11.7022;7.80048,12.8513"/>
+        <dia:rectangle val="4.35714,8.01817;5.01885,11.3309"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="6.67282,12.7806"/>
-        <dia:point val="7.71968,11.7794"/>
+        <dia:point val="4.64552,11.28"/>
+        <dia:point val="4.69698,8.12996"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
@@ -1018,19 +949,19 @@
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O10" connection="8"/>
-        <dia:connection handle="1" to="O12" connection="8"/>
+        <dia:connection handle="1" to="O11" connection="8"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O28">
+    <dia:object type="Standard - Line" version="0" id="O26">
       <dia:attribute name="obj_pos">
-        <dia:point val="5.59364,3.57993"/>
+        <dia:point val="4.76779,4.12971"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="5.52795,3.51424;8.40161,9.98278"/>
+        <dia:rectangle val="4.40883,4.07881;5.07053,6.34208"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="5.59364,3.57993"/>
-        <dia:point val="8.30386,9.88007"/>
+        <dia:point val="4.76779,4.12971"/>
+        <dia:point val="4.72971,6.23029"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
@@ -1045,16 +976,16 @@
         <dia:real val="0.5"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O21" connection="8"/>
-        <dia:connection handle="1" to="O12" connection="8"/>
+        <dia:connection handle="0" to="O20" connection="8"/>
+        <dia:connection handle="1" to="O11" connection="8"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Text" version="1" id="O29">
+    <dia:object type="Standard - Text" version="1" id="O27">
       <dia:attribute name="obj_pos">
-        <dia:point val="14.5125,20.9"/>
+        <dia:point val="14.0375,15.7"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="12.77,20.185;14.5125,20.9"/>
+        <dia:rectangle val="12.3525,14.9525;14.0375,15.7"/>
       </dia:attribute>
       <dia:attribute name="text">
         <dia:composite type="text">
@@ -1068,7 +999,7 @@
             <dia:real val="0.80000000000000004"/>
           </dia:attribute>
           <dia:attribute name="pos">
-            <dia:point val="14.5125,20.765"/>
+            <dia:point val="14.0375,15.5475"/>
           </dia:attribute>
           <dia:attribute name="color">
             <dia:color val="#000000"/>
@@ -1081,48 +1012,17 @@
       <dia:attribute name="valign">
         <dia:enum val="1"/>
       </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O0" connection="7"/>
-      </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O30">
-      <dia:attribute name="obj_pos">
-        <dia:point val="3.53351,18.0801"/>
-      </dia:attribute>
-      <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.133203,16.8303;3.59685,18.1435"/>
-      </dia:attribute>
-      <dia:attribute name="conn_endpoints">
-        <dia:point val="3.53351,18.0801"/>
-        <dia:point val="0.239163,16.9711"/>
-      </dia:attribute>
-      <dia:attribute name="numcp">
-        <dia:int val="1"/>
-      </dia:attribute>
-      <dia:attribute name="end_arrow">
-        <dia:enum val="1"/>
-      </dia:attribute>
-      <dia:attribute name="end_arrow_length">
-        <dia:real val="0.5"/>
-      </dia:attribute>
-      <dia:attribute name="end_arrow_width">
-        <dia:real val="0.5"/>
-      </dia:attribute>
-      <dia:connections>
-        <dia:connection handle="0" to="O11" connection="8"/>
-        <dia:connection handle="1" to="O9" connection="8"/>
-      </dia:connections>
-    </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O31">
+    <dia:object type="Standard - Line" version="0" id="O28">
       <dia:attribute name="obj_pos">
-        <dia:point val="0.400831,11.6258"/>
+        <dia:point val="0.498421,11.009"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.335872,11.5609;3.68678,13.0062"/>
+        <dia:rectangle val="0.436301,10.9469;2.64255,11.7724"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="0.400831,11.6258"/>
-        <dia:point val="3.58292,12.8942"/>
+        <dia:point val="0.498421,11.009"/>
+        <dia:point val="2.53533,11.611"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
@@ -1141,16 +1041,16 @@
         <dia:connection handle="1" to="O10" connection="8"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O32">
+    <dia:object type="Standard - Line" version="0" id="O29">
       <dia:attribute name="obj_pos">
-        <dia:point val="0.23984,15.6557"/>
+        <dia:point val="0.18881,13.7699"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="0.176022,14.3394;3.68913,15.7195"/>
+        <dia:rectangle val="0.125189,12.8214;2.6378,13.8335"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="0.23984,15.6557"/>
-        <dia:point val="3.58373,14.472"/>
+        <dia:point val="0.18881,13.7699"/>
+        <dia:point val="2.53217,12.9574"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
@@ -1169,16 +1069,16 @@
         <dia:connection handle="1" to="O10" connection="8"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O33">
+    <dia:object type="Standard - Line" version="0" id="O30">
       <dia:attribute name="obj_pos">
-        <dia:point val="11.2293,3.57836"/>
+        <dia:point val="12.2382,4.03034"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="10.8549,3.52735;11.5166,6.36342"/>
+        <dia:rectangle val="11.8906,3.97979;12.5524,6.21146"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="11.2293,3.57836"/>
-        <dia:point val="11.1744,6.25164"/>
+        <dia:point val="12.2382,4.03034"/>
+        <dia:point val="12.2155,6.09966"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
@@ -1197,16 +1097,16 @@
         <dia:connection handle="1" to="O6" connection="8"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O34">
+    <dia:object type="Standard - Line" version="0" id="O31">
       <dia:attribute name="obj_pos">
-        <dia:point val="10.5205,8.14295"/>
+        <dia:point val="10.4924,7.07971"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="9.27758,8.07355;10.5899,9.97981"/>
+        <dia:rectangle val="8.42928,6.77318;10.5432,7.43488"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="10.5205,8.14295"/>
-        <dia:point val="9.34698,9.88705"/>
+        <dia:point val="10.4924,7.07971"/>
+        <dia:point val="8.54107,7.11357"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
@@ -1222,19 +1122,19 @@
       </dia:attribute>
       <dia:connections>
         <dia:connection handle="0" to="O6" connection="8"/>
-        <dia:connection handle="1" to="O12" connection="8"/>
+        <dia:connection handle="1" to="O11" connection="8"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O35">
+    <dia:object type="Standard - Line" version="0" id="O32">
       <dia:attribute name="obj_pos">
-        <dia:point val="7.71968,11.7794"/>
+        <dia:point val="4.69698,8.12996"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="6.59202,11.7087;7.79038,12.8578"/>
+        <dia:rectangle val="4.32365,8.07915;4.98536,11.3918"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="7.71968,11.7794"/>
-        <dia:point val="6.67282,12.7806"/>
+        <dia:point val="4.69698,8.12996"/>
+        <dia:point val="4.64552,11.28"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
@@ -1249,20 +1149,20 @@
         <dia:real val="0.5"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O12" connection="8"/>
+        <dia:connection handle="0" to="O11" connection="8"/>
         <dia:connection handle="1" to="O10" connection="8"/>
       </dia:connections>
     </dia:object>
-    <dia:object type="Standard - Line" version="0" id="O36">
+    <dia:object type="Standard - Line" version="0" id="O33">
       <dia:attribute name="obj_pos">
-        <dia:point val="-5.18381,13.8138"/>
+        <dia:point val="-5.03231,12.2711"/>
       </dia:attribute>
       <dia:attribute name="obj_bb">
-        <dia:rectangle val="-5.23419,13.4195;3.69561,14.0813"/>
+        <dia:rectangle val="-5.08252,11.9104;2.64411,12.5722"/>
       </dia:attribute>
       <dia:attribute name="conn_endpoints">
-        <dia:point val="-5.18381,13.8138"/>
-        <dia:point val="3.58381,13.7462"/>
+        <dia:point val="-5.03231,12.2711"/>
+        <dia:point val="2.53231,12.2389"/>
       </dia:attribute>
       <dia:attribute name="numcp">
         <dia:int val="1"/>
@@ -1277,7 +1177,7 @@
         <dia:real val="0.5"/>
       </dia:attribute>
       <dia:connections>
-        <dia:connection handle="0" to="O14" connection="8"/>
+        <dia:connection handle="0" to="O13" connection="8"/>
         <dia:connection handle="1" to="O10" connection="8"/>
       </dia:connections>
     </dia:object>

diff --git a/spec/Architektur.png b/spec/Architektur.png
index ff39fb8e23c65d894163cfe7d7b310386cfd8d69..c3e88a89e6f6aa9726fb67b2dd87286693890df4 100644 (file)
Binary files a/spec/Architektur.png and b/spec/Architektur.png differ

diff --git a/spec/TODO b/spec/TODO
index f72f653d93a6c6b135ff7b0e392580f2e7d857a4..e0b5e8d6a7b36945f5019db526ba7eb95214b78e 100644 (file)
--- a/spec/TODO
+++ b/spec/TODO
@@ -1,14 +1,10 @@
 High Level Design Description
-       o nochmals drueber arbeiten am schluss (z.b. bin2dez converter rausnehmen).
-       o arch bild aktualisieren.
+       o nochmals drueber arbeiten am schluss
 
 Testfälle für alle Requirements
        o um zb. die History zu füllen sind 50+ Eingaben zu tätigen, kann mit anderen Testfällen
        kombiniert werden
 
-Detaillierte Design Description
-       o fsm-todo: rs232, display
-
 fuer abgabe selbst:
        o mit \newpage tabellen gscheid formatieren, sodass keine grauslichen Seitenumbrueche mitten in
        der Tabelle sind... (dort wo es halt moeglich ist).

diff --git a/spec/sm/alu.pdf b/spec/sm/alu.pdf
index 75a92da3a09631c36679fb9070d7d10595fa3db6..1f02ea3ac5cb3a8b28a142b55e61f35ef4c2e821 100644 (file)
Binary files a/spec/sm/alu.pdf and b/spec/sm/alu.pdf differ

diff --git a/spec/sm/alu.tex b/spec/sm/alu.tex
index c3accfea04af12879c92b8182287d2c0adc4ecde..437d304bfdd1ff7dfb2b6b6be1415a3c984b5f7d 100644 (file)
--- a/spec/sm/alu.tex
+++ b/spec/sm/alu.tex
@@ -21,15 +21,15 @@
 
 \ncline[linestyle=dotted]{res}{idle}
 
-\ncarc[arcangle=20]{idle}{add}\ncput*[npos=.50]{\shortstack{do\_calc$\uparrow$\\opc == ADD}}
+\ncarc[arcangle=20]{idle}{add}\ncput*[npos=.50]{\shortstack{do\_calc$\uparrow$\\opc = ADD}}
 \ncarc[arcangle=20]{add}{idle}
 
-\ncarc[arcangle=20]{idle}{sub}\ncput*[npos=.50]{\shortstack{do\_calc$\uparrow$\\opc == SUB}}
+\ncarc[arcangle=20]{idle}{sub}\ncput*[npos=.50]{\shortstack{do\_calc$\uparrow$\\opc = SUB}}
 \ncarc[arcangle=20]{sub}{idle}
 
-\ncarc[arcangle=20]{idle}{mul}\ncput*[npos=.50]{\shortstack{do\_calc$\uparrow$\\opc == MUL}}
+\ncarc[arcangle=20]{idle}{mul}\ncput*[npos=.50]{\shortstack{do\_calc$\uparrow$\\opc = MUL}}
 \ncarc[arcangle=20]{mul}{idle}
 
-\ncarc[arcangle=20]{idle}{div}\ncput*[npos=.50]{\shortstack{do\_calc$\uparrow$\\opc == DIV}}
+\ncarc[arcangle=20]{idle}{div}\ncput*[npos=.50]{\shortstack{do\_calc$\uparrow$\\opc = DIV}}
 \ncarc[arcangle=20]{div}{idle}
 \end{document}

diff --git a/spec/sm/parser.pdf b/spec/sm/parser.pdf
index 0b2784bdacfff28e7ef8619c3be84845f2ad57b9..affaf5eaf5efbff3637ce7c38eac8a4e9434c9a1 100644 (file)
Binary files a/spec/sm/parser.pdf and b/spec/sm/parser.pdf differ

diff --git a/spec/sm/parser.tex b/spec/sm/parser.tex
index 5b4806bcac6d81ec1be40cc24ef0721bd58ed294..51d11c82ec8bffc483d8b81f34d1f69548de3439 100644 (file)
--- a/spec/sm/parser.tex
+++ b/spec/sm/parser.tex
@@ -55,5 +55,5 @@
 \ncarc[arcangle=0]{null}{calc}
 
 \ncarc[arcangle=0]{calc}{read}\ncput*[npos=.50]{int\_done$\uparrow$}
-\ncarc[arcangle=0]{calc}{done}\ncput*[npos=.50]{aktop == DONE}
+\ncarc[arcangle=0]{calc}{done}\ncput*[npos=.50]{aktop = DONE}
 \end{document}

diff --git a/spec/sm/scanner.pdf b/spec/sm/scanner.pdf
index 4e645b724a0609ff5fde7cd6631635c0d943676d..39b9f0505460a5373a55d8f1b025f7b7912102b9 100644 (file)
Binary files a/spec/sm/scanner.pdf and b/spec/sm/scanner.pdf differ

diff --git a/spec/sm/scanner.tex b/spec/sm/scanner.tex
index db92b563792d74667dcacfe502fd5a655961619c..0c21a110be3902243c631611dc37b6021eb26f68 100644 (file)
--- a/spec/sm/scanner.tex
+++ b/spec/sm/scanner.tex
@@ -8,16 +8,16 @@
 
 \begin{psmatrix}[mnode=oval, colsep=2cm, rowsep=2cm]
 [mnode=R,name=res]{sys\_res\_n} &
-[name=idle]{\shortstack{\textbf{idle}\\bs = 0\\take=0\\do\_it=0}} &
-[name=take]{\shortstack{\textbf{\"ubernehmen}\\take = 1\\char = $b_0$}} \\
+[name=idle]{\shortstack{\textbf{idle}\\bs:=0;\\take:=0;\\do\_it:=0;}} &
+[name=take]{\shortstack{\textbf{\"ubernehmen}\\take:=1;\\char:=$b_0$;}} \\
 %%
-[name=doit]{\shortstack{\textbf{enter}\\do\_it = 1}} &
+[name=doit]{\shortstack{\textbf{enter}\\do\_it:=1;}} &
 &
-[name=mod]{\shortstack{\textbf{mod}\\$b_0$ = data}} \\
+[name=mod]{\shortstack{\textbf{mod}\\$b_0$:=data;}} \\
 %%
 &
-[name=read]{\shortstack{\textbf{read}\\$b_0$ = data}} &
-[name=bs]{\shortstack{\textbf{l\"oschen}\\backspace = 1}} \\
+[name=read]{\shortstack{\textbf{read}\\$b_0$:=data;}} &
+[name=bs]{\shortstack{\textbf{l\"oschen}\\backspace:=1;}} \\
 \end{psmatrix}
 
 \psset{arrows=->, shortput=nab}
@@ -27,10 +27,10 @@
 \ncarc[arcangle=25]{idle}{read}\ncput*[npos=.43]{new\_data$\uparrow$}
 \ncarc[arcangle=25]{read}{idle}\ncput*[npos=.43]{ung\"ultiges byte}
 
-\ncarc[arcangle=-25]{read}{bs}\ncput*[npos=.50]{$b_0 == 0x0e$}
-\ncarc[arcangle=25]{read}{doit}\ncput*[npos=.50]{$b_0 == 0x1c$}
+\ncarc[arcangle=-25]{read}{bs}\ncput*[npos=.50]{$b_0 = 0x0e$}
+\ncarc[arcangle=25]{read}{doit}\ncput*[npos=.50]{$b_0 = 0x1c$}
 
-\ncarc[arcangle=0]{read}{mod}\ncput*[npos=.40]{$b_0 == 0xe0$}
+\ncarc[arcangle=0]{read}{mod}\ncput*[npos=.40]{$b_0 = 0xe0$}
 \ncarc[arcangle=-40]{mod}{take}\ncput*[npos=.40]{g\"ultiges zeichen}
 \ncarc[arcangle=-25]{mod}{idle}\ncput*[npos=.53]{ung\"ultiges byte}
 

diff --git a/spec/spec.tex b/spec/spec.tex
index cc9125e62158e6b13054e9928d57685ad8937181..29bdfcaf4ca928ff18b3c70bb0e1d019be5fb67d 100644 (file)
--- a/spec/spec.tex
+++ b/spec/spec.tex
@@ -113,7 +113,7 @@ command\_data & in & 32 & std\_logic\_vector & Display & Daten f\"ur das Kommand
 free & out & 1 & std\_logic & Display & Signalisiert Bereitschaft \ZE
 \TEND
 
-
+\newpage
 \subsubsection{Display}
 %Liest einzelne Zeichen aus der History aus und leitet diese an das VGA Modul weiter, um sie in der entsprechenden Zeile anzeigen zu lassen
 \THEAD
@@ -132,7 +132,7 @@ command\_data & out & 32 & std\_logic\_vector & VGA & Daten f\"ur das Kommando \
 free & in & 1 & std\_logic & VGA & Signalisiert Bereitschaft \ZE
 \TEND
 
-
+\newpage
 \subsubsection{RS232}
 %Senden und Empfangen von Nachrichten vom/zum PC über die serielle Schnittstelle
 \THEAD
@@ -146,7 +146,7 @@ tx\_data & out & 8 & std\_logic\_vector & PC-Kommunikation & Datenfeld f\"ur das
 tx\_new & out & 1 & std\_logic & PC-Kommunikation & Signalisiert dass das anliegende Byte gesendet werden soll \ZE
 \TEND
 
-
+\newpage
 \subsubsection{PC-Kommunikation}
 %Auf eine vom PC eintreffende Bufferübermittlungsanforderung oder ein Drücken des entsprechenden Board-Buttons, liest es Zeichen für Zeichen aus dem History Modul aus und leitet es an das RS232 Modul weiter
 \THEAD
@@ -165,6 +165,7 @@ char & in & 8 & character & History & enth\"alt angeforderne Daten \ZE
 \TEND
 
 
+\newpage
 \subsubsection{PS/2}
 \THEAD
 new\_data & out & 1 & std\_logic\_vector & Scanner & Signalisiert neuen Scancode \ZE