From 37b06bee68ebc73bddc242fc3ef7bf85315096e2 Mon Sep 17 00:00:00 2001 From: Oleg Hahm Date: Wed, 22 Nov 2017 23:36:12 +0100 Subject: [PATCH 1/3] slides: update Makefile to current pandoc version --- slides/Makefile | 2 +- slides/slides.md | 13 ++++++------- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/slides/Makefile b/slides/Makefile index c6e3489..8469c59 100644 --- a/slides/Makefile +++ b/slides/Makefile @@ -2,7 +2,7 @@ SRC := slides.md SCRIPTDIR=scripts FILENAME := tutorial-slides DEPS := preamble-caption.tex -PDFLAGS := -s -S -t beamer --latex-engine=xelatex --slide-level=2 +PDFLAGS := -s -t beamer+smart --pdf-engine=xelatex --slide-level=2 PDFLAGS += --filter=$(SCRIPTDIR)/pandoc-svg PDFLAGS += --filter=$(SCRIPTDIR)/overlay DEPS += $(patsubst %.svg,%.pdf,$(wildcard pictures/6lowpan-route-over*.svg)\ diff --git a/slides/slides.md b/slides/slides.md index d28809b..fb8b7b9 100644 --- a/slides/slides.md +++ b/slides/slides.md @@ -236,9 +236,8 @@ USEMODULE += xtimer # General networking architecture ## RIOT's Networking architecture * Designed to integrate any network stack into RIOT - -\only{<1>}{\includegraphics[width=\textwidth]{pictures/overview-net.pdf}} -\only{<2>}{\includegraphics[width=\textwidth]{pictures/overview-net-netdev.pdf}} +\only<1>{\includegraphics[width=\textwidth]{pictures/overview-net.pdf}} +\only<2>{\includegraphics[width=\textwidth]{pictures/overview-net-netdev.pdf}} ## Including the network device driver * Go to task-05 directory (`cd ../task-05`) @@ -264,18 +263,18 @@ USEMODULE += auto_init_gnrc_netif ## Task 5.1 -- Your first networking application * Run the application on `native`: `PORT=tap0 make all term` * Type `help` -* Run a second instance with `PORT=tap1 make all term` +* Run a second instance with `PORT=tap1 make term` * Type `ifconfig` on both to get hardware address and interface number * Use `txtsnd` command to exchange messages between the two instances ## Task 5.2 -- Use your application on real hardware -* Compile, flash, and run on the board `BOARD=samr21-xpro make all flash term` +* Compile, flash, and run on the board `BOARD=samr21-xpro make flash term` * Type `ifconfig` to get your hardware addresses * Use `txtsnd` to send one of your neighbors a friendly message ## RIOT's Networking architecture -\only{<1>}{\includegraphics[width=\textwidth]{pictures/overview-net.pdf}} -\only{<2>}{\includegraphics[width=\textwidth]{pictures/overview-net-sock.pdf}} +\only<1>{\includegraphics[width=\textwidth]{pictures/overview-net.pdf}} +\only<2>{\includegraphics[width=\textwidth]{pictures/overview-net-sock.pdf}} ## sock * collection of unified connectivity APIs to the transport layer From 663cdf72461d90d35e6bb7bbdef0e5318452f0d8 Mon Sep 17 00:00:00 2001 From: Oleg Hahm Date: Wed, 22 Nov 2017 23:47:14 +0100 Subject: [PATCH 2/3] slides: fix typo --- slides/slides.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/slides/slides.md b/slides/slides.md index fb8b7b9..095ce1a 100644 --- a/slides/slides.md +++ b/slides/slides.md @@ -252,7 +252,7 @@ USEMODULE += auto_init_gnrc_netif * Use `tapsetup` script in RIOT repository: ```sh -./../RIOT/dist/tools/tapsetup/tapsetup -c 2 +../RIOT/dist/tools/tapsetup/tapsetup -c 2 ``` * Creates From defff21dad729e2799ab49a871e4aeb381c3529f Mon Sep 17 00:00:00 2001 From: Oleg Hahm Date: Sat, 2 Dec 2023 21:48:23 +0100 Subject: [PATCH 3/3] slides: updating inkscape parameter --- slides/Makefile | 2 +- slides/scripts/pandoc-svg | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/slides/Makefile b/slides/Makefile index 8469c59..6b56be0 100644 --- a/slides/Makefile +++ b/slides/Makefile @@ -28,7 +28,7 @@ $(FILENAME).pdf: $(SRC) $(DEPS) $(foreach B,$(filter before-%.tex,$^),-B $(B)) -o $@ $(PDFLAGS) $< pictures/%.pdf: pictures/%.svg - inkscape --export-pdf=$@ $< + inkscape --export-latex=$@ $< clean: rm -f $(FILENAME)* $(filter pictures/%.pdf,$(DEPS)) \ diff --git a/slides/scripts/pandoc-svg b/slides/scripts/pandoc-svg index c5cd119..0fe8e73 100755 --- a/slides/scripts/pandoc-svg +++ b/slides/scripts/pandoc-svg @@ -14,8 +14,8 @@ from pandocfilters import toJSONFilter, Image # TODO add emf export if fmt=="docx" ? fmt_to_option = { - "latex": ("--export-pdf", "pdf"), - "beamer": ("--export-pdf", "pdf"), + "latex": ("--export-latex", "pdf"), + "beamer": ("--export-latex", "pdf"), # because of IE "html": ("--export-png", "png") }