From 79b69334dfa9978ef268f5090b1fe412dc708af6 Mon Sep 17 00:00:00 2001 From: Harald Pichler Date: Thu, 3 Nov 2016 08:11:42 +0100 Subject: [PATCH] cleanup code --- examples/osd/opentrigger-board/opentrigger.c | 7 +------ examples/osd/opentrigger-board/opentrigger.h | 1 + examples/osd/opentrigger-board/sketch.pde | 19 ++++++++++++------- 3 files changed, 14 insertions(+), 13 deletions(-) diff --git a/examples/osd/opentrigger-board/opentrigger.c b/examples/osd/opentrigger-board/opentrigger.c index 141cc316a..97a924315 100644 --- a/examples/osd/opentrigger-board/opentrigger.c +++ b/examples/osd/opentrigger-board/opentrigger.c @@ -75,12 +75,7 @@ PROCESS_THREAD(arduino_sketch, ev, data) if(ev == sensors_event && data == &button_sensor) { mcu_sleep_off(); PRINTF("*******BUTTON*******\n"); - - /* Call the event_handler for this application-specific event. */ - res_event.trigger(); - - /* Also call the separate response example handler. */ - res_separate.resume(); + button (); mcu_sleep_on(); } #endif /* PLATFORM_HAS_BUTTON */ diff --git a/examples/osd/opentrigger-board/opentrigger.h b/examples/osd/opentrigger-board/opentrigger.h index bea6708f8..905f9d47c 100644 --- a/examples/osd/opentrigger-board/opentrigger.h +++ b/examples/osd/opentrigger-board/opentrigger.h @@ -61,6 +61,7 @@ void mcu_sleep_set(uint8_t value); extern void loop (void); extern void setup (void); extern void arduino_init (void); +extern void button (void); extern struct process arduino_sketch; diff --git a/examples/osd/opentrigger-board/sketch.pde b/examples/osd/opentrigger-board/sketch.pde index d1fd5a2bb..7072a6f4b 100755 --- a/examples/osd/opentrigger-board/sketch.pde +++ b/examples/osd/opentrigger-board/sketch.pde @@ -232,16 +232,21 @@ int coap_server_post(void) return 0; } +void button (void) +{ + /* Call the event_handler for this application-specific event. */ + res_event.trigger(); + + /* Also call the separate response example handler. */ + res_separate.resume(); + + /* Call the Coap Server */ + coap_server_post(); +} + void loop (void) { -// test caop srever post - static int buttonstate = 1; - - if(buttonstate != button_sensor.value(0)){ - coap_server_post(); - buttonstate=button_sensor.value(0); - } // test chainable led /* static byte power=0;