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

Merge pull request #1476 from alignan/pull/update-weather-meter

Browse source 
Updated to new adc-zoul renaming
This commit is contained in:
Antonio Lignan 2016-01-23 16:20:22 +01:00
parent 481bcd9e00 66ebca3ade
commit 9a5682b75b
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -45,7 +45,7 @@
/*---------------------------------------------------------------------------*/ /*---------------------------------------------------------------------------*/
#include <stdio.h> #include <stdio.h>
#include "contiki.h" #include "contiki.h"
#include "dev/adc-sensors.h" #include "dev/adc-zoul.h"
#include "dev/weather-meter.h" #include "dev/weather-meter.h"
#include "dev/zoul-sensors.h" #include "dev/zoul-sensors.h"
#include "lib/sensors.h" #include "lib/sensors.h"
@ -178,7 +178,7 @@ weather_meter_wind_vane_degrees(uint16_t value)
static int static int
weather_meter_get_wind_dir(void) weather_meter_get_wind_dir(void)
{ {
weather_sensors.wind_vane = adc_sensors.value(WIND_VANE_ADC); weather_sensors.wind_vane = adc_zoul.value(WIND_VANE_ADC);
if((int16_t)weather_sensors.wind_vane < 0) { if((int16_t)weather_sensors.wind_vane < 0) {
weather_sensors.wind_vane = 0; weather_sensors.wind_vane = 0;
} }
@ -412,7 +412,7 @@ configure(int type, int value)
} }
/* Configure the wind vane */ /* Configure the wind vane */
adc_sensors.configure(SENSORS_HW_INIT, WIND_VANE_ADC); adc_zoul.configure(SENSORS_HW_INIT, WIND_VANE_ADC);
/* Configure anemometer interruption */ /* Configure anemometer interruption */
GPIO_SOFTWARE_CONTROL(ANEMOMETER_SENSOR_PORT_BASE, ANEMOMETER_SENSOR_PIN_MASK); GPIO_SOFTWARE_CONTROL(ANEMOMETER_SENSOR_PORT_BASE, ANEMOMETER_SENSOR_PIN_MASK);