Merge remote-tracking branch 'origin/main' into AddEx03Task2

exercise/fig/ex02/Fig_ECDTeTa.tex

@@ -1,32 +1,49 @@
 \begin{solutionfigure}[ht]
     \centering
     \begin{tabular}{cc}
-        ECD $T_{\mathrm{s,on}}$ & ECD $T_{\mathrm{s,off}}$\\
-        \begin{circuitikz}[european currents,european resistors,american inductors,]
-            \draw
-            (0,0) coordinate(u1o)
-            to [V,v^=$U_2$] ++(0,-3) coordinate(u1u)
-            (u1o) to [short,-] ++(-0.25,0) coordinate(o)
-            (u1u) to [short,-] ++(-1,0) coordinate(u2u)
-            (u2u) to [short,-,v^<=$u_\text{s}$,mirror,voltage=straight] ++(0,3) coordinate(u2o)
-            (u2o) to [short,-] ++(0.25,0) coordinate(u) ++ (-3.5,0) coordinate(u3o)
-            (u3o) to [V,v_=$U_1$] ++(0,-3) coordinate(u3u)
-            (u3u) to [short,-] ++(3.5,0) coordinate(t)
-
-            (u3o) ++(+2,0) to [L,l_=$L$,v^<=$u_\text{L}(t)$,mirror,voltage=straight]   
-             ++(-1,0) coordinate(uqo)
-            (u3o) to [short,-] ++(1,0) coordinate(v1)
-            (u2o) to [short,-] ++(-1.15,0) coordinate(v2)
-            (u2o) to [short,-,i^<=$i_L$(t)] ++(-1,0)
-            ;
-        \end{circuitikz} 
-    &
+               \begin{circuitikz}[european currents,european resistors,american inductors]
+                    \draw 
+                            % Base coordinates
+                            (0,0) coordinate (jU1v)
+                            (0,-3) coordinate (jU1g)
+                            % Add components
+                            % Add primary source U1
+                            (jU1v) to [V,v_=$U_1$] (jU1g)
+                            % Add current symbole
+                         %   (jU1v) to [short,i^>=$i_\mathrm{1}$(t)] (1,0)
+
+                            (jU1v) ++(3,0) coordinate (jLv)
+                            % Add inductance
+                            (jU1v) to  [L=$L$] (jLv)
+                           % Add current IL symbole
+                            (2.2,0)  to [short,i_>=$i_\mathrm{L}$(t)] (3.5,0)
+                            % Continue horisontal line
+                            (jLv) to  [short,-*] ++ (0.5,0) coordinate (jPtv)
+                            % Add vertical line
+                            (jLv) ++ (0.5,0) coordinate  (jUv)
+                            (jUv) ++ (0,-3) coordinate  (jLg)
+                            (jUv)  to [short,-*] (jLg)
+                            % Add horizontal line
+                            (jLg) ++ (1,0) coordinate  (jU2g)
+                            (jLg)  to [short,-] (jU2g)
+                            % Add second source
+                            (jU2g) ++ (0,3) coordinate (jU2v)
+                            (jU2v)  to [V=$U_2$] (jU2g)
+                            % Add horizontal line
+                            (jLg) to [short,-] (jU1g)
+                            % Continue horizontal lines
+                            (jU2v) to [short,-] (4.2,0)
+                            (jLv) to [short,-] (3.8,0)
+
+                   ;
+                \end{circuitikz}
+            &
 
         \begin{circuitikz}[european currents,european resistors,american inductors,]
             \draw
             (0,0) coordinate(u2o)
             to [V,v^=$U_2$, voltage=straight] ++(0,-3) coordinate(u2u)
-                (u2o) to [short,-,i^<=$i_L$(t)] ++(-1,0) to [L,l_=$L$,v^<=$u_\text{L}(t)$,mirror,voltage=straight] ++(-3,0) coordinate(Ll) ++(-1,0) coordinate(uqo)
+                (u2o) to [short,-,i^<=$i_\mathrm{L}$(t)] ++(-1,0) to [L,l_=$L$,v^<=$u_\text{L}(t)$,mirror,voltage=straight] ++(-3,0) coordinate(Ll) ++(-1,0) coordinate(uqo)
                 (-4,0) to [V,v_=$U_1$] ++(0,-3) coordinate(u2u)
                 (-4,-3)  to [short,-] ++(4,0) coordinate(r)
                 ;

exercise/fig/ex02/Fig_boostConverterlosses.tex

@@ -44,7 +44,7 @@
         (11,0) to [short,i^>=$i_2$(t)] (12.5,0)
         ;
 \end{circuitikz}
-    \caption{Boost converter with losses}
+    \caption{Boost converter with losses.}
      \label{fig:boost converter with losses}
 \end{center}
 %\end{tikzpicture}

exercise/fig/ex02/sFig_boost_voltage_efficiency.tex

@@ -21,9 +21,9 @@
                 grid
                 ]
                 \addplot[signalblue, domain=0:0.95] {(1-x)/((1-x)^2)};
-                \node[signalblue, fill=white, inner sep = 1pt, anchor = south] at (axis cs:0.5,8) {ideal function};
+                \node[signalblue, fill=white, inner sep = 1pt, anchor = south] at (axis cs:0.5,8) {ideal converter};
                 \addplot[signalred, domain=0:1.0] {(1-x)/((1-x)^2+0.2/30)};
-                \node[signalred, fill=white, inner sep = 1pt, anchor = south] at (axis cs:0.5,7) {function with losses};
+                \node[signalred, fill=white, inner sep = 1pt, anchor = south] at (axis cs:0.5,7) {converter with losses};
                 \end{axis}
         \end{tikzpicture}
     \end{subfigure}%
@@ -47,9 +47,9 @@
                 grid
                 ]
                 \addplot[signalblue, domain=0:1] {1};
-                \node[signalblue, fill=white, inner sep = 1pt, anchor = south] at (axis cs:0.5,0.4) {ideal function};
+                \node[signalblue, fill=white, inner sep = 1pt, anchor = south] at (axis cs:0.5,0.4) {ideal converter};
                 \addplot[signalred, domain=0:1] {1/(1+(0.2/30)/(1-x)^2)};
-                \node[signalred, fill=white, inner sep = 1pt, anchor = south] at (axis cs:0.5,0.3) {function with losses};
+                \node[signalred, fill=white, inner sep = 1pt, anchor = south] at (axis cs:0.5,0.3) {converter with losses};
             \end{axis}
         \end{tikzpicture}
     \end{subfigure}

exercise/fig/ex02/sFig_diode_sw_off_esb.tex

@@ -13,6 +13,7 @@
         to [short, -o, i=$i_2(t)$] (0,2) 
         (S.mid) to [short, o-*](\x1,0);
         \draw (-1.5,2) to [capacitor, *-*, l=$C$, i>^=$i_\mathrm{C}(t)$] ++(0,-2);
+        \draw (-6,2) to [open, v>=$u_1(t)\hspace{0.3cm}$, voltage = straight] ++(0,-2);
     \end{circuitikz}
     \caption{Equivalent circuit diagram of the diode switch-off event.}
     \label{fig:DiodeSwitchOff}