Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

MYSENSORS: remove V_LIGHT alias as it breaks autocreate

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@9385 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
ntruchsess 2015-10-05 21:21:57 +00:00
parent 6f8843da89
commit 5c97f98be8
2 changed files with 68 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
fhem/FHEM/10_MYSENSORS_DEVICE.pm
View File

@ -86,7 +86,6 @@ my %static_types = (
S_DOOR => { receives => [], sends => [V_TRIPPED,V_ARMED] }, # Door and window sensors S_DOOR => { receives => [], sends => [V_TRIPPED,V_ARMED] }, # Door and window sensors
S_MOTION => { receives => [], sends => [V_TRIPPED,V_ARMED] }, # MotionSensor S_MOTION => { receives => [], sends => [V_TRIPPED,V_ARMED] }, # MotionSensor
S_SMOKE => { receives => [], sends => [V_TRIPPED,V_ARMED] }, # Smoke sensor S_SMOKE => { receives => [], sends => [V_TRIPPED,V_ARMED] }, # Smoke sensor
S_LIGHT => { receives => [V_STATUS,V_WATT], sends => [V_STATUS,V_WATT] }, # Light Actuator (on/off)
S_BINARY => { receives => [V_STATUS,V_WATT], sends => [V_STATUS,V_WATT] }, # Binary device (on/off), Alias for S_LIGHT S_BINARY => { receives => [V_STATUS,V_WATT], sends => [V_STATUS,V_WATT] }, # Binary device (on/off), Alias for S_LIGHT
S_DIMMER => { receives => [V_STATUS,V_PERCENTAGE,V_WATT], sends => [V_STATUS,V_PERCENTAGE,V_WATT] }, # Dimmable device of some kind S_DIMMER => { receives => [V_STATUS,V_PERCENTAGE,V_WATT], sends => [V_STATUS,V_PERCENTAGE,V_WATT] }, # Dimmable device of some kind
S_COVER => { receives => [V_UP,V_DOWN,V_STOP,V_PERCENTAGE], sends => [V_PERCENTAGE] }, # Window covers or shades S_COVER => { receives => [V_UP,V_DOWN,V_STOP,V_PERCENTAGE], sends => [V_PERCENTAGE] }, # Window covers or shades
@ -126,14 +125,12 @@ my %static_mappings = (
V_TEMP => { type => "temperature" }, V_TEMP => { type => "temperature" },
V_HUM => { type => "humidity" }, V_HUM => { type => "humidity" },
V_STATUS => { type => "status", val => { 0 => 'off', 1 => 'on' }}, V_STATUS => { type => "status", val => { 0 => 'off', 1 => 'on' }},
#V_LIGHT => { type => "switch", val => { 0 => 'off', 1 => 'on' }}, # Deprecated
V_PERCENTAGE => { type => "percentage", range => { min => 0, step => 1, max => 100 }}, V_PERCENTAGE => { type => "percentage", range => { min => 0, step => 1, max => 100 }},
#V_DIMMER => { type => "dimmer", range => { min => 0, step => 1, max => 100 }}, # Deprecated
V_PRESSURE => { type => "pressure" }, V_PRESSURE => { type => "pressure" },
V_FORECAST => { type => "forecast", val => { # PressureSensor, DP/Dt explanation V_FORECAST => { type => "forecast", val => { # PressureSensor, DP/Dt explanation
0 => 'stable', # 0 = "Stable Weather Pattern" 0 => 'stable', # 0 = "Stable Weather Pattern"
1 => 'sunny', # 1 = "Slowly rising Good Weather", "Clear/Sunny " 1 => 'sunny', # 1 = "Slowly rising Good Weather", "Clear/Sunny"
2 => 'cloudy', # 2 = "Slowly falling L-Pressure ", "Cloudy/Rain " 2 => 'cloudy', # 2 = "Slowly falling L-Pressure ", "Cloudy/Rain"
3 => 'unstable', # 3 = "Quickly rising H-Press", "Not Stable" 3 => 'unstable', # 3 = "Quickly rising H-Press", "Not Stable"
4 => 'thunderstorm',# 4 = "Quickly falling L-Press", "Thunderstorm" 4 => 'thunderstorm',# 4 = "Quickly falling L-Press", "Thunderstorm"
5 => 'unknown' }}, # 5 = "Unknown (More Time needed) 5 => 'unknown' }}, # 5 = "Unknown (More Time needed)

5
fhem/FHEM/lib/Device/MySensors/Constants.pm
View File

@ -103,7 +103,7 @@ use constant {
I_GATEWAY_READY => 14, I_GATEWAY_READY => 14,
I_REQUEST_SIGNING => 15, I_REQUEST_SIGNING => 15,
I_GET_NONCE => 16, I_GET_NONCE => 16,
I_GET_NONCE_RESPONSE => 17. I_GET_NONCE_RESPONSE => 17,
}; };
use constant internalMessageTypes => qw{ I_BATTERY_LEVEL I_TIME I_VERSION I_ID_REQUEST I_ID_RESPONSE use constant internalMessageTypes => qw{ I_BATTERY_LEVEL I_TIME I_VERSION I_ID_REQUEST I_ID_RESPONSE
@ -120,7 +120,6 @@ use constant {
S_DOOR => 0, S_DOOR => 0,
S_MOTION => 1, S_MOTION => 1,
S_SMOKE => 2, S_SMOKE => 2,
S_LIGHT => 3,
S_BINARY => 3, S_BINARY => 3,
S_DIMMER => 4, S_DIMMER => 4,
S_COVER => 5, S_COVER => 5,
@ -156,7 +155,7 @@ use constant {
S_MOISTURE => 35, S_MOISTURE => 35,
}; };
use constant sensorTypes => qw{ S_DOOR S_MOTION S_SMOKE S_LIGHT S_BINARY S_DIMMER S_COVER S_TEMP S_HUM S_BARO S_WIND use constant sensorTypes => qw{ S_DOOR S_MOTION S_SMOKE S_BINARY S_DIMMER S_COVER S_TEMP S_HUM S_BARO S_WIND
S_RAIN S_UV S_WEIGHT S_POWER S_HEATER S_DISTANCE S_LIGHT_LEVEL S_ARDUINO_NODE S_RAIN S_UV S_WEIGHT S_POWER S_HEATER S_DISTANCE S_LIGHT_LEVEL S_ARDUINO_NODE
S_ARDUINO_REPEATER_NODE S_LOCK S_IR S_WATER S_AIR_QUALITY S_CUSTOM S_DUST S_SCENE_CONTROLLER S_ARDUINO_REPEATER_NODE S_LOCK S_IR S_WATER S_AIR_QUALITY S_CUSTOM S_DUST S_SCENE_CONTROLLER
S_RGB_LIGHT S_RGBW_LIGHT S_COLOR_SENSOR S_HVAC S_MULTIMETER S_SPRINKLER S_WATER_LEAK S_SOUND S_VIBRATION S_RGB_LIGHT S_RGBW_LIGHT S_COLOR_SENSOR S_HVAC S_MULTIMETER S_SPRINKLER S_WATER_LEAK S_SOUND S_VIBRATION