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

fixed configuration of button sensor

Browse source
This commit is contained in:
joxe 2010-08-26 16:01:20 +00:00
parent 4ad3e9d04f
commit a461eceff8
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
platform/z1/contiki-z1-main.c
View file

@ -26,7 +26,7 @@
* OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE. * SUCH DAMAGE.
* *
* @(#)$Id: contiki-z1-main.c,v 1.2 2010/08/26 09:16:39 joxe Exp $ * @(#)$Id: contiki-z1-main.c,v 1.3 2010/08/26 16:01:20 joxe Exp $
*/ */
#include <signal.h> #include <signal.h>
@ -48,6 +48,7 @@
#include "lib/random.h" #include "lib/random.h"
#include "net/netstack.h" #include "net/netstack.h"
#include "net/mac/frame802154.h" #include "net/mac/frame802154.h"
#include "dev/button-sensor.h"
#if WITH_UIP6 #if WITH_UIP6
#include "net/uip-ds6.h" #include "net/uip-ds6.h"
@ -250,8 +251,7 @@ main(int argc, char **argv)
process_init(); process_init();
process_start(&etimer_process, NULL); process_start(&etimer_process, NULL);
//process_start(&sensors_process, NULL); process_start(&sensors_process, NULL);
PRINTF("process_sensors() skipped \n");
ctimer_init(); ctimer_init();

6
platform/z1/dev/button-sensor.c
View file

@ -28,7 +28,7 @@
* *
* This file is part of the Contiki operating system. * This file is part of the Contiki operating system.
* *
* @(#)$Id: button-sensor.c,v 1.1 2010/08/24 16:26:38 joxe Exp $ * @(#)$Id: button-sensor.c,v 1.2 2010/08/26 16:01:20 joxe Exp $
*/ */
#include "lib/sensors.h" #include "lib/sensors.h"
#include "dev/hwconf.h" #include "dev/hwconf.h"
@ -40,8 +40,8 @@ const struct sensors_sensor button_sensor;
static struct timer debouncetimer; static struct timer debouncetimer;
static int status(int type); static int status(int type);
HWCONF_PIN(BUTTON, 2, 7); HWCONF_PIN(BUTTON, 2, 5);
HWCONF_IRQ(BUTTON, 2, 7); HWCONF_IRQ(BUTTON, 2, 5);
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
interrupt(PORT2_VECTOR) interrupt(PORT2_VECTOR)