diff options
| author | Guido Günther <agx@sigxcpu.org> | 2016-12-12 19:29:38 +0100 |
|---|---|---|
| committer | Guido Günther <agx@sigxcpu.org> | 2016-12-12 19:29:38 +0100 |
| commit | d0a496917fba5024d8f9ffe2d7fbf0387016294c (patch) | |
| tree | cf693d2c1978cf9d90d883a4ba28a42c965b9dc5 /hw | |
| parent | 2c2dd61c9f1954ec110cd06521372ce7d82f84b9 (diff) | |
Update
Diffstat (limited to 'hw')
| -rw-r--r-- | hw/merkur-board/macs.org | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hw/merkur-board/macs.org b/hw/merkur-board/macs.org index e1ac4f4..1b4ec2e 100644 --- a/hw/merkur-board/macs.org +++ b/hw/merkur-board/macs.org @@ -20,6 +20,7 @@ * <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/ @@ -34,5 +35,5 @@ rtt min/avg/max/mdev = 526.776/526.776/526.776/0.000 ms * TODO -** flash bootloader again, current contiki doesn't recognize the stored MAC (or we didn't store it correctly) +** flash bootloader again with correct MAC, so far we flashed the default in the bonsai code |