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

Merge pull request #1487 from alignan/pull/weather-meter-wind-bane-fix

Browse source 
Fixed casts and calculations for the wind direction circular averaging
This commit is contained in:
Antonio Lignan 2016-01-31 23:40:42 +01:00
parent 7d6966b22c 35345cdb40
commit 447286197f
1 changed files with 13 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -102,9 +102,9 @@ typedef struct {
} weather_meter_sensors; } weather_meter_sensors;
typedef struct { typedef struct {
uint32_t value_buf_xm; int32_t value_buf_xm;
uint16_t value_prev; int16_t value_prev;
uint16_t value_avg_xm; int16_t value_avg_xm;
} weather_meter_wind_vane_ext_t; } weather_meter_wind_vane_ext_t;
static weather_meter_sensors weather_sensors; static weather_meter_sensors weather_sensors;
@ -232,13 +232,18 @@ rt_callback(struct rtimer *t, void *ptr)
anemometer.value_avg_xm = 0; anemometer.value_avg_xm = 0;
} }
wind_vane.value_buf_xm = wind_vane.value_buf_xm / WEATHER_METER_AVG_PERIOD; if(wind_vane.value_buf_xm >= 0) {
wind_vane.value_avg_xm = (uint16_t)wind_vane.value_buf_xm; wind_vane.value_buf_xm = wind_vane.value_buf_xm / WEATHER_METER_AVG_PERIOD;
if(wind_vane.value_avg_xm >= 3600) { wind_vane.value_avg_xm = wind_vane.value_buf_xm;
wind_vane.value_avg_xm -= 3600; } else {
wind_vane.value_buf_xm = ABS(wind_vane.value_buf_xm) / WEATHER_METER_AVG_PERIOD;
wind_vane.value_avg_xm = wind_vane.value_buf_xm;
wind_vane.value_avg_xm = ~wind_vane.value_avg_xm + 1;
} }
if(wind_vane.value_avg_xm < 0) { if(wind_vane.value_avg_xm >= 3600) {
wind_vane.value_avg_xm -= 3600;
} else if(wind_vane.value_avg_xm < 0) {
wind_vane.value_avg_xm += 3600; wind_vane.value_avg_xm += 3600;
} }