From 5fcac26e80c1437894cdc3339e5a26ded20371c5 Mon Sep 17 00:00:00 2001
From: harald <harald@osd>
Date: Wed, 30 Apr 2014 15:20:25 +0200
Subject: [PATCH] get s/button ->show  button status 0/1

---
 examples/osd/merkurboard/er-example-server.c | 13 ++++++++++---
 platform/osd-merkur/dev/button-sensor.c      |  3 ++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/examples/osd/merkurboard/er-example-server.c b/examples/osd/merkurboard/er-example-server.c
index df1c6e0c5..5e79f8468 100644
--- a/examples/osd/merkurboard/er-example-server.c
+++ b/examples/osd/merkurboard/er-example-server.c
@@ -293,10 +293,17 @@ EVENT_RESOURCE(event, METHOD_GET, "s/button", "title=\"Event demo\";obs");
 void
 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);
-  /* Usually, a CoAP server would response with the current resource representation. */
-  const char *msg = "It's eventful!";
-  REST.set_response_payload(response, (uint8_t *)msg, strlen(msg));
+  REST.set_response_payload(response, buffer, length);
 
   /* A post_handler that handles subscriptions/observing will be called for periodic resources by the framework. */
 }
diff --git a/platform/osd-merkur/dev/button-sensor.c b/platform/osd-merkur/dev/button-sensor.c
index 825467781..4bf62ea5a 100644
--- a/platform/osd-merkur/dev/button-sensor.c
+++ b/platform/osd-merkur/dev/button-sensor.c
@@ -39,7 +39,8 @@ ISR(INT4_vect)
 static int
 value(int type)
 {
- return (PORTE & _BV(PE4) ? 0 : 1) || !timer_expired(&debouncetimer);
+ return (PINE & _BV(PE4) ? 0 : 1) || !timer_expired(&debouncetimer);
+
  //return 0;
 }