summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGuido Günther <agx@sigxcpu.org>2017-01-09 08:45:46 +0100
committerGuido Günther <agx@sigxcpu.org>2017-01-09 08:45:46 +0100
commit8b4a0eafcdabf2dc463ffa80e1593722f6ad6779 (patch)
tree805cf1101870aa4ddaf32b61ebe07cf7aacae3fc
parentd0a496917fba5024d8f9ffe2d7fbf0387016294c (diff)
improve readability
-rw-r--r--hw/merkur-board/macs.org26
1 files changed, 13 insertions, 13 deletions
diff --git a/hw/merkur-board/macs.org b/hw/merkur-board/macs.org
index 1b4ec2e..6477418 100644
--- a/hw/merkur-board/macs.org
+++ b/hw/merkur-board/macs.org
@@ -20,20 +20,20 @@
* <2016-12-04 So> - Flashed [bonsai bootloader](https://github.com/osdomotics/osd-hardware/tree/master/bootloaders/atmega-bonsai)
Several boards won't accept a second stage bootloader afterwards, reason yet unknown
* <2016-12-11 Sun> - Eigenbau 2 pingable
-** We're using the deRFmega128-22M10 with a Atmega128rfa1 so the default *TARGET=osd-merkur-128* is ok for us
-** flash new Contiki sine f87c6f crashes early, likely due to us using the [bonsai bootloader](https://github.com/osdomotics/osd-hardware/tree/master/bootloaders/atmega-bonsai) now
-** set the channel back to 26 as in f87c6f, defaults to 25 otherwise
-** slip6 see https://honk.sigxcpu.org/piki/hw/merkur-board/
-** ping
+ - We're using the deRFmega128-22M10 with a Atmega128rfa1 so the default *TARGET=osd-merkur-128* is ok for us
+ - flash new Contiki (as of 0812b89) since f87c6f crashes early, likely due to us using the [bonsai bootloader](https://github.com/osdomotics/osd-hardware/tree/master/bootloaders/atmega-bonsai) now
+ - set the channel back to 26 as in f87c6f, defaults to 25 otherwise
+ - slip6 see https://honk.sigxcpu.org/piki/hw/merkur-board/
+ - ping
- $ ping6 -c 1 -I tun0 2001:db8:c001:f00d:250:56ff:ff03:0405
- PING 2001:db8:c001:f00d:250:56ff:ff03:0405(2001:db8:c001:f00d:250:56ff:ff03:405) from 2001:db8:c001:f00d::1 tun0: 56 data bytes
- 64 bytes from 2001:db8:c001:f00d:250:56ff:ff03:405: icmp_seq=1 ttl=63 time=526 ms
+ $ ping6 -c 1 -I tun0 2001:db8:c001:f00d:250:56ff:ff03:0405
+ PING 2001:db8:c001:f00d:250:56ff:ff03:0405(2001:db8:c001:f00d:250:56ff:ff03:405) from 2001:db8:c001:f00d::1 tun0: 56 data bytes
+ 64 bytes from 2001:db8:c001:f00d:250:56ff:ff03:405: icmp_seq=1 ttl=63 time=526 ms
- --- 2001:db8:c001:f00d:250:56ff:ff03:0405 ping statistics ---
- 1 packets transmitted, 1 received, 0% packet loss, time 0ms
- rtt min/avg/max/mdev = 526.776/526.776/526.776/0.000 ms
+ --- 2001:db8:c001:f00d:250:56ff:ff03:0405 ping statistics ---
+ 1 packets transmitted, 1 received, 0% packet loss, time 0ms
+ rtt min/avg/max/mdev = 526.776/526.776/526.776/0.000 ms
-* TODO
-** flash bootloader again with correct MAC, so far we flashed the default in the bonsai code
+* TODOs
+ - [ ] flash bootloader again with correct MAC, so far we flashed the default in the bonsai code