Mercurial > louis > mq > lightsd

changeset 529:ba8ec21bf619

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
wip fosdem slides
author Louis Opter <kalessin@kalessin.fr>
date Sat, 28 Jan 2017 00:51:13 +0100
parents 6994c00c4d15
children f8d1c74a24c4
files add_slides.patch
diffstat 1 files changed, 58 insertions(+), 18 deletions(-) [+]
line wrap: on
line diff
--- a/add_slides.patch	Fri Jan 27 14:54:16 2017 +0100
+++ b/add_slides.patch	Sat Jan 28 00:51:13 2017 +0100
@@ -1704,7 +1704,7 @@
 new file mode 100644
 --- /dev/null
 +++ b/slides/fosdem_2017/fosdem_2017.tex
-@@ -0,0 +1,730 @@
+@@ -0,0 +1,770 @@
 +\documentclass[utf8x,xcolor={usenames,svgnames}]{beamer}
 +
 +\usepackage{tikz}
@@ -1745,12 +1745,17 @@
 +
 +\tikzset{bubble/.style={fill,opacity=0.7,rounded corners=2pt}}
 +\tikzset{arrow/.style={->, >=stealth,ultra thick,rounded corners}}
-+\tikzset{controlpt/.style={opacity=1}}
++\tikzset{controlpt/.style={opacity=0}}
 +\tikzset{hidden/.style={opacity=0}}
++\tikzset{wifipath/.style={thick,opacity=0.8,decorate,decoration={name=expanding waves,angle=25,segment length=3.5}}}
++\tikzset{box/.style={draw,ultra thick, color=BeamerBlue, text=black, rectangle, rounded corners=1pt}}
++
++\tikzset{screw/.style={decoration={name=snake,amplitude=0.1mm,segment length=0.6mm}}}
 +
 +\colorlet{plate}{Gainsboro}
 +\colorlet{case}{Sienna}
 +\colorlet{fgcolor}{White}
++\definecolor{BeamerBlue}{RGB}{49,56,172}
 +
 +\begin{document}
 +
@@ -1762,7 +1767,7 @@
 +
 +\begin{frame}{\texttt{\$ whoami}}
 +\onslide<1->{%
-+Hello, my name is Louis and I:\vspace{1em}
++Hello, my name is Louis (Opter) and I:\vspace{1em}
 +\begin{itemize}
 +\item am a good software engineer, a bad computer scientist;
 +\item am (distributed) systems oriented;
@@ -1782,16 +1787,14 @@
 +A controller (Monome grid 128 varibright):
 +\begin{itemize}
 +\item A matrix of 128 programmable button;
-+\item 16 levels of brightness per button;
-+\item Serial connection (FTDI).
++\item 16 levels of brightness per button.
 +\end{itemize}
 +\pause
 +\vspace{1em}
 +Controlling a "smart" bulb (LIFX Original 1000):
 +\begin{itemize}
 +\item A 1000 lumens programmable light bulb;
-+\item Nice colors, nice range of whites;
-+\item WiFi connection (2.4ghz).
++\item Nice colors, nice range of whites.
 +\end{itemize}
 +\pause
 +\vspace{1em}
@@ -2148,8 +2151,6 @@
 +
 +\subsection{Architecture}
 +
-+\tikzset{box/.style={draw,ultra thick, rectangle, rounded corners=1pt}}
-+
 +\colorlet{BodyColor}{Grey!90!black}
 +\colorlet{SocketColor}{Silver!90!black}
 +
@@ -2160,8 +2161,9 @@
 +
 +\fill[controlpt] (Origin) circle (0.1);
 +
-+\node[box] (serialoscd) at (0,1.5) {serialoscd};
-+\node[box] (monome) at (-3.5,1.5) {\begin{tikzpicture}[overlay,scale=0.5]
++\node[box] (serialoscd) at (0.5,1.5) {serialoscd};
++\draw[ultra thick] (-1.46, 2.2) -| node[above, pos=0.4] {RS232 \small{(FTDI)}} (serialoscd);
++\node (monome) at (-3.5,1.5) {\begin{tikzpicture}[scale=0.5]
 +\coordinate (NW) at (-4, 1.75);
 +\coordinate (SE) at (3.86, -2.11);
 +
@@ -2173,14 +2175,19 @@
 +\fill[mbuttoff] (\x, \y) rectangle +(0.36, -0.36);
 +\end{tikzpicture}};
 +\node[box] (monolight) at (3.5,-0.25) {monolight};
-+\node[box] (lightsd) at (0,-2) {lightsd};
-+\node (bulbh) at (-4.2,-1.2) {%
++\node[box] (lightsd) at (0.5,-2) {lightsd};
++\node (bulbh) at (-4.2,-1.1) {%
 +\colorlet{LightColor}{MediumBlue}
 +\begin{tikzpicture}[scale=0.19,rotate=90]
 +% main body
 +\fill[color=BodyColor]
 +    (-28mm,0) -- ++(0,32mm) -- ++(56mm,0) -- ++(0,-32mm) --
 +    ++(-10mm,-18mm) -- ++(-36mm,0) -- cycle;
++% main body light
++\draw[line width=1.5mm,line cap=round,rounded corners=1pt,color=BodyColor!80!white]
++    (-16mm,0.5mm) .. controls (0,-0.4mm) .. (16mm,0.5mm);
++\draw[line width=2mm,rounded corners=1pt,color=BodyColor!80!white]
++    (16.5mm,32mm) -- ++(0,-32mm) -- ++(-15mm,-22mm);
 +
 +% led - body separator
 +\fill[color=BodyColor!90!black] (-20mm,32mm) -- ++(0,2.5mm) -- ++(40mm,0) -- ++(0,-2.5mm) -- cycle;
@@ -2200,12 +2207,22 @@
 +% socket
 +\fill[color=SocketColor]
 +    (-10mm,-38mm) -- ++(0,-4mm)
-+    decorate[decoration={name=snake,amplitude=0.1mm,segment length=0.6mm}] {(-10mm,-42mm) -- ++(0,-10mm)}
++    decorate[screw] {(-10mm,-42mm) -- ++(0,-10mm)}
 +    -- ++(0,-0.5mm) -- ++(7.5mm,-6mm) -- ++(5mm,0) -- ++(7.5mm,6mm) -- ++(0,0.5mm)
-+    decorate[decoration={name=snake,amplitude=0.1mm,segment length=0.6mm}] {(10mm,-52mm) -- ++(0,10mm)}
++    decorate[screw] {(10mm,-52mm) -- ++(0,10mm)}
 +    -- (10mm,-38mm) -- ++(-20mm,0) -- ++(0,-4mm) -- cycle;
 +\draw[thin,color=SocketColor] (-10mm,-42mm) -- (10mm,-52mm);
 +
++% socket light
++\draw[line width=1mm,line cap=round,rounded corners=1pt,color=SocketColor!90!white]
++    (4.5mm,-38mm) -- ++(0,-14mm) -- ++(-4mm,-2.5mm);
++
++% lower body light
++\draw[line width=1.8mm,color=BodyColor]
++    (5mm,-18mm) -- ++(0,-20mm);
++
++% led - body separator light
++\draw[line width=1.6mm, color=BodyColor] (16mm,32mm) -- ++(0,2.5mm);
 +% led - body separator shade
 +\draw[thin, color=BodyColor!80!black] (-20mm,32mm) -- ++(0,2.5mm);
 +\draw[thin, color=BodyColor!80!black] (20mm,32mm) -- ++(0,2.5mm);
@@ -2239,13 +2256,18 @@
 +    .. controls ++(28mm,1mm) .. ++(56mm,0)
 +    -- ++(0,-14mm) -- cycle;
 +\end{tikzpicture}};
-+\node (bulbl) at (-4.2,-2.8) {%
++\node (bulbl) at (-4.2,-2.9) {%
 +\colorlet{LightColor}{BlueViolet}
 +\begin{tikzpicture}[scale=0.19,rotate=90]
 +% main body
 +\fill[color=BodyColor]
 +    (-28mm,0) -- ++(0,32mm) -- ++(56mm,0) -- ++(0,-32mm) --
 +    ++(-10mm,-18mm) -- ++(-36mm,0) -- cycle;
++% main body light
++\draw[line width=1.5mm,line cap=round,rounded corners=1pt,color=BodyColor!80!white]
++    (-16mm,0.5mm) .. controls (0,-0.4mm) .. (16mm,0.5mm);
++\draw[line width=2mm,rounded corners=1pt,color=BodyColor!80!white]
++    (16.5mm,32mm) -- ++(0,-32mm) -- ++(-15mm,-22mm);
 +
 +% led - body separator
 +\fill[color=BodyColor!90!black] (-20mm,32mm) -- ++(0,2.5mm) -- ++(40mm,0) -- ++(0,-2.5mm) -- cycle;
@@ -2265,12 +2287,22 @@
 +% socket
 +\fill[color=SocketColor]
 +    (-10mm,-38mm) -- ++(0,-4mm)
-+    decorate[decoration={name=snake,amplitude=0.1mm,segment length=0.6mm}] {(-10mm,-42mm) -- ++(0,-10mm)}
++    decorate[screw] {(-10mm,-42mm) -- ++(0,-10mm)}
 +    -- ++(0,-0.5mm) -- ++(7.5mm,-6mm) -- ++(5mm,0) -- ++(7.5mm,6mm) -- ++(0,0.5mm)
-+    decorate[decoration={name=snake,amplitude=0.1mm,segment length=0.6mm}] {(10mm,-52mm) -- ++(0,10mm)}
++    decorate[screw] {(10mm,-52mm) -- ++(0,10mm)}
 +    -- (10mm,-38mm) -- ++(-20mm,0) -- ++(0,-4mm) -- cycle;
 +\draw[thin,color=SocketColor] (-10mm,-42mm) -- (10mm,-52mm);
 +
++% socket light
++\draw[line width=1mm,line cap=round,rounded corners=1pt,color=SocketColor!90!white]
++    (4.5mm,-38mm) -- ++(0,-14mm) -- ++(-4mm,-2.5mm);
++
++% lower body light
++\draw[line width=1.8mm,color=BodyColor]
++    (5mm,-18mm) -- ++(0,-20mm);
++
++% led - body separator light
++\draw[line width=1.6mm, color=BodyColor] (16mm,32mm) -- ++(0,2.5mm);
 +% led - body separator shade
 +\draw[thin, color=BodyColor!80!black] (-20mm,32mm) -- ++(0,2.5mm);
 +\draw[thin, color=BodyColor!80!black] (20mm,32mm) -- ++(0,2.5mm);
@@ -2304,6 +2336,14 @@
 +    .. controls ++(28mm,1mm) .. ++(56mm,0)
 +    -- ++(0,-14mm) -- cycle;
 +\end{tikzpicture}};
++
++\draw[ultra thick] (serialoscd) -| node[above left] {UDP} (monolight);
++\draw[ultra thick] (lightsd) -| node[above,pos=0.25] {TCP/Unix} (monolight);
++\draw[wifipath] (bulbh.east) -- (-2.2,-1.15);
++\draw[wifipath] (lightsd.west) -- (-1.1,-2);
++\draw[wifipath] (bulbl.east) -- (-2.2,-2.85);
++\node (wifi) at (-2.3,-2.25) {\small{(2.4gHz Wi-Fi)}};
++\draw ($(wifi.north) + (0,0.2)$) node {UDP};
 +\end{tikzpicture}
 +\end{center}
 +\end{frame}