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

Prevent calculations if tick is zero

Browse source
This commit is contained in:
Antonio Lignan 2016-01-17 02:25:00 +01:00
parent aacbcd904f
commit 0cb80b0605
1 changed files with 21 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

38
platform/zoul/dev/weather-meter.c
View file

@ -123,28 +123,30 @@ PROCESS_THREAD(weather_meter_int_process, ev, data)
} }
if(ev == PROCESS_EVENT_TIMER) { if(ev == PROCESS_EVENT_TIMER) {
if(weather_sensors.anemometer.ticks) {
/* Disable to make the calculations in an interrupt-safe context */ /* Disable to make the calculations in an interrupt-safe context */
GPIO_DISABLE_INTERRUPT(ANEMOMETER_SENSOR_PORT_BASE, GPIO_DISABLE_INTERRUPT(ANEMOMETER_SENSOR_PORT_BASE,
ANEMOMETER_SENSOR_PIN_MASK); ANEMOMETER_SENSOR_PIN_MASK);
/* The anemometer ticks twice per rotation, and a wind speed of 2.4 km/h /* The anemometer ticks twice per rotation, and a wind speed of 2.4 km/h
* makes the switch close every second, convert RPM to linear velocity * makes the switch close every second, convert RPM to linear velocity
*/ */
rpm = weather_sensors.anemometer.ticks * 30; rpm = weather_sensors.anemometer.ticks * 30;
mph = rpm * WEATHER_METER_AUX_ANGULAR; mph = rpm * WEATHER_METER_AUX_ANGULAR;
mph /= 1000; mph /= 1000;
/* This will return values in metres per hour */ /* This will return values in metres per hour */
weather_sensors.anemometer.value = (uint16_t)mph; weather_sensors.anemometer.value = (uint16_t)mph;
/* Restart the counter */ /* Restart the counter */
weather_sensors.anemometer.ticks = 0; weather_sensors.anemometer.ticks = 0;
/* Enable the interrupt again */ /* Enable the interrupt again */
GPIO_ENABLE_INTERRUPT(ANEMOMETER_SENSOR_PORT_BASE, GPIO_ENABLE_INTERRUPT(ANEMOMETER_SENSOR_PORT_BASE,
ANEMOMETER_SENSOR_PIN_MASK); ANEMOMETER_SENSOR_PIN_MASK);
etimer_restart(&et); etimer_restart(&et);
}
} }
} }
PROCESS_END(); PROCESS_END();
@ -236,6 +238,8 @@ configure(int type, int value)
weather_sensors.rain_gauge.int_en = 0; weather_sensors.rain_gauge.int_en = 0;
weather_sensors.anemometer.ticks = 0; weather_sensors.anemometer.ticks = 0;
weather_sensors.rain_gauge.ticks = 0; weather_sensors.rain_gauge.ticks = 0;
weather_sensors.anemometer.value = 0;
weather_sensors.rain_gauge.value = 0;
if(!value) { if(!value) {
anemometer_int_callback = NULL; anemometer_int_callback = NULL;