Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Small fixes #36

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Small fixes #36

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
37b06be
slides: update Makefile to current pandoc version
OlegHahm Nov 22, 2017
663cdf7
slides: fix typo
OlegHahm Nov 22, 2017
defff21
slides: updating inkscape parameter
OlegHahm Dec 2, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions slides/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)\
Expand All @@ -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)) \
Expand Down
4 changes: 2 additions & 2 deletions slides/scripts/pandoc-svg
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
Expand Down
15 changes: 7 additions & 8 deletions slides/slides.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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`)
Expand All @@ -253,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
Expand All @@ -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}}
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Unrelated?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

yupp


## sock
* collection of unified connectivity APIs to the transport layer
Expand Down
Loading