mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-03-03 16:56:54 +00:00
MYSENSORS: remove V_LIGHT alias as it breaks autocreate
git-svn-id: https://svn.fhem.de/fhem/trunk@9385 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
ntruchsess
parent
6f8843da89
commit
5c97f98be8
@ -86,7 +86,6 @@ my %static_types = (
|
||||
S_DOOR => { receives => [], sends => [V_TRIPPED,V_ARMED] }, # Door and window sensors
|
||||
S_MOTION => { receives => [], sends => [V_TRIPPED,V_ARMED] }, # MotionSensor
|
||||
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_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
|
||||
@ -126,17 +125,15 @@ my %static_mappings = (
|
||||
V_TEMP => { type => "temperature" },
|
||||
V_HUM => { type => "humidity" },
|
||||
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_DIMMER => { type => "dimmer", range => { min => 0, step => 1, max => 100 }}, # Deprecated
|
||||
V_PRESSURE => { type => "pressure" },
|
||||
V_FORECAST => { type => "forecast", val => { # PressureSensor, DP/Dt explanation
|
||||
0 => 'stable', # 0 = "Stable Weather Pattern"
|
||||
1 => 'sunny', # 1 = "Slowly rising Good Weather", "Clear/Sunny "
|
||||
2 => 'cloudy', # 2 = "Slowly falling L-Pressure ", "Cloudy/Rain "
|
||||
3 => 'unstable', # 3 = "Quickly rising H-Press", "Not Stable"
|
||||
0 => 'stable', # 0 = "Stable Weather Pattern"
|
||||
1 => 'sunny', # 1 = "Slowly rising Good Weather", "Clear/Sunny"
|
||||
2 => 'cloudy', # 2 = "Slowly falling L-Pressure ", "Cloudy/Rain"
|
||||
3 => 'unstable', # 3 = "Quickly rising H-Press", "Not Stable"
|
||||
4 => 'thunderstorm',# 4 = "Quickly falling L-Press", "Thunderstorm"
|
||||
5 => 'unknown' }}, # 5 = "Unknown (More Time needed)
|
||||
5 => 'unknown' }}, # 5 = "Unknown (More Time needed)
|
||||
V_RAIN => { type => "rain" },
|
||||
V_RAINRATE => { type => "rainrate" },
|
||||
V_WIND => { type => "wind" },
|
||||
|
||||
@ -19,53 +19,53 @@ sub commandToStr($) {
|
||||
|
||||
#-- Variable types
|
||||
use constant {
|
||||
V_TEMP => 0,
|
||||
V_HUM => 1,
|
||||
V_STATUS => 2,
|
||||
V_PERCENTAGE => 3,
|
||||
V_PRESSURE => 4,
|
||||
V_FORECAST => 5,
|
||||
V_RAIN => 6,
|
||||
V_RAINRATE => 7,
|
||||
V_WIND => 8,
|
||||
V_GUST => 9,
|
||||
V_DIRECTION => 10,
|
||||
V_UV => 11,
|
||||
V_WEIGHT => 12,
|
||||
V_DISTANCE => 13,
|
||||
V_IMPEDANCE => 14,
|
||||
V_ARMED => 15,
|
||||
V_TRIPPED => 16,
|
||||
V_WATT => 17,
|
||||
V_KWH => 18,
|
||||
V_SCENE_ON => 19,
|
||||
V_SCENE_OFF => 20,
|
||||
V_HVAC_FLOW_STATE => 21,
|
||||
V_HVAC_SPEED => 22,
|
||||
V_LIGHT_LEVEL => 23,
|
||||
V_VAR1 => 24,
|
||||
V_VAR2 => 25,
|
||||
V_VAR3 => 26,
|
||||
V_VAR4 => 27,
|
||||
V_VAR5 => 28,
|
||||
V_UP => 29,
|
||||
V_DOWN => 30,
|
||||
V_STOP => 31,
|
||||
V_IR_SEND => 32,
|
||||
V_IR_RECEIVE => 33,
|
||||
V_FLOW => 34,
|
||||
V_VOLUME => 35,
|
||||
V_LOCK_STATUS => 36,
|
||||
V_LEVEL => 37,
|
||||
V_VOLTAGE => 38,
|
||||
V_CURRENT => 39,
|
||||
V_RGB => 40,
|
||||
V_RGBW => 41,
|
||||
V_ID => 42,
|
||||
V_UNIT_PREFIX => 43,
|
||||
V_TEMP => 0,
|
||||
V_HUM => 1,
|
||||
V_STATUS => 2,
|
||||
V_PERCENTAGE => 3,
|
||||
V_PRESSURE => 4,
|
||||
V_FORECAST => 5,
|
||||
V_RAIN => 6,
|
||||
V_RAINRATE => 7,
|
||||
V_WIND => 8,
|
||||
V_GUST => 9,
|
||||
V_DIRECTION => 10,
|
||||
V_UV => 11,
|
||||
V_WEIGHT => 12,
|
||||
V_DISTANCE => 13,
|
||||
V_IMPEDANCE => 14,
|
||||
V_ARMED => 15,
|
||||
V_TRIPPED => 16,
|
||||
V_WATT => 17,
|
||||
V_KWH => 18,
|
||||
V_SCENE_ON => 19,
|
||||
V_SCENE_OFF => 20,
|
||||
V_HVAC_FLOW_STATE => 21,
|
||||
V_HVAC_SPEED => 22,
|
||||
V_LIGHT_LEVEL => 23,
|
||||
V_VAR1 => 24,
|
||||
V_VAR2 => 25,
|
||||
V_VAR3 => 26,
|
||||
V_VAR4 => 27,
|
||||
V_VAR5 => 28,
|
||||
V_UP => 29,
|
||||
V_DOWN => 30,
|
||||
V_STOP => 31,
|
||||
V_IR_SEND => 32,
|
||||
V_IR_RECEIVE => 33,
|
||||
V_FLOW => 34,
|
||||
V_VOLUME => 35,
|
||||
V_LOCK_STATUS => 36,
|
||||
V_LEVEL => 37,
|
||||
V_VOLTAGE => 38,
|
||||
V_CURRENT => 39,
|
||||
V_RGB => 40,
|
||||
V_RGBW => 41,
|
||||
V_ID => 42,
|
||||
V_UNIT_PREFIX => 43,
|
||||
V_HVAC_SETPOINT_COOL => 44,
|
||||
V_HVAC_SETPOINT_HEAT => 45,
|
||||
V_HVAC_FLOW_MODE => 46,
|
||||
V_HVAC_FLOW_MODE => 46,
|
||||
};
|
||||
|
||||
use constant variableTypes => qw{ V_TEMP V_HUM V_STATUS V_PERCENTAGE V_PRESSURE V_FORECAST V_RAIN
|
||||
@ -86,24 +86,24 @@ sub variableTypeToIdx($) {
|
||||
|
||||
#-- Internal messages
|
||||
use constant {
|
||||
I_BATTERY_LEVEL => 0,
|
||||
I_TIME => 1,
|
||||
I_VERSION => 2,
|
||||
I_ID_REQUEST => 3,
|
||||
I_ID_RESPONSE => 4,
|
||||
I_INCLUSION_MODE => 5,
|
||||
I_CONFIG => 6,
|
||||
I_FIND_PARENT => 7,
|
||||
I_BATTERY_LEVEL => 0,
|
||||
I_TIME => 1,
|
||||
I_VERSION => 2,
|
||||
I_ID_REQUEST => 3,
|
||||
I_ID_RESPONSE => 4,
|
||||
I_INCLUSION_MODE => 5,
|
||||
I_CONFIG => 6,
|
||||
I_FIND_PARENT => 7,
|
||||
I_FIND_PARENT_RESPONSE => 8,
|
||||
I_LOG_MESSAGE => 9,
|
||||
I_CHILDREN => 10,
|
||||
I_SKETCH_NAME => 11,
|
||||
I_SKETCH_VERSION => 12,
|
||||
I_REBOOT => 13,
|
||||
I_GATEWAY_READY => 14,
|
||||
I_REQUEST_SIGNING => 15,
|
||||
I_GET_NONCE => 16,
|
||||
I_GET_NONCE_RESPONSE => 17.
|
||||
I_LOG_MESSAGE => 9,
|
||||
I_CHILDREN => 10,
|
||||
I_SKETCH_NAME => 11,
|
||||
I_SKETCH_VERSION => 12,
|
||||
I_REBOOT => 13,
|
||||
I_GATEWAY_READY => 14,
|
||||
I_REQUEST_SIGNING => 15,
|
||||
I_GET_NONCE => 16,
|
||||
I_GET_NONCE_RESPONSE => 17,
|
||||
};
|
||||
|
||||
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_MOTION => 1,
|
||||
S_SMOKE => 2,
|
||||
S_LIGHT => 3,
|
||||
S_BINARY => 3,
|
||||
S_DIMMER => 4,
|
||||
S_COVER => 5,
|
||||
@ -156,7 +155,7 @@ use constant {
|
||||
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_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
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user