From b387b25f5330840f87cbac6719e084645eb8168f Mon Sep 17 00:00:00 2001
From: Justin Hoffmann <justin.hoffmann@haw-hamburg.de>
Date: Sat, 22 May 2021 21:44:27 +0200
Subject: [PATCH 1/3] Update according to implementation

---
 diagrams/stage3/cd_data.uxf | 148 +++++++++++++++---------------------
 1 file changed, 63 insertions(+), 85 deletions(-)

diff --git a/diagrams/stage3/cd_data.uxf b/diagrams/stage3/cd_data.uxf
index b75750c..5cf3ca5 100644
--- a/diagrams/stage3/cd_data.uxf
+++ b/diagrams/stage3/cd_data.uxf
@@ -4,38 +4,40 @@
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>960</x>
-      <y>384</y>
+      <x>928</x>
+      <y>336</y>
       <w>480</w>
-      <h>240</h>
+      <h>320</h>
     </coordinates>
     <panel_attributes>Anlage
 --
-- _instance: Anlage {readonly}
-+ _belt_is_blocked: bool
-+ _ramp_full: bool
-+ _pending_transfer: Workpiece
++ belt_is_blocked: bool
++ ramp_full: bool
++ pending_transfer: Workpiece
+- _unit_mutex: mutex
 --
 + wrpc_fits_order(Workpiece): bool
 + wrpc_order_step()
 + wrpc_order_reset_to(WorkpieceType)
-</panel_attributes>
++ get_switch_end_sec(): CBSection
++ get_height_switch_sec(): CBSection
++ get_start_height_sec(): CBSection</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>208</x>
+      <x>176</x>
       <y>608</y>
       <w>512</w>
       <h>320</h>
     </coordinates>
     <panel_attributes>Workpiece
 --
-/- last_id: id/
+- _last_id: id {static}
 + id: id {readonly}
-+ height_1: float
-+ height_2: float
++ height_1: int
++ height_2: int
 + is_metallic: bool
 + is_flipped: bool
 --
@@ -48,7 +50,7 @@
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>1040</x>
+      <x>1008</x>
       <y>688</y>
       <w>256</w>
       <h>208</h>
@@ -66,29 +68,32 @@ unkown</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>208</x>
-      <y>224</y>
+      <x>176</x>
+      <y>176</y>
       <w>464</w>
-      <h>272</h>
+      <h>320</h>
     </coordinates>
     <panel_attributes>CBSection
 --
 - _queue: queue&lt;Workpiece&gt;
+- _section_mutex: mutex
 --
++ &lt;&lt;Create&gt;&gt; CBSection()
 + &lt;&lt;Create&gt;&gt; CBSection(next: CBSection)
 + size(): int
 + back(): Workpiece
 + front(): Workpiece
 + transfer()
++ enter_workpiece(Workpiece)
 + exit_first()</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <id>UMLFrame</id>
     <coordinates>
-      <x>160</x>
+      <x>128</x>
       <y>0</y>
-      <w>1328</w>
+      <w>1424</w>
       <h>1280</h>
     </coordinates>
     <panel_attributes>cd Data</panel_attributes>
@@ -97,21 +102,20 @@ unkown</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>656</x>
-      <y>368</y>
+      <x>624</x>
+      <y>320</y>
       <w>336</w>
-      <h>96</h>
+      <h>80</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;&lt;&lt;&lt;-
-+ height_switch_sec
-{readonly}
+- _height_switch_sec
 </panel_attributes>
     <additional_attributes>190.0;20.0;10.0;20.0</additional_attributes>
   </element>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>240</x>
+      <x>208</x>
       <y>480</y>
       <w>80</w>
       <h>160</h>
@@ -124,20 +128,20 @@ m2=1</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>704</x>
-      <y>608</y>
+      <x>672</x>
+      <y>640</y>
       <w>320</w>
-      <h>96</h>
+      <h>64</h>
     </coordinates>
     <panel_attributes>lt=&lt;.
 &lt;&lt;create&gt;&gt;</panel_attributes>
-    <additional_attributes>10.0;40.0;180.0;40.0;180.0;10.0</additional_attributes>
+    <additional_attributes>10.0;20.0;180.0;20.0;180.0;10.0</additional_attributes>
   </element>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>352</x>
-      <y>128</y>
+      <x>320</x>
+      <y>80</y>
       <w>208</w>
       <h>128</h>
     </coordinates>
@@ -150,46 +154,44 @@ m2=0..1</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>992</x>
-      <y>224</y>
-      <w>224</w>
-      <h>192</h>
+      <x>624</x>
+      <y>240</y>
+      <w>576</w>
+      <h>128</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;&lt;&lt;&lt;-
-+ start_height_sec
-   {readonly}</panel_attributes>
-    <additional_attributes>10.0;100.0;10.0;10.0</additional_attributes>
+- _start_height_sec</panel_attributes>
+    <additional_attributes>220.0;60.0;220.0;10.0;10.0;10.0</additional_attributes>
   </element>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>656</x>
-      <y>432</y>
+      <x>624</x>
+      <y>384</y>
       <w>336</w>
-      <h>80</h>
+      <h>64</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;&lt;&lt;&lt;-
-+ switch_end_sec
-{readonly}</panel_attributes>
+-_switch_end_sec</panel_attributes>
     <additional_attributes>190.0;20.0;10.0;20.0</additional_attributes>
   </element>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>1168</x>
-      <y>608</y>
-      <w>176</w>
-      <h>112</h>
+      <x>1248</x>
+      <y>640</y>
+      <w>240</w>
+      <h>176</h>
     </coordinates>
     <panel_attributes>lt=-&gt;
 _next_in
 sorting_order</panel_attributes>
-    <additional_attributes>10.0;10.0;10.0;50.0</additional_attributes>
+    <additional_attributes>50.0;10.0;50.0;90.0;10.0;90.0</additional_attributes>
   </element>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>704</x>
+      <x>672</x>
       <y>752</y>
       <w>368</w>
       <h>64</h>
@@ -198,35 +200,10 @@ sorting_order</panel_attributes>
 type = unknown</panel_attributes>
     <additional_attributes>10.0;20.0;210.0;20.0</additional_attributes>
   </element>
-  <element>
-    <id>UMLClass</id>
-    <coordinates>
-      <x>752</x>
-      <y>144</y>
-      <w>432</w>
-      <h>96</h>
-    </coordinates>
-    <panel_attributes>StartHeightSection
---
---
-+ enter_workpiece(Workpiece)</panel_attributes>
-    <additional_attributes/>
-  </element>
-  <element>
-    <id>Relation</id>
-    <coordinates>
-      <x>576</x>
-      <y>144</y>
-      <w>208</w>
-      <h>112</h>
-    </coordinates>
-    <panel_attributes>lt=&lt;&lt;-</panel_attributes>
-    <additional_attributes>10.0;50.0;10.0;10.0;110.0;10.0</additional_attributes>
-  </element>
   <element>
     <id>UMLNote</id>
     <coordinates>
-      <x>944</x>
+      <x>912</x>
       <y>48</y>
       <w>384</w>
       <h>64</h>
@@ -238,19 +215,21 @@ bg=yellow</panel_attributes>
   <element>
     <id>UMLNote</id>
     <coordinates>
-      <x>816</x>
+      <x>784</x>
       <y>912</y>
       <w>592</w>
       <h>144</h>
     </coordinates>
-    <panel_attributes>Die Methode determine_workpiece_type ist notwendig, da der workpiece_type erst bestimmt werden kann, sobald das Teil an LB_SW angelangt ist.
+    <panel_attributes>Die Methode determine_workpiece_type ist notwendig, 
+da der workpiece_type erst bestimmt werden kann,
+sobald das Teil an LB_SW angelangt ist.
 bg=yellow</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>528</x>
+      <x>496</x>
       <y>896</y>
       <w>320</w>
       <h>80</h>
@@ -261,26 +240,25 @@ bg=yellow</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>208</x>
+      <x>176</x>
       <y>992</y>
       <w>512</w>
-      <h>240</h>
+      <h>192</h>
     </coordinates>
     <panel_attributes>EncodedWorkpiece
 --
 + _code: int {32 Bit} {readonly}
 --
-+ &lt;&lt;Create&gt;&gt; Encoded_Workpiece(Workpiece)
 + &lt;&lt;Create&gt;&gt; Encoded_Workpiece(code: int)
-- get_id(): id
-- get_height_1(): float
-- get_type(): WorkpieceType</panel_attributes>
++ get_id(): id
++ get_height(): float
++ get_type(): WorkpieceType</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <id>UMLNote</id>
     <coordinates>
-      <x>816</x>
+      <x>784</x>
       <y>1088</y>
       <w>464</w>
       <h>144</h>
@@ -295,7 +273,7 @@ bg=yellow</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>512</x>
+      <x>480</x>
       <y>1024</y>
       <w>336</w>
       <h>112</h>

From f5a1958ee768eee5613fd73909a263d6eb7da1d9 Mon Sep 17 00:00:00 2001
From: Jendrik <jendrik.stoltzaw-hamburg.de>
Date: Sun, 20 Jun 2021 17:59:10 +0200
Subject: [PATCH 2/3] Update Datamodel to match implementation

---
 diagrams/stage3/cd_data.uxf | 251 ++++++++++++++++++++++++------------
 1 file changed, 170 insertions(+), 81 deletions(-)

diff --git a/diagrams/stage3/cd_data.uxf b/diagrams/stage3/cd_data.uxf
index 5cf3ca5..499cf4c 100644
--- a/diagrams/stage3/cd_data.uxf
+++ b/diagrams/stage3/cd_data.uxf
@@ -1,19 +1,23 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
 <diagram program="umlet" version="14.3.0">
-  <zoom_level>16</zoom_level>
+  <zoom_level>10</zoom_level>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>928</x>
-      <y>336</y>
-      <w>480</w>
-      <h>320</h>
+      <x>1120</x>
+      <y>370</y>
+      <w>300</w>
+      <h>280</h>
     </coordinates>
-    <panel_attributes>Anlage
+    <panel_attributes>UnitData
 --
 + belt_is_blocked: bool
 + ramp_full: bool
 + pending_transfer: Workpiece
++ estop_count: int
++ estop_triggered:bool
++ warning_count: int
++ srv_pending: int
 - _unit_mutex: mutex
 --
 + wrpc_fits_order(Workpiece): bool
@@ -27,10 +31,10 @@
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>176</x>
-      <y>608</y>
-      <w>512</w>
-      <h>320</h>
+      <x>650</x>
+      <y>630</y>
+      <w>320</w>
+      <h>200</h>
     </coordinates>
     <panel_attributes>Workpiece
 --
@@ -50,10 +54,10 @@
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>1008</x>
-      <y>688</y>
-      <w>256</w>
-      <h>208</h>
+      <x>1150</x>
+      <y>680</y>
+      <w>160</w>
+      <h>130</h>
     </coordinates>
     <panel_attributes>&lt;&lt;enumeration&gt;&gt;
 WorkpieceType
@@ -68,10 +72,10 @@ unkown</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>176</x>
-      <y>176</y>
-      <w>464</w>
-      <h>320</h>
+      <x>650</x>
+      <y>360</y>
+      <w>290</w>
+      <h>200</h>
     </coordinates>
     <panel_attributes>CBSection
 --
@@ -91,21 +95,21 @@ unkown</panel_attributes>
   <element>
     <id>UMLFrame</id>
     <coordinates>
-      <x>128</x>
-      <y>0</y>
-      <w>1424</w>
-      <h>1280</h>
+      <x>620</x>
+      <y>140</y>
+      <w>890</w>
+      <h>910</h>
     </coordinates>
-    <panel_attributes>cd Data</panel_attributes>
+    <panel_attributes>cd Datamodel</panel_attributes>
     <additional_attributes/>
   </element>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>624</x>
-      <y>320</y>
-      <w>336</w>
-      <h>80</h>
+      <x>930</x>
+      <y>450</y>
+      <w>210</w>
+      <h>50</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;&lt;&lt;&lt;-
 - _height_switch_sec
@@ -115,10 +119,10 @@ unkown</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>208</x>
-      <y>480</y>
-      <w>80</w>
-      <h>160</h>
+      <x>670</x>
+      <y>550</y>
+      <w>50</w>
+      <h>100</h>
     </coordinates>
     <panel_attributes>lt=-&gt;&gt;&gt;&gt;
 m1=0..*
@@ -128,22 +132,22 @@ m2=1</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>672</x>
+      <x>960</x>
       <y>640</y>
-      <w>320</w>
-      <h>64</h>
+      <w>200</w>
+      <h>50</h>
     </coordinates>
     <panel_attributes>lt=&lt;.
 &lt;&lt;create&gt;&gt;</panel_attributes>
-    <additional_attributes>10.0;20.0;180.0;20.0;180.0;10.0</additional_attributes>
+    <additional_attributes>10.0;30.0;180.0;30.0;180.0;10.0</additional_attributes>
   </element>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>320</x>
-      <y>80</y>
-      <w>208</w>
-      <h>128</h>
+      <x>740</x>
+      <y>300</y>
+      <w>130</w>
+      <h>80</h>
     </coordinates>
     <panel_attributes>lt=-&gt;
 _next_section
@@ -154,22 +158,22 @@ m2=0..1</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>624</x>
-      <y>240</y>
-      <w>576</w>
-      <h>128</h>
+      <x>930</x>
+      <y>410</y>
+      <w>210</w>
+      <h>40</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;&lt;&lt;&lt;-
 - _start_height_sec</panel_attributes>
-    <additional_attributes>220.0;60.0;220.0;10.0;10.0;10.0</additional_attributes>
+    <additional_attributes>190.0;20.0;10.0;20.0</additional_attributes>
   </element>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>624</x>
-      <y>384</y>
-      <w>336</w>
-      <h>64</h>
+      <x>930</x>
+      <y>490</y>
+      <w>210</w>
+      <h>40</h>
     </coordinates>
     <panel_attributes>lt=&lt;&lt;&lt;&lt;&lt;-
 -_switch_end_sec</panel_attributes>
@@ -178,35 +182,35 @@ m2=0..1</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>1248</x>
+      <x>1300</x>
       <y>640</y>
-      <w>240</w>
-      <h>176</h>
+      <w>170</w>
+      <h>120</h>
     </coordinates>
     <panel_attributes>lt=-&gt;
 _next_in
 sorting_order</panel_attributes>
-    <additional_attributes>50.0;10.0;50.0;90.0;10.0;90.0</additional_attributes>
+    <additional_attributes>70.0;10.0;70.0;100.0;10.0;100.0</additional_attributes>
   </element>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>672</x>
-      <y>752</y>
-      <w>368</w>
-      <h>64</h>
+      <x>960</x>
+      <y>720</y>
+      <w>210</w>
+      <h>40</h>
     </coordinates>
     <panel_attributes>lt=-&gt;
 type = unknown</panel_attributes>
-    <additional_attributes>10.0;20.0;210.0;20.0</additional_attributes>
+    <additional_attributes>10.0;20.0;190.0;20.0</additional_attributes>
   </element>
   <element>
     <id>UMLNote</id>
     <coordinates>
-      <x>912</x>
-      <y>48</y>
-      <w>384</w>
-      <h>64</h>
+      <x>650</x>
+      <y>230</y>
+      <w>240</w>
+      <h>40</h>
     </coordinates>
     <panel_attributes>using id = int; {max 21 Bit}
 bg=yellow</panel_attributes>
@@ -215,10 +219,10 @@ bg=yellow</panel_attributes>
   <element>
     <id>UMLNote</id>
     <coordinates>
-      <x>784</x>
-      <y>912</y>
-      <w>592</w>
-      <h>144</h>
+      <x>1030</x>
+      <y>820</y>
+      <w>370</w>
+      <h>90</h>
     </coordinates>
     <panel_attributes>Die Methode determine_workpiece_type ist notwendig, 
 da der workpiece_type erst bestimmt werden kann,
@@ -229,10 +233,10 @@ bg=yellow</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>496</x>
-      <y>896</y>
-      <w>320</w>
-      <h>80</h>
+      <x>850</x>
+      <y>810</y>
+      <w>200</w>
+      <h>50</h>
     </coordinates>
     <panel_attributes>lt=..</panel_attributes>
     <additional_attributes>180.0;30.0;150.0;10.0;10.0;10.0</additional_attributes>
@@ -240,10 +244,10 @@ bg=yellow</panel_attributes>
   <element>
     <id>UMLClass</id>
     <coordinates>
-      <x>176</x>
-      <y>992</y>
-      <w>512</w>
-      <h>192</h>
+      <x>650</x>
+      <y>870</y>
+      <w>320</w>
+      <h>120</h>
     </coordinates>
     <panel_attributes>EncodedWorkpiece
 --
@@ -258,10 +262,10 @@ bg=yellow</panel_attributes>
   <element>
     <id>UMLNote</id>
     <coordinates>
-      <x>784</x>
-      <y>1088</y>
-      <w>464</w>
-      <h>144</h>
+      <x>1030</x>
+      <y>930</y>
+      <w>290</w>
+      <h>90</h>
     </coordinates>
     <panel_attributes>_code ist wie folgt codiert:
   - 21 Bit id
@@ -273,12 +277,97 @@ bg=yellow</panel_attributes>
   <element>
     <id>Relation</id>
     <coordinates>
-      <x>480</x>
-      <y>1024</y>
-      <w>336</w>
-      <h>112</h>
+      <x>840</x>
+      <y>890</y>
+      <w>210</w>
+      <h>70</h>
     </coordinates>
     <panel_attributes>lt=..</panel_attributes>
     <additional_attributes>190.0;50.0;140.0;10.0;10.0;10.0</additional_attributes>
   </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>930</x>
+      <y>180</y>
+      <w>160</w>
+      <h>130</h>
+    </coordinates>
+    <panel_attributes>&lt;&lt;enumeration&gt;&gt;
+UnitType
+--
+PRIMARY
+SECONDARY</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>1310</x>
+      <y>180</y>
+      <w>160</w>
+      <h>130</h>
+    </coordinates>
+    <panel_attributes>&lt;&lt;enumeration&gt;&gt;
+OperatingMode
+--
+IDLE
+RUNNING
+ERROR
+ESTOP
+SERVICE</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>1000</x>
+      <y>300</y>
+      <w>140</w>
+      <h>110</h>
+    </coordinates>
+    <panel_attributes>lt=-&gt;
+unit_type</panel_attributes>
+    <additional_attributes>10.0;10.0;10.0;90.0;120.0;90.0</additional_attributes>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>1380</x>
+      <y>300</y>
+      <w>130</w>
+      <h>90</h>
+    </coordinates>
+    <panel_attributes>lt=-&gt;
+operating_mode</panel_attributes>
+    <additional_attributes>10.0;10.0;10.0;70.0</additional_attributes>
+  </element>
+  <element>
+    <id>UMLClass</id>
+    <coordinates>
+      <x>1120</x>
+      <y>180</y>
+      <w>160</w>
+      <h>130</h>
+    </coordinates>
+    <panel_attributes>&lt;&lt;enumeration&gt;&gt;
+Error
+--
+OTHER_SYSTEM
+RAMP_FULL
+NO_ERROR</panel_attributes>
+    <additional_attributes/>
+  </element>
+  <element>
+    <id>Relation</id>
+    <coordinates>
+      <x>1190</x>
+      <y>300</y>
+      <w>120</w>
+      <h>90</h>
+    </coordinates>
+    <panel_attributes>lt=-&gt;
+pending_error</panel_attributes>
+    <additional_attributes>10.0;10.0;10.0;70.0</additional_attributes>
+  </element>
 </diagram>

From 96cabf2ec10fba02e271f09a62cccf529663719b Mon Sep 17 00:00:00 2001
From: Jendrik <jendrik.stoltzaw-hamburg.de>
Date: Sun, 20 Jun 2021 18:03:32 +0200
Subject: [PATCH 3/3] Add diagram to latex

---
 latex/Chapters/4_design.tex | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/latex/Chapters/4_design.tex b/latex/Chapters/4_design.tex
index fddb6c3..764b899 100644
--- a/latex/Chapters/4_design.tex
+++ b/latex/Chapters/4_design.tex
@@ -126,6 +126,12 @@ \subsection{hal\_sensors}\label{subsec:hal_sensors}
 \FloatBarrier
 \section{Datenmodellierung}\label{sec:datenmodellierung}
 
+\begin{figure}
+    \makebox[\textwidth][c]{\includegraphics[width=1.25\textwidth]{../out/diagrams/stage3/cd_data}}
+    \caption{Klassendiagramm Datenmodell}
+    \label{fig:cd-datamodel}
+\end{figure}
+
 %% Bestimmen Sie das Datenmodell und dokumentieren Sie es hier mit Hilfe von UML Klassendiagrammen
 %% unter Beachtung der Designprinzipien. Die Modelle können mit Hilfe eines UML-Tools erstellt werden.
 %% Hier ist dann ein Übersichtsbild einzufügen.