dentaku
/
netatmo-api-go
mirror of https://github.com/steinhobelgruen/netatmo-api-go.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Fix wind gauge report. Thanks to Stefan Loewe for his help

This commit is contained in:
Nicolas Leclercq 2016-11-15 16:58:52 +01:00
parent 688dd7bf76
commit 01310c1242
1 changed files with 27 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

47
weather.go
View File

@ -66,8 +66,8 @@ type Device struct {
ModuleName string `json:"module_name"` ModuleName string `json:"module_name"`
Type string Type string
DashboardData DashboardData `json:"dashboard_data"` DashboardData DashboardData `json:"dashboard_data"`
DataType []string `json:"data_type"` //DataType []string `json:"data_type"`
LinkedModules []*Device `json:"modules"` LinkedModules []*Device `json:"modules"`
} }
// DashboardData is used to store sensor values // DashboardData is used to store sensor values
@ -84,22 +84,22 @@ type Device struct {
// WindStrength : Current 5 min average wind speed @ LastMesure (in km/h) // WindStrength : Current 5 min average wind speed @ LastMesure (in km/h)
// GustAngle : Direction of the last 5 min highest gust wind @ LastMesure (in °) // 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) // GustStrength : Speed of the last 5 min highest gust wind @ LastMesure (in km/h)
// LastMessage : Contains timestamp of last data received // LastMesure : Contains timestamp of last data received
type DashboardData struct { type DashboardData struct {
Temperature float32 `json:"Temperature,omitempty"` Temperature *float32 `json:"Temperature,omitempty"` // use pointer to detect ommitted field by json mapping
Humidity int32 `json:"Humidity,omitempty"` Humidity *int32 `json:"Humidity,omitempty"`
CO2 int32 `json:"CO2,omitempty"` CO2 *int32 `json:"CO2,omitempty"`
Noise int32 `json:"Noise,omitempty"` Noise *int32 `json:"Noise,omitempty"`
Pressure float32 `json:"Pressure,omitempty"` Pressure *float32 `json:"Pressure,omitempty"`
AbsolutePressure float32 `json:"AbsolutePressure,omitempty"` AbsolutePressure *float32 `json:"AbsolutePressure,omitempty"`
Rain float32 `json:"Rain,omitempty"` Rain *float32 `json:"Rain,omitempty"`
Rain1Hour float32 `json:"sum_rain_1,omitempty"` Rain1Hour *float32 `json:"sum_rain_1,omitempty"`
Rain1Day float32 `json:"sum_rain_24,omitempty"` Rain1Day *float32 `json:"sum_rain_24,omitempty"`
WindAngle float32 `json:"WindAngle,omitempty"` WindAngle *int32 `json:"WindAngle,omitempty"`
WindStrength float32 `json:"WindStrength,omitempty"` WindStrength *int32 `json:"WindStrength,omitempty"`
GustAngle float32 `json:"GustAngle,omitempty"` GustAngle *int32 `json:"GustAngle,omitempty"`
GustStrengthfloat32 float32 `json:"GustStrengthfloat32,omitempty"` GustStrength *int32 `json:"GustStrengthfloat32,omitempty"`
LastMesure float64 `json:"time_utc"` LastMesure *int64 `json:"time_utc"`
} }
// NewClient create a handle authentication to Netamo API // NewClient create a handle authentication to Netamo API
@ -224,10 +224,17 @@ func (d *Device) Modules() []*Device {
// Data returns timestamp and the list of sensor value for this module // Data returns timestamp and the list of sensor value for this module
func (d *Device) Data() (int, map[string]interface{}) { func (d *Device) Data() (int, map[string]interface{}) {
// return only populate field of DashboardData
m := make(map[string]interface{}) m := make(map[string]interface{})
for _, datatype := range d.DataType { r := reflect.ValueOf(d.DashboardData)
m[datatype] = reflect.Indirect(reflect.ValueOf(d.DashboardData)).FieldByName(datatype).Interface()
for i := 0; i < r.NumField(); i++ {
//fmt.Println(r.Type().Field(i).Name)
if reflect.Indirect(r.Field(i)).IsValid() {
m[r.Type().Field(i).Name] = reflect.Indirect(r.Field(i))
//fmt.Println(reflect.Indirect(r.Field(i)))
}
} }
return int(d.DashboardData.LastMesure), m return int(*d.DashboardData.LastMesure), m
} }