From 527f3eed2d8b1f25c7cd444bc60794c88b9727ca Mon Sep 17 00:00:00 2001 From: Guido Günther Date: Sun, 15 Jan 2017 18:48:45 +0100 Subject: Add image --- hw/merkur-board/macs.org | 13 ++++++++++--- hw/merkur-board/merkur-board-dht22.jpg | Bin 0 -> 71775 bytes 2 files changed, 10 insertions(+), 3 deletions(-) create mode 100644 hw/merkur-board/merkur-board-dht22.jpg diff --git a/hw/merkur-board/macs.org b/hw/merkur-board/macs.org index a671c31..fa5031c 100644 --- a/hw/merkur-board/macs.org +++ b/hw/merkur-board/macs.org @@ -48,6 +48,11 @@ * <2017-01-15 Sun> - Eigenbau 2 with correct mac - Added clean before each flash so we get a fresh firmware built with the right mac - Reflashed first stage bootloader +#+BEGIN_SRC shell + make NUM=2 +#+END_SRC + - Reflashed contiki + - pings #+BEGIN_EXAMPLE # Eigenbau 2 $ ping6 -I tun0 2001:db8:c001:f00d:221:2eff:ff00:642f @@ -58,17 +63,19 @@ 1 packets transmitted, 1 received, 0% packet loss, time 0ms rtt min/avg/max/mdev = 131.181/131.181/131.181/0.000 ms #+END_EXAMPLE - - Flashed climate2 on 4 and attached DHT21 + - Flashed first stage bootloader with correct mac and climate2 contiki on 4 and attached DHT22 - | Pin DHT21 | PIN Merkur-board | + | Pin DHT22 | PIN Merkur-board | |-----------+------------------| | 1 | +3.3V | | 2 | D3 | | 3 | N/C | | 4 | GND | - (Pins on DHT21 left to right) + (Pins on DHT22 left to right) + [[file:./merkur-board-dht22.jpg]] + - answers coap requests #+BEGIN_EXAMPLE $ ping6 -c1 -I tun0 2001:db8:c001:f00d:221:2eff:ff00:6535 PING 2001:db8:c001:f00d:221:2eff:ff00:6535(2001:db8:c001:f00d:221:2eff:ff00:6535) from 2001:db8:c001:f00d::1 tun0: 56 data bytes diff --git a/hw/merkur-board/merkur-board-dht22.jpg b/hw/merkur-board/merkur-board-dht22.jpg new file mode 100644 index 0000000..01ad9a5 Binary files /dev/null and b/hw/merkur-board/merkur-board-dht22.jpg differ -- cgit v1.2.3