Lens

diff --git a/figures/actuatorcircuit.tex b/figures/actuatorcircuit.tex
index cbe40f2e36369d708a76335fd8a81e05a3cddba0..469609c15fa9d1ea1c8672e3af99113516fd785a 100644 (file)
--- a/figures/actuatorcircuit.tex
+++ b/figures/actuatorcircuit.tex
@@ -31,22 +31,22 @@
       (andgate.in 2) to[short, -o] ++(-0.5,0) node[anchor=east, cellred] {Amplitude}
       (andgate.out) node[anchor=west] {};
 
-    \draw (andgate.out) -- ++(0.5,0) node[nfet,bodydiode, anchor=G](nmos){};
+    \draw (andgate.out) -- ++(0.25,0) node[nfet,bodydiode, anchor=G](nmos){};
 
     \draw (nmos.S) node[tlground](GND){};
 
-    \draw (nmos.D) to[short] ++(-0.5,0) to[short] ++(0,0.5) to[L, l=\textbf{Actuator}] ++(0,1) to[short] ++(0,0.5) to[short, -*] ++(0.5,0) node[vcc](vcc){3V3};
+    \draw (nmos.D) to[short] ++(-0.5,0) to[short] ++(0,0.25) to[L, l=\textbf{Actuator}] ++(0,1) to[short] ++(0,0.25) to[short, -*] ++(0.5,0) node[vcc](vcc){3V3};
 
-    \draw (nmos.D) -- ++(0.5,0) to[short] ++(0,0.5) to[D] ++(0,1) to[short] ++(0,0.5) to[short] ++(-0.5,0);
+    \draw (nmos.D) -- ++(0.5,0) to[short] ++(0,0.25) to[D] ++(0,1) to[short] ++(0,0.25) to[short] ++(-0.5,0);
   \end{circuitikz}%
   \hfill
-  \begin{tikzpicture}[x=0.9mm,y=0.9mm]
+  \begin{tikzpicture}[x=0.8mm,y=0.8mm]
     \draw[dotted, step=10] (0,0) grid (80,50);
-    \begin{scope}[yshift=36mm]
+    \begin{scope}[yshift=32mm]
       \sqsignal{10}{20}{20}{2}{0.4mm}{cellblue}
       \node[anchor=east, cellblue] () at (0,5) {Frequency};
     \end{scope}
-    \begin{scope}[yshift=18mm]
+    \begin{scope}[yshift=16mm]
       \sqsignal{10}{3}{1}{20}{0.4mm}{cellred}
       \node[anchor=east, cellred] () at (0,5) {Amplitude};
     \end{scope}
@@ -55,10 +55,17 @@
       \sqsignal{10}{3}{1}{5}{0.6mm}{black}
       \draw[line width=0.6mm] (20,0) -- (40,0);
     \end{scope}
-    \begin{scope}[xshift=36mm]
+    \begin{scope}[xshift=32mm]
         \sqsignal{10}{3}{1}{5}{0.6mm}{black}
         \draw[line width=0.6mm] (20,0) -- (40,0);
     \end{scope}
+    %lens
+    \begin{scope}[yshift=16mm]
+      \filldraw[draw=black, fill=white, thick] (75,10) circle (12);
+      \clip (75,10) circle (12);
+      \draw[dotted, step=3] (0,0) grid (90,30);
+      \sqsignal{15}{9}{3}{10}{0.6mm}{cellred}
+    \end{scope}
   \end{tikzpicture}
   \tikzexternaldisable
   \caption[vibrotactile circuit and signal.]{On the left: electrical diagram for driving the actuators. Two signals, one for Frequency and the other for Amplitude are modulated. On the right: a low-frequency signal with 50\% duty cycle for Frequency, a high-frequency signal with an adjustable duty cycle for Amplitude, and the modulation of both signals.}