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

make mcusleep variable, use mcusleepcycle

Browse source
This commit is contained in:
Harald Pichler 2015-09-15 09:52:06 +02:00
parent 7404e75213
commit 6b41f23d59
2 changed files with 10 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
core/net/mac/contikimac/contikimac.c
View file

@ -333,6 +333,8 @@ powercycle_turn_radio_on(void)
} }
} }
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
volatile uint8_t mcusleepcycle=16;
static char static char
powercycle(struct rtimer *t, void *ptr) powercycle(struct rtimer *t, void *ptr)
{ {
@ -458,7 +460,7 @@ powercycle(struct rtimer *t, void *ptr)
be blocked until a packet is detected */ be blocked until a packet is detected */
#if RDC_CONF_MCU_SLEEP #if RDC_CONF_MCU_SLEEP
static uint8_t sleepcycle; static uint8_t sleepcycle;
if((sleepcycle++ < 16) && !we_are_sending && !radio_is_on) { if((sleepcycle++ < mcusleepcycle) && !we_are_sending && !radio_is_on) {
rtimer_arch_sleep(CYCLE_TIME - (RTIMER_NOW() - cycle_start)); rtimer_arch_sleep(CYCLE_TIME - (RTIMER_NOW() - cycle_start));
} else { } else {
sleepcycle = 0; sleepcycle = 0;

9
examples/osd/arduino-climate3/sketch.pde
View file

@ -18,10 +18,11 @@ extern "C" {
#include "rest-engine.h" #include "rest-engine.h"
extern volatile uint8_t mcusleepcycle; // default 16
Adafruit_HTU21DF htu = Adafruit_HTU21DF(); Adafruit_HTU21DF htu = Adafruit_HTU21DF();
extern resource_t res_htu21dtemp, res_htu21dhum, res_battery; extern resource_t res_htu21dtemp, res_htu21dhum, res_battery;
float htu21d_hum; float htu21d_hum;
float htu21d_temp; float htu21d_temp;
char htu21d_hum_s[8]; char htu21d_hum_s[8];
@ -50,10 +51,14 @@ void setup (void)
// LOOP_INTERVAL (10 * CLOCK_SECOND) // LOOP_INTERVAL (10 * CLOCK_SECOND)
void loop (void) void loop (void)
{ {
mcusleepcycle=0; // dont sleep
htu21d_temp = htu.readTemperature(); htu21d_temp = htu.readTemperature();
htu21d_hum = htu.readHumidity(); htu21d_hum = htu.readHumidity();
mcusleepcycle=32; // sleep, wakeup every 32 cycles
dtostrf(htu21d_temp , 6, 2, htu21d_temp_s ); dtostrf(htu21d_temp , 6, 2, htu21d_temp_s );
dtostrf(htu21d_hum , 6, 2, htu21d_hum_s ); dtostrf(htu21d_hum , 6, 2, htu21d_hum_s );
// debug only
// printf("Temp: %s",htu21d_temp_s); // printf("Temp: %s",htu21d_temp_s);
// printf("\t\tHum: %s\n",htu21d_hum_s); // printf("\t\tHum: %s\n",htu21d_hum_s);
} }