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

Merge branch 'osd' of https://github.com/osdomotics/osd-contiki into osd

Browse source
This commit is contained in:
Harald Pichler 2016-08-12 07:50:23 +02:00
commit 70172a9eb8
2 changed files with 10 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
apps/arduino/arduino-process.c
View file

@ -124,6 +124,7 @@ PROCESS_THREAD(arduino_sketch, ev, data)
PROCESS_WAIT_EVENT(); PROCESS_WAIT_EVENT();
#if PLATFORM_HAS_BUTTON #if PLATFORM_HAS_BUTTON
if(ev == sensors_event && data == &button_sensor) { if(ev == sensors_event && data == &button_sensor) {
mcu_sleep_off();
PRINTF("*******BUTTON*******\n"); PRINTF("*******BUTTON*******\n");
/* Call the event_handler for this application-specific event. */ /* Call the event_handler for this application-specific event. */
@ -131,11 +132,14 @@ PROCESS_THREAD(arduino_sketch, ev, data)
/* Also call the separate response example handler. */ /* Also call the separate response example handler. */
res_separate.resume(); res_separate.resume();
mcu_sleep_on();
} }
#endif /* PLATFORM_HAS_BUTTON */ #endif /* PLATFORM_HAS_BUTTON */
if(etimer_expired(&loop_periodic_timer)) { if(etimer_expired(&loop_periodic_timer)) {
mcu_sleep_off();
loop (); loop ();
mcu_sleep_on();
etimer_reset(&loop_periodic_timer); etimer_reset(&loop_periodic_timer);
} }
} }

5
examples/osd/triggerbaord/project-conf.h
View file

@ -36,10 +36,15 @@
#define PLATFORM_HAS_BUTTON 1 #define PLATFORM_HAS_BUTTON 1
#define PLATFORM_HAS_BATTERY 1 #define PLATFORM_HAS_BATTERY 1
#define LOOP_INTERVAL (10 * CLOCK_SECOND)
/* For Debug: Dont allow MCU sleeping between channel checks */ /* For Debug: Dont allow MCU sleeping between channel checks */
//#undef RDC_CONF_MCU_SLEEP //#undef RDC_CONF_MCU_SLEEP
//#define RDC_CONF_MCU_SLEEP 0 //#define RDC_CONF_MCU_SLEEP 0
/* Save energy */
//#define RDC_CONF_PT_YIELD_OFF
/* Disabling RDC for demo purposes. Core updates often require more memory. */ /* Disabling RDC for demo purposes. Core updates often require more memory. */
/* For projects, optimize memory and enable RDC again. */ /* For projects, optimize memory and enable RDC again. */
//#undef NETSTACK_CONF_RDC //#undef NETSTACK_CONF_RDC