Skip to content

Commit fbb3830

Browse files
authored
Merge pull request #21 from PeterKietzmann/lastmin_fixes
Several minor lastminute fixes
2 parents b619ada + 890cb03 commit fbb3830

7 files changed

Lines changed: 43 additions & 12 deletions

File tree

README.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44

55
For links go to [https://github.com/RIOT-OS/Tutorials](https://github.com/RIOT-OS/Tutorials)
66

7-
**Quick Setup** (Using a Virtual Machine)
7+
**Quick Setup using a Virtual Machine (recommended for this Tutorial)**
88

99
* Install and set up [git](https://help.github.com/articles/set-up-git/)
1010
* Install latest [VirtualBox](https://www.virtualbox.org/wiki/Downloads) & [VirtualBox Extension Pack](https://www.virtualbox.org/wiki/Downloads) for **your system**
@@ -19,11 +19,10 @@ For links go to [https://github.com/RIOT-OS/Tutorials](https://github.com/RIOT-O
1919
cd Tutorials
2020
git submodule update --init --recursive
2121
```
22-
* Change to the `RIOT` directory: `cd Tutorials/RIOT/`
2322
* In case a virtual machine is disseminated locally, adapt the path for the vagrant box `vagrant box add RIOT/ubuntu1604 <path to box>`
2423
* Run `vagrant up` and `vagrant ssh` afterwards. See the [Vagrant RIOT Setup](https://github.com/RIOT-OS/RIOT/blob/master/dist/tools/vagrant/README.md) for a more general explanation.
2524

26-
**Recommended Setup** (Without Using a VM)
25+
**Regular Setup without using a VM (recommended for RIOT developement)**
2726

2827
* Install and set up [git](https://help.github.com/articles/set-up-git/)
2928
* Install the build-essential packet (make, gcc etc.). This varies based on the operating system in use.

phytec.png

227 KB
Loading

task-01/README.md

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,27 +41,54 @@
4141
## Task 1.2: Run your first application on real hardware
4242
1. Get to know your hardware
4343

44+
*Atmel SAM R21 Xplained Pro*
45+
4446
![SAMR21-XPRO](../SAM-R21.jpg)
4547

4648
MCU | ATSAMR21G18A
4749
-----------------------|------------------------------------
4850
Family | ARM Cortex-M0+
4951
Vendor | Atmel
50-
RAM | 32Kb
51-
Flash | 256Kb
52+
RAM/ROM | 32Kb / 256Kb
5253
Frequency | up to 48MHz
53-
FPU | no
5454
Timers | 6 (1x 16-bit, 2x 24-bit, 3x 32-bit)
5555
ADCs | 1x 12-bit (8 channels)
5656
UARTs / SPIs / I2Cs | max 5 (shared)
5757
Vcc | 1.8V - 3.6V
58+
Radio | IEEE802.15.4 @ 2,4GHz
59+
Sensors | none
60+
61+
*Phytec phyNODE KW22*
62+
63+
![phyNODE](../phytec.png)
64+
65+
MCU | MKW22D512
66+
-----------------------|------------------------------------
67+
Family | ARM Cortex-M4
68+
Vendor | Kinetis
69+
RAM/ROM | 65Kb / 512Kb
70+
Frequency | up to 50MHz
71+
Timers | up to 12 (16-bit, 24-bit, 32-bit)
72+
ADCs | 1x 16-bit (8 channels)
73+
UARTs / SPIs / I2Cs | 3 / 1 / 2
74+
Vcc | 1.8V - 3.6V
75+
Radio | IEEE802.15.4 @ 2,4GHZ
76+
Sensors | diverse
5877

5978
2. To compile an application for a specific board, we can make use of the `BOARD` environment
6079
variable.
80+
81+
In case you are running on an Atmel board, type:
6182
```sh
6283
BOARD=samr21-xpro make all flash term
6384
```
64-
This command will compile the application, burn the image onto the `samr21-xpro` and open a
85+
86+
For the (yellow) phyNODE use;
87+
```sh
88+
BOARD=pba-d-01-kw2x make all flash term
89+
```
90+
91+
This command will compile the application, burn the image onto the board and open a
6592
connection to the RIOT shell.
6693

6794
3. Verify the output of `RIOT_BOARD` matches your hardware.

task-05/README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,9 @@ USEMODULE += auto_init_gnrc_netif
3030
* Check with `ifconfig` or `ip link`!
3131

3232
## Task 5.1 -- Your first networking application
33-
* Run the application on `native`: `PORT=tap0 make all term`
33+
* Run the application on `native`: `make all term PORT=tap0`
3434
* Type `help`
35-
* Run a second instance with `PORT=tap1 make all term`
35+
* Run a second instance with `make all term PORT=tap1`
3636
* Type `ifconfig` on both to get hardware address and interface number
3737
* Use `txtsnd` command to exchange messages between the two instances
3838

task-06/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
# name of your application
2-
APPLICATION = Task04
2+
APPLICATION = Task06
33

44
# If no BOARD is found in the environment, use this default:
55
BOARD ?= native

task-08/Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,11 @@
1-
APPLICATION = ccn-lite-relay
1+
APPLICATION = Task08
22

33
# If no BOARD is found in the environment, use this default:
44
BOARD ?= native
55

6+
# This has to be the absolute path to the RIOT base directory:
7+
RIOTBASE ?= $(CURDIR)/../RIOT
8+
69
BOARD_WHITELIST := fox iotlab-m3 msba2 mulle native pba-d-01-kw2x samr21-xpro
710

811

task-08/README.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@ from [CCN-Lite](http://www.ccn-lite.net/) on RIOT. In the current state you can
66
use only one packet format, `ndn2013`, and only relay over the link-layer
77
(Ethernet, IEEE~802.15.4 or what else is supported by your network device).
88

9+
*Please note that compiling this application will clone the CCN-Lite remote repository.*
10+
911
## The shell commands
1012

1113
RIOT provides three shell to interact with the CCN-Lite stack:
@@ -42,7 +44,7 @@ RIOT provides three shell to interact with the CCN-Lite stack:
4244
* Create some content for /dagstuhl/m2m/<youraccountname>
4345
* Send an interest for /dagstuhl/m2m/<otheraccountname>
4446

45-
## Task 8.2: Modify the default shell commands
47+
## Task 8.2: Modify the default shell commands (advanced task)
4648

4749
* Take a look at the default shell commands in `sys/shell/commands/sc_ccnl.c`
4850
* Create a new command to send an interest with a shorter timeout

0 commit comments

Comments
 (0)