diff --git a/fhem/FHEM/10_ZWave.pm b/fhem/FHEM/10_ZWave.pm
index cce3b2d17..8b9348bec 100755
--- a/fhem/FHEM/10_ZWave.pm
+++ b/fhem/FHEM/10_ZWave.pm
@@ -80,12 +80,8 @@ my %zwave_class = (
SENSOR_BINARY => { id => '30',
get => { sbStatus => "02", },
parse => { "03300300" => "state:closed",
- "033003ff" => "state:open",
- "043003(..)0c" => '"motion:$1"', #Philio PHI_PSP01, PSM02-1
- "043003(..)08" => '"tamper:$1"', #Philio PHI_PSP01, PSM02-1
- "043003000a" => "state:closed", #Philio PSM02-1
- "043003ff0a" => "state:open", #Philio PSM02-1
- } },
+ "033003ff" => "state:open",
+ "043003(..)(..)"=> 'ZWave_sensorbinaryV2Parse($1,$2)' } },
SENSOR_MULTILEVEL => { id => '31',
get => { smStatus => "04" },
parse => { "..3105(..)(..)(.*)" => 'ZWave_multilevelParse($1,$2,$3)'} },
@@ -1247,6 +1243,32 @@ ZWave_plusInfoParse($$$$$)
" userIcon:". $userIconType;
}
+my %zwave_sensorBinaryTypeV2 = (
+ "00"=>"unknown",
+ "01"=>"generalPurpose",
+ "02"=>"smoke",
+ "03"=>"CO",
+ "04"=>"CO2",
+ "05"=>"heat",
+ "06"=>"water",
+ "07"=>"freeze",
+ "08"=>"tamper",
+ "09"=>"aux",
+ "0a"=>"doorWindow",
+ "0b"=>"tilt",
+ "0c"=>"motion",
+ "0d"=>"glassBreak"
+);
+
+sub
+ZWave_sensorbinaryV2Parse($$)
+{
+ my ($value, $sensorType) = @_;
+ return ($zwave_sensorBinaryTypeV2{"$sensorType"} ?
+ $zwave_sensorBinaryTypeV2{"$sensorType"} :"unknown") .
+ ":".$value;
+}
+
sub
ZWave_getHash($$$)
{
@@ -1908,7 +1930,7 @@ s2Hex($)
Class SENSOR_BINARY