Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed problem with netatmo wind guages. #1

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Fixed problem with netatmo wind guages. #1

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
34dcc40
Fixed problem with netatmo wind guages.
andreask Jan 26, 2016
7ab465f
Updated correct spelling on Measure.
andreask Jan 27, 2016
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 16 additions & 12 deletions weather.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,19 +81,19 @@ type Device struct {
}

// DashboardData is used to store sensor values
// Temperature : Last temperature measure @ LastMesure (in °C)
// Humidity : Last humidity measured @ LastMesure (in %)
// Temperature : Last temperature measure @ LastMeasure (in °C)
// Humidity : Last humidity measured @ LastMeasure (in %)
// CO2 : Last Co2 measured @ time_utc (in ppm)
// Noise : Last noise measured @ LastMesure (in db)
// Pressure : Last Sea level pressure measured @ LastMesure (in mb)
// AbsolutePressure : Real measured pressure @ LastMesure (in mb)
// Noise : Last noise measured @ LastMeasure (in db)
// Pressure : Last Sea level pressure measured @ LastMeasure (in mb)
// AbsolutePressure : Real measured pressure @ LastMeasure (in mb)
// Rain : Last rain measured (in mm)
// Rain1Hour : Amount of rain in last hour
// Rain1Day : Amount of rain today
// WindAngle : Current 5 min average wind direction @ LastMesure (in °)
// WindStrength : Current 5 min average wind speed @ LastMesure (in km/h)
// GustAngle : Direction of the last 5 min highest gust wind @ LastMesure (in °)
// GustStrength : Speed of the last 5 min highest gust wind @ LastMesure (in km/h)
// WindAngle : Current 5 min average wind direction @ LastMeasure (in °)
// WindStrength : Current 5 min average wind speed @ LastMeasure (in km/h)
// GustAngle : Direction of the last 5 min highest gust wind @ LastMeasure (in °)
// GustStrength : Speed of the last 5 min highest gust wind @ LastMeasure (in km/h)
// LastMessage : Contains timestamp of last data received
type DashboardData struct {
Temperature float32 `json:"Temperature,omitempty"`
Expand All @@ -108,8 +108,8 @@ type DashboardData struct {
WindAngle float32 `json:"WindAngle,omitempty"`
WindStrength float32 `json:"WindStrength,omitempty"`
GustAngle float32 `json:"GustAngle,omitempty"`
GustStrengthfloat32 float32 `json:"GustStrengthfloat32,omitempty"`
LastMesure float64 `json:"time_utc"`
GustStrength float32 `json:"GustStrength,omitempty"`
LastMeasure float64 `json:"time_utc"`
}

// NewClient create a handle authentication to Netamo API
Expand Down Expand Up @@ -213,6 +213,10 @@ func (c *Client) GetDeviceCollection() (*DeviceCollection, error) {
// associated each module to its station
for i, station := range dc.Body.Stations {
for _, module := range dc.Body.Modules {
// Check for wind module, and correct information coming from netatmo
if module.Type == "NAModule2" {
module.DataType = []string {"WindAngle", "WindStrength", "GustAngle", "GustStrength"}
}
if module.MainDevice == station.ID {
dc.Body.Stations[i].AssociatedModules = append(dc.Body.Stations[i].AssociatedModules, module)
}
Expand Down Expand Up @@ -244,5 +248,5 @@ func (s *Device) Data() (int, map[string]interface{}) {
m[datatype] = reflect.Indirect(reflect.ValueOf(s.DashboardData)).FieldByName(datatype).Interface()
}

return int(s.DashboardData.LastMesure), m
return int(s.DashboardData.LastMeasure), m
}