mirror of
https://github.com/fhem/fhem-mirror.git
synced 2025-01-31 12:49:34 +00:00
WMBus.pm: support for smoke detector IE6500-OMS
git-svn-id: https://svn.fhem.de/fhem/trunk@29463 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
parent
6b5f18c720
commit
9d4dc0c0c5
@ -1,5 +1,6 @@
|
|||||||
# Add changes at the top of the list. Keep it in ASCII, and 80-char wide.
|
# 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
|
# Do not insert empty lines here, update check depends on it
|
||||||
|
- feature: WMBus.pm: support for smoke detector IE6500-OMS: #1326558
|
||||||
- change: 76_SolarForecast: more preparation for multi batteries
|
- change: 76_SolarForecast: more preparation for multi batteries
|
||||||
- change: 70_PylonLowVoltage: internal code change (use random time delay)
|
- change: 70_PylonLowVoltage: internal code change (use random time delay)
|
||||||
- feature: 76_SolarForecast: change Attr setupBatteryDev to setupBatteryDev01,
|
- feature: 76_SolarForecast: change Attr setupBatteryDev to setupBatteryDev01,
|
||||||
|
@ -724,6 +724,22 @@ my %VIFInfo_FD = (
|
|||||||
unit => '',
|
unit => '',
|
||||||
calcFunc => \&valueCalcNumeric,
|
calcFunc => \&valueCalcNumeric,
|
||||||
},
|
},
|
||||||
|
VIF_DURATION_IN_MINUTES => { # DURATION_IN_MINUTES information
|
||||||
|
typeMask => 0b01111111,
|
||||||
|
expMask => 0b00000000,
|
||||||
|
type => 0b00110001,
|
||||||
|
bias => 0,
|
||||||
|
unit => 'minutes',
|
||||||
|
calcFunc => \&valueCalcNumeric,
|
||||||
|
},
|
||||||
|
VIF_CUMULATION_COUNTER => { # Cumulated Value
|
||||||
|
typeMask => 0b01111111,
|
||||||
|
expMask => 0b00000000,
|
||||||
|
type => 0b01100001,
|
||||||
|
bias => 0,
|
||||||
|
unit => '',
|
||||||
|
calcFunc => \&valueCalcNumeric,
|
||||||
|
},
|
||||||
VIF_SPECIAL_SUPPLIER_INFORMATION => { # Special supplier information
|
VIF_SPECIAL_SUPPLIER_INFORMATION => { # Special supplier information
|
||||||
typeMask => 0b01111111,
|
typeMask => 0b01111111,
|
||||||
expMask => 0b00000000,
|
expMask => 0b00000000,
|
||||||
@ -1451,6 +1467,12 @@ sub decodeValueInformationBlock($$$) {
|
|||||||
# Kamstrup
|
# Kamstrup
|
||||||
$vif = unpack('C', substr($vib,$offset++,1));
|
$vif = unpack('C', substr($vib,$offset++,1));
|
||||||
$vifInfoRef = \%VIFInfo_KAM;
|
$vifInfoRef = \%VIFInfo_KAM;
|
||||||
|
} elsif ($self->{manufacturer} eq 'EIE') {
|
||||||
|
# EIE
|
||||||
|
$offset++; # Ignore next byte
|
||||||
|
$dataBlockRef->{type} = VIF_TYPE_MANUFACTURER_SPECIFIC;
|
||||||
|
$dataBlockRef->{unit} = "";
|
||||||
|
$analyzeVIF = 0;
|
||||||
} else {
|
} else {
|
||||||
# manufacturer specific data, can't be interpreted
|
# manufacturer specific data, can't be interpreted
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user