Skip to content

Commit

Permalink
Merge branch 'dev'
Browse files Browse the repository at this point in the history
# Conflicts:
#	README.md
#	custom_components/local_luftdaten/sensor.py
  • Loading branch information
lichtteil committed Apr 26, 2020
2 parents 7a9ca09 + 15444cb commit bcc07b6
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 1 deletion.
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,10 @@ At the moment following sensor data can be read:
- BME280_temperature
- BME280_humidity
- BME280_pressure
- BMP_pressure
- BMP_temperature
- BMP280_pressure
- BMP280_temperature
- HTU21D_temperature
- HTU21D_humidity
Expand Down
10 changes: 9 additions & 1 deletion custom_components/local_luftdaten/sensor.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,10 @@
SENSOR_BME280_TEMPERATURE = 'BME280_temperature'
SENSOR_BME280_HUMIDITY = 'BME280_humidity'
SENSOR_BME280_PRESSURE = 'BME280_pressure'
SENSOR_BMP_TEMPERATURE = 'BMP_temperature'
SENSOR_BMP_PRESSURE = 'BMP_pressure'
SENSOR_BMP280_TEMPERATURE = 'BMP280_temperature'
SENSOR_BMP280_PRESSURE = 'BMP280_pressure'
SENSOR_PM1 = 'SDS_P1'
SENSOR_PM2 = 'SDS_P2'
SENSOR_WIFI_SIGNAL = 'signal'
Expand All @@ -46,10 +50,14 @@
SENSOR_BME280_TEMPERATURE: ['Temperature', TEMP_CELSIUS],
SENSOR_BME280_HUMIDITY: ['Humidity', '%'],
SENSOR_BME280_PRESSURE: ['Pressure', 'mb'],
SENSOR_BMP_TEMPERATURE: ['Temperature', TEMP_CELSIUS],
SENSOR_BMP_PRESSURE: ['Pressure', 'mb'],
SENSOR_BMP280_TEMPERATURE: ['Temperature', TEMP_CELSIUS],
SENSOR_BMP280_PRESSURE: ['Pressure', 'mb'],
SENSOR_PM1: ['PM10', VOLUME_MICROGRAMS_PER_CUBIC_METER],
SENSOR_PM2: ['PM2.5', VOLUME_MICROGRAMS_PER_CUBIC_METER],
SENSOR_WIFI_SIGNAL: ['Wifi signal', 'dBm'],
SENSOR_HTU21D_TEMPERATURE: ['Temperature', TEMP_CELSIUS],
SENSOR_HTU21D_TEMPERATURE: ['Temperature', TEMP_CELSIUS],
SENSOR_HTU21D_HUMIDITY: ['Humidity', '%']
}

Expand Down

0 comments on commit bcc07b6

Please sign in to comment.