From c4529d901aa60cf4811c729a08cfeb8807a0ea99 Mon Sep 17 00:00:00 2001 From: rudolfkoenig <> Date: Mon, 22 Aug 2016 12:23:22 +0000 Subject: [PATCH] 10_ZWave.pm: dehex SENSOR_ALARM, SENSOR_BINARY (Forum #56682) git-svn-id: https://svn.fhem.de/fhem/trunk@12050 2b470e98-0d58-463d-a4d8-8e2adae1ed80 --- fhem/CHANGED | 1 + fhem/FHEM/10_ZWave.pm | 6 ++++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/fhem/CHANGED b/fhem/CHANGED index 1542613fd..92904c8f2 100644 --- a/fhem/CHANGED +++ b/fhem/CHANGED @@ -1,5 +1,6 @@ # Add changes at the top of the list. Keep it in ASCII, and 80-char wide. # Do not insert empty lines here, update check depends on it. + - change: 10_ZWave.pm: change numbers in events (hex -> dec, Forum #56682) - added: 98_exportdevice: new command to export device definitions - feature: 90_at: computeAfterInit attribute (Forum #56706) - change: 93_DbRep: fit to new commandref style diff --git a/fhem/FHEM/10_ZWave.pm b/fhem/FHEM/10_ZWave.pm index c571132fc..ca6c92a32 100755 --- a/fhem/FHEM/10_ZWave.pm +++ b/fhem/FHEM/10_ZWave.pm @@ -493,7 +493,7 @@ my %zwave_class = ( SENSOR_ALARM => { id => '9c', get => { alarm => "01%02x" }, parse => { "..9c02(..)(..)(..)(....)" => - '"alarm_type_$2:level $3 node ".hex($1)." seconds ".hex($4)'} }, + '"alarm_type_$2:level ".hex($3)." node ".hex($1)." seconds ".hex($4)'} }, SILENCE_ALARM => { id => '9d' }, SENSOR_CONFIGURATION => { id => '9e' }, MARK => { id => 'ef' }, @@ -2931,6 +2931,7 @@ ZWave_plusInfoParse($$$$$) } my %zwave_sensorBinaryTypeV2 = ( + "00"=>"off", "01"=>"generalPurpose", "02"=>"smoke", "03"=>"CO", @@ -2943,7 +2944,8 @@ my %zwave_sensorBinaryTypeV2 = ( "0a"=>"doorWindow", "0b"=>"tilt", "0c"=>"motion", - "0d"=>"glassBreak" + "0d"=>"glassBreak", + "ff"=>"on" ); sub