diff --git a/docker/docker-compose.yml b/docker/docker-compose.yml index 6294081..6c7019a 100644 --- a/docker/docker-compose.yml +++ b/docker/docker-compose.yml @@ -4,9 +4,9 @@ services: esp: image: iot.wiai:1337/esp8266 build: ./esp - volumes: + devices: - /dev/ttyUSB0:/dev/ttyUSB0 - env: + environment: - PORT=/dev/ttyUSB0 @@ -15,7 +15,7 @@ services: image: iot.wiai:1337/flask volumes: - ./src/:/flask/ - env: + environment: - FLASK_APP=server.py ports: - - 5000:5000 \ No newline at end of file + - 5000:5000 diff --git a/docker/esp/Dockerfile b/docker/esp/Dockerfile index 5f7d486..cba2f82 100644 --- a/docker/esp/Dockerfile +++ b/docker/esp/Dockerfile @@ -1,4 +1,4 @@ FROM alpine:edge -RUN apk --update --no-cache-dir add picocom esptool +RUN echo "http://dl-cdn.alpinelinux.org/alpine/edge/testing/" >> /etc/apk/repositories && apk --update add picocom esptool ENV PORT /dev/ttyUSB0 -CMD ["picocom", "-b", "115200", "${PORT}"] \ No newline at end of file +CMD ["sh", "-c", "picocom -b 115200 ${PORT}"] diff --git a/presentation/images/repl.png b/presentation/images/repl.png new file mode 100644 index 0000000..4bc64b9 Binary files /dev/null and b/presentation/images/repl.png differ diff --git a/presentation/presentation.tex b/presentation/presentation.tex index 28923f7..13283da 100644 --- a/presentation/presentation.tex +++ b/presentation/presentation.tex @@ -179,6 +179,7 @@ Flashen: \item \texttt{picocom -b 115200 /dev/ttyUSB0} \item $n$ beherzte \textit{}-Drücke \item Docker: \texttt{docker-compose run esp} (evtl. TTY anpassen) + \item[exit] Ctrl-a Ctrl-x \end{itemize} Windows: \begin{itemize} @@ -193,7 +194,7 @@ Windows: \begin{frame}{REPL} \framesubtitle{Hello World!} -%TODO: bild mit REPL (inkl ENTERs) +\image{.7\textwidth}{repl}{REPL}{img:repl} \end{frame} @@ -226,8 +227,21 @@ import webrepl_setup \end{frame} \subsection{Init} -\begin{frame}{main.py} +\begin{frame}[fragile]{main.py} + Wird beim starten ... gestartet +\begin{lstlisting}[caption={main.py},label=mainpy] +def connect_wifi(ssid, passphrase): + #TODO ;) + pass + +def setup(): + #TODO configure sensors, ... + pass + +connect_wifi() +setup() +\end{lstlisting} \end{frame} \subsection{Exkurs: Flask-Server} @@ -250,6 +264,7 @@ Starten: \item[||] FLASK\_APP=server.py flask run \end{itemize} \end{frame} + \begin{frame}[fragile]{Daten übertragen} \begin{lstlisting}[caption={HTTP Requests},label=http] import urequests @@ -325,9 +340,8 @@ d.humidity() \begin{itemize} \item Z.B. Callbacks von Tastern \item pausieren main - \item dürf + \item dürfen keinen Speicher allozieren \item Emergency exception buffer: \textit{micropython.alloc\_emergency\_exception\_buf(100)} - \item \end{itemize} \cite{mp-interrupt} \end{frame}