Add support for temp+humidity sensors
	
		
			
	
		
	
	
		
	
		
			All checks were successful
		
		
	
	
		
			
				
	
				Build and Publish / release (push) Successful in 6m32s
				
			
		
		
	
	
				
					
				
			
		
			All checks were successful
		
		
	
	Build and Publish / release (push) Successful in 6m32s
				
			This commit is contained in:
		| @@ -24,6 +24,7 @@ const ( | ||||
| 	BattIndoorSensor  = "IndoorSensor" | ||||
| 	BattRainSensor    = "RainSensor" | ||||
| 	BattCO2Sensor     = "CO2Sensor" | ||||
| 	THSensor          = "TempHumiditySensor" | ||||
| ) | ||||
|  | ||||
| func (awn *AWNProvider) Name() string { | ||||
| @@ -89,11 +90,55 @@ func MapAwnUpdate(awnUpdate *AmbientWeatherUpdate) *weather.WeatherUpdate { | ||||
| 				Component: BattCO2Sensor, | ||||
| 				Status:    awnUpdate.BattCO2, | ||||
| 			}, | ||||
| 			// Temp and Humidity Sensors | ||||
| 			{ | ||||
| 				Component: THSensor + "1", | ||||
| 				Status:    awnUpdate.Batt1, | ||||
| 			}, | ||||
| 			{ | ||||
| 				Component: THSensor + "2", | ||||
| 				Status:    awnUpdate.Batt2, | ||||
| 			}, | ||||
| 			{ | ||||
| 				Component: THSensor + "3", | ||||
| 				Status:    awnUpdate.Batt3, | ||||
| 			}, | ||||
| 			{ | ||||
| 				Component: THSensor + "4", | ||||
| 				Status:    awnUpdate.Batt4, | ||||
| 			}, | ||||
| 			{ | ||||
| 				Component: THSensor + "5", | ||||
| 				Status:    awnUpdate.Batt5, | ||||
| 			}, | ||||
| 			{ | ||||
| 				Component: THSensor + "6", | ||||
| 				Status:    awnUpdate.Batt6, | ||||
| 			}, | ||||
| 			{ | ||||
| 				Component: THSensor + "7", | ||||
| 				Status:    awnUpdate.Batt7, | ||||
| 			}, | ||||
| 			{ | ||||
| 				Component: THSensor + "8", | ||||
| 				Status:    awnUpdate.Batt8, | ||||
| 			}, | ||||
| 		}, | ||||
| 		TempIndoorF:     awnUpdate.TempInF, | ||||
| 		HumidityIndoor:  awnUpdate.HumidityIn, | ||||
| 		BaromRelativeIn: awnUpdate.BaromRelIn, | ||||
| 		BaromAbsoluteIn: awnUpdate.BaromAbsIn, | ||||
| 		// TODO: Permit mapping to config name | ||||
| 		TempHumiditySensors: []*weather.TempHumiditySensor{ | ||||
| 			{Name: "Sensor1", TempF: awnUpdate.Temp1F, Humidity: awnUpdate.Humidity1}, | ||||
| 			{Name: "Sensor2", TempF: awnUpdate.Temp2F, Humidity: awnUpdate.Humidity2}, | ||||
| 			{Name: "Sensor3", TempF: awnUpdate.Temp3F, Humidity: awnUpdate.Humidity3}, | ||||
| 			{Name: "Sensor4", TempF: awnUpdate.Temp4F, Humidity: awnUpdate.Humidity4}, | ||||
| 			{Name: "Sensor5", TempF: awnUpdate.Temp5F, Humidity: awnUpdate.Humidity5}, | ||||
| 			{Name: "Sensor6", TempF: awnUpdate.Temp6F, Humidity: awnUpdate.Humidity6}, | ||||
| 			{Name: "Sensor7", TempF: awnUpdate.Temp7F, Humidity: awnUpdate.Humidity7}, | ||||
| 			{Name: "Sensor8", TempF: awnUpdate.Temp8F, Humidity: awnUpdate.Humidity8}, | ||||
| 		}, | ||||
| 	} | ||||
| } | ||||
|  | ||||
|   | ||||
| @@ -28,4 +28,32 @@ type AmbientWeatherUpdate struct { | ||||
| 	BaromAbsIn     *float64 `json:"baromabsin,omitempty" schema:"baromabsin"` | ||||
| 	BattIn         *int     `json:"battin,omitempty" schema:"battin"` | ||||
| 	BattCO2        *int     `json:"batt_co2,omitempty" schema:"batt_co2"` | ||||
| 	*AmbientTempHumiditySensors | ||||
| } | ||||
|  | ||||
| type AmbientTempHumiditySensors struct { | ||||
| 	Temp1F    *float64 `json:"temp1f,omitempty" schema:"temp1f"` | ||||
| 	Temp2F    *float64 `json:"temp2f,omitempty" schema:"temp2f"` | ||||
| 	Temp3F    *float64 `json:"temp3f,omitempty" schema:"temp3f"` | ||||
| 	Temp4F    *float64 `json:"temp4f,omitempty" schema:"temp4f"` | ||||
| 	Temp5F    *float64 `json:"temp5f,omitempty" schema:"temp5f"` | ||||
| 	Temp6F    *float64 `json:"temp6f,omitempty" schema:"temp6f"` | ||||
| 	Temp7F    *float64 `json:"temp7f,omitempty" schema:"temp7f"` | ||||
| 	Temp8F    *float64 `json:"temp8f,omitempty" schema:"temp8f"` | ||||
| 	Humidity1 *int     `json:"humidity1,omitempty" schema:"humidity1"` | ||||
| 	Humidity2 *int     `json:"humidity2,omitempty" schema:"humidity2"` | ||||
| 	Humidity3 *int     `json:"humidity3,omitempty" schema:"humidity3"` | ||||
| 	Humidity4 *int     `json:"humidity4,omitempty" schema:"humidity4"` | ||||
| 	Humidity5 *int     `json:"humidity5,omitempty" schema:"humidity5"` | ||||
| 	Humidity6 *int     `json:"humidity6,omitempty" schema:"humidity6"` | ||||
| 	Humidity7 *int     `json:"humidity7,omitempty" schema:"humidity7"` | ||||
| 	Humidity8 *int     `json:"humidity8,omitempty" schema:"humidity8"` | ||||
| 	Batt1     *int     `json:"batt1,omitempty" schema:"batt1"` | ||||
| 	Batt2     *int     `json:"batt2,omitempty" schema:"batt2"` | ||||
| 	Batt3     *int     `json:"batt3,omitempty" schema:"batt3"` | ||||
| 	Batt4     *int     `json:"batt4,omitempty" schema:"batt4"` | ||||
| 	Batt5     *int     `json:"batt5,omitempty" schema:"batt5"` | ||||
| 	Batt6     *int     `json:"batt6,omitempty" schema:"batt6"` | ||||
| 	Batt7     *int     `json:"batt7,omitempty" schema:"batt7"` | ||||
| 	Batt8     *int     `json:"batt8,omitempty" schema:"batt8"` | ||||
| } | ||||
|   | ||||
		Reference in New Issue
	
	Block a user