Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
node_modules
doc/*
.js
.idea/
10 changes: 10 additions & 0 deletions device-config-schema.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,11 @@ module.exports = {
value itself."
type: "string"
default: "$value"
removeOutliers:
description: "
removes outliers of temperature and humidity values"
type: "boolean"
default: false
required: ["pin"]
},
HomeduinoDSTSensor: {
Expand Down Expand Up @@ -265,6 +270,11 @@ module.exports = {
Fahrenheit"
type: "boolean"
default: false
removeOutliers:
description: "
removes outliers of temperature and humidity values"
type: "boolean"
default: false
required: ["protocols"]
}
HomeduinoRFWeatherStation: {
Expand Down
65 changes: 65 additions & 0 deletions homeduino.coffee
Original file line number Diff line number Diff line change
Expand Up @@ -236,9 +236,14 @@ module.exports = (env) ->
unit: '%'
acronym: 'RH'

#sortfunction, because JavaScript does lexicographical sort
sortfunction = (a,b) -> a - b

constructor: (@config, lastState, @board) ->
@id = config.id
@name = config.name
@_temperatures = []
@_humidities = []
super()

lastError = null
Expand All @@ -251,6 +256,20 @@ module.exports = (env) ->
processing.replace(/\$value\b/g, result.temperature)
)
variableManager.evaluateNumericExpression(info.tokens).then( (value) =>
if @config.removeOutliers is true
@_temperatures.push value
# if array size > 7, shift array
if @_temperatures.length > 7
@_temperatures.shift()
#check for outlier if array contains 7 entries
if @_temperatures.length == 7
processedValues = _.clone(@_temperatures)
processedValues.sort(sortfunction)
middle = processedValues[3]
diff = 0.5 + 3.0 * (processedValues[5] - processedValues[1])
if value > middle + diff or value < middle - diff
env.logger.info @name, ' temperature value dismissed: ', value, ' ' , @_temperatures
return
@emit 'temperature', value
)
#@emit 'temperature', result.temperature
Expand All @@ -259,6 +278,20 @@ module.exports = (env) ->
processing.replace(/\$value\b/g, result.humidity)
)
variableManager.evaluateNumericExpression(info.tokens).then( (value) =>
if @config.removeOutliers is true
@_humidities.push value
# if array size > 7, shift array
if @_humidities.length > 7
@_humidities.shift()
#check for outlier if array contains 7 entries
if @_humidities.length == 7
processedValues = _.clone(@_humidities)
processedValues.sort(sortfunction)
middle = processedValues[3]
diff = 1.0 + 3.0 * (processedValues[5] - processedValues[1])
if value > middle + diff or value < middle - diff
env.logger.info @name, ' humidity value dismissed: ', value, ' ' , @_humidities
return
@emit 'humidity', value
)
#@emit 'humidity', result.humidity
Expand Down Expand Up @@ -649,13 +682,18 @@ module.exports = (env) ->

class HomeduinoRFTemperature extends env.devices.TemperatureSensor

#sortfunction, because JavaScript does lexicographical sort
sortfunction = (a,b) -> a - b

constructor: (@config, lastState, @board) ->
@id = config.id
@name = config.name
@_temperatue = lastState?.temperature?.value
@_humidity = lastState?.humidity?.value
@_lowBattery = lastState?.lowBattery?.value
@_battery = lastState?.battery?.value
@_temperatures = []
@_humidities = []

hasTemperature = false
hasHumidity = false
Expand Down Expand Up @@ -740,6 +778,19 @@ module.exports = (env) ->
processing.replace(/\$value\b/g, event.values.temperature)
)
variableManager.evaluateNumericExpression(info.tokens).then( (value) =>
if @config.removeOutliers is true
@_temperatures.push value
if @_temperatures.length > 7
@_temperatures.shift()
#check for outlier if array contains 7 entries
if @_temperatures.length == 7
processedValues = _.clone(@_temperatures)
processedValues.sort(sortfunction)
middle = processedValues[3]
diff = 0.5 + 3.0 * (processedValues[5] - processedValues[1])
if value > middle + diff or value < middle - diff
env.logger.info @name, ' temperature value dismissed: ', value, ' ' , @_temperatures
return
@_temperatue = value
@emit "temperature", @_temperatue
)
Expand All @@ -750,6 +801,20 @@ module.exports = (env) ->
processing.replace(/\$value\b/g, event.values.humidity)
)
variableManager.evaluateNumericExpression(info.tokens).then( (value) =>
if @config.removeOutliers is true
@_humidities.push value
# if array size > 7, shift array
if @_humidities.length > 7
@_humidities.shift()
#check for outlier if array contains 7 entries
if @_humidities.length == 7
processedValues = _.clone(@_humidities)
processedValues.sort(sortfunction)
middle = processedValues[3]
diff = 1.0 + 3.0 * (processedValues[5] - processedValues[1])
if value > middle + diff or value < middle - diff
env.logger.info @name, ' humidity value dismissed: ', value, ' ' , @_humidities
return
@_humidity = value
@emit "humidity", @_humidity
)
Expand Down