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

add isr

Browse source
This commit is contained in:
harald42 2013-04-15 10:28:03 +02:00 committed by harald
parent 25fb513164
commit 797c3da239
3 changed files with 51 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
examples/osd/light-actor/er-example-server.c
View file

@ -144,6 +144,7 @@ extbutton_handler(void* request, void* response, uint8_t *buffer, uint16_t prefe
{
static char bname1[17]="button1";
static char bname2[17]="button2";
static char bname3[17]="button3";
int success = 1;
char temp[100];
@ -156,12 +157,17 @@ extbutton_handler(void* request, void* response, uint8_t *buffer, uint16_t prefe
case METHOD_GET:
// jSON Format
index += sprintf(temp + index,"{\n \"%s\" : ",bname1);
if(is_button_ext1())
if(is_button_ext4())
index += sprintf(temp + index,"\"on\",\n");
else
index += sprintf(temp + index,"\"off\",\n");
index += sprintf(temp + index," \"%s\" : ",bname2);
if(is_button_ext2())
index += sprintf(temp + index,"{\n \"%s\" : ",bname2);
if(is_button_ext5())
index += sprintf(temp + index,"\"on\",\n");
else
index += sprintf(temp + index,"\"off\",\n");
index += sprintf(temp + index," \"%s\" : ",bname3);
if(is_button_ext6())
index += sprintf(temp + index,"\"on\"\n");
else
index += sprintf(temp + index,"\"off\"\n");
@ -540,10 +546,12 @@ AUTOSTART_PROCESSES(&rest_server_example, &sensors_process);
PROCESS_THREAD(rest_server_example, ev, data)
{
static struct etimer ds_periodic_timer;
static int ext1;
static int ext2;
ext1 = is_button_ext1();
ext2 = is_button_ext2();
static int ext4;
static int ext5;
static int ext6;
ext4 = is_button_ext4();
ext5 = is_button_ext5();
ext6 = is_button_ext6();
PROCESS_BEGIN();

36
examples/osd/light-actor/pcintkey.c
View file

@ -38,22 +38,41 @@
*
*/
#include "key.h"
#include <avr/interrupt.h>
#include "dev/led.h"
#include "pcintkey.h"
/*---------------------------------------------------------------------------*/
ISR(PCINT0_vect)
{
// if(BUTTON_CHECK_IRQ()) {
// if(timer_expired(&debouncetimer)) {
led1_on();
// timer_set(&debouncetimer, CLOCK_SECOND / 4);
// sensors_changed(&button_sensor);
led1_off();
// }
// }
}
/**
* \brief This will intialize the KEY for button readings.
*/
void
key_init(void)
{
// Pairing Button
DDRB |= (0<<DDB4); // Set pin as input
PORTB |= (1<<PORTB4); // Set port PORTE bint 5 with pullup resistor
// ext1
DDRB |= (0<<DDB5); // Set pin as input
PORTB |= (1<<PORTB5); // Set port PORTE bint 5 with pullup resistor
// ext2
DDRB |= (0<<DDB6); // Set pin as input
PORTB |= (1<<PORTB6); // Set port PORTE bint 5 with pullup resistor
// Interrupt
PCICR |= _BV(PCIE0);
PCMSK0 |= _BV(PCINT4) | _BV(PCINT5) | _BV(PCINT6);
}
/*---------------------------------------------------------------------------*/
@ -65,7 +84,18 @@ key_init(void)
* \retval False if button is not pressed
*/
uint8_t
is_button_ext1(void)
is_button_ext4(void)
{
/* Return true if button has been pressed. */
if ( PINB & (1<<PINB4) ) {
return 0;
}
else{
return 1;
}
}
uint8_t
is_button_ext5(void)
{
/* Return true if button has been pressed. */
if ( PINB & (1<<PINB5) ) {
@ -76,7 +106,7 @@ is_button_ext1(void)
}
}
uint8_t
is_button_ext2(void)
is_button_ext6(void)
{
/* Return true if button has been pressed. */
if ( PINB & (1<<PINB6) ) {

5
examples/osd/light-actor/pcintkey.h
View file

@ -45,7 +45,8 @@
#include <avr/io.h>
void key_init(void);
uint8_t is_button_ext1(void);
uint8_t is_button_ext2(void);
uint8_t is_button_ext4(void);
uint8_t is_button_ext5(void);
uint8_t is_button_ext6(void);
#endif /* __KEY_H__ */