deac/osd-contiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge branch 'osd' of https://github.com/osdomotics/osd-contiki into osd

Browse source 
Conflicts:
	cpu/avr/dev/button-sensor.c
This commit is contained in:
Harald Pichler 2016-08-16 10:38:46 +02:00
commit 91fcc28b12
2 changed files with 4 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
cpu/avr/dev/button-sensor.c
View file

@ -24,7 +24,6 @@ ISR(INT4_vect)
{
// leds_toggle(LEDS_RED);
if(BUTTON_CHECK_IRQ()) {
if(timer_expired(&debouncetimer)) {
// led1_on();