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

get s/button ->show button status 0/1

Browse source
This commit is contained in:
Harald Pichler 2014-04-30 15:20:25 +02:00
parent c106898d2b
commit d90e0d622d
2 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
examples/osd/merkurboard/er-example-server.c
View file

@ -293,10 +293,17 @@ EVENT_RESOURCE(event, METHOD_GET, "s/button", "title=\"Event demo\";obs");
void void
event_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset) event_handler(void* request, void* response, uint8_t *buffer, uint16_t preferred_size, int32_t *offset)
{ {
char message[100];
int index = 0;
int length = 0; /* |<-------->| */
int button = button_sensor.value(0);
index += sprintf(message + index,"%d",button);
length = strlen(message);
memcpy(buffer, message,length );
REST.set_header_content_type(response, REST.type.TEXT_PLAIN); REST.set_header_content_type(response, REST.type.TEXT_PLAIN);
/* Usually, a CoAP server would response with the current resource representation. */ REST.set_response_payload(response, buffer, length);
const char *msg = "It's eventful!";
REST.set_response_payload(response, (uint8_t *)msg, strlen(msg));
/* A post_handler that handles subscriptions/observing will be called for periodic resources by the framework. */ /* A post_handler that handles subscriptions/observing will be called for periodic resources by the framework. */
} }

3
platform/osd-merkur/dev/button-sensor.c
View file

@ -39,7 +39,8 @@ ISR(INT4_vect)
static int static int
value(int type) value(int type)
{ {
return (PORTE & _BV(PE4) ? 0 : 1) || !timer_expired(&debouncetimer); return (PINE & _BV(PE4) ? 0 : 1) || !timer_expired(&debouncetimer);
//return 0; //return 0;
} }