Commit graph

9 commits

Author SHA1 Message Date
Harald Pichler e6dbb8c3f2 Merge branch 'master' into osd
Conflicts:
	examples/osd/triggerbaord/sketch.pde
2016-10-26 17:03:37 +02:00
Harald Pichler 54e676343f set reciever amplifier to -90dB if use nullmac 2016-10-20 15:41:26 +02:00
Harald Pichler 34adab3210 remove redefine routing warning 2016-10-02 22:50:10 +02:00
Harald Pichler 9226facda8 remove warnings 2016-10-02 22:49:22 +02:00
Harald Pichler c663bb527e add UIP_CONF_ROUTER to project.conf 2016-09-16 14:12:37 +02:00
Harald Pichler 8b887ca429 add button led bled to project 2016-08-20 14:09:44 +02:00
Harald Pichler 12e77a1e58 bugfix cca threshold 2016-08-18 17:26:37 +02:00
Harald Pichler d3431a0b54 bugfix contiki mac layer droped packets 2016-08-16 11:11:32 +02:00
Ralf Schlatterbeck 04bbba6c12 Multi-platform support, osd-merkur-{128,256}
Rename guhRF platform to osd-merkur-256, previous osd-merkur platform is
now osd-merkur-128. Also check that everything is consistent.
Add both platforms to the regression tests.
Move redundant files in platform dev directory of both platforms to
cpu/avr/dev. Note that this probably needs some rework. Already
discovered some inconsistency in io definitions of both devices in the
avr/io.h includes. Added a workaround in the obvious cases.
The platform makefiles now set correct parameters for bootloader and for
reading mac-address from flash memory.
Factor the flash programming into cpu/avr and platform/osd-merkur* and
rework *all* osd example makefiles to use the new settings. Also update
all the flash.sh and run.sh to use the new settings.
The suli ledstrip modules (and osd example) have also been removed.
2016-04-22 17:59:40 +02:00