FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-03-10 09:16:53 +00:00
Code Issues Releases Wiki Activity

All my device modules: implement direct support for 98_powerMap

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@13194 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2017-01-22 20:05:23 +00:00
parent 52edb81980
commit bc40337c95
6 changed files with 281 additions and 576 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
fhem/FHEM/50_HP1000.pm
View File

@ -167,7 +167,7 @@ sub HP1000_Initialize($) {
state => {
'*' => 5,
},
}
},
};
}

23
fhem/FHEM/70_ENIGMA2.pm
View File

@ -61,7 +61,7 @@ sub ENIGMA2_Initialize($) {
$hash->{UndefFn} = "ENIGMA2_Undefine";
$hash->{AttrList} =
"https:0,1 http-method:GET,POST http-noshutdown:1,0 disable:0,1 bouquet-tv bouquet-radio timeout remotecontrol:standard,advanced,keyboard lightMode:0,1 ignoreState:0,1 macaddr:textField wakeupCmd:textField WOL_useUdpBroadcast WOL_port WOL_mode:EW,UDP,BOTH "
"https:0,1 http-method:GET,POST http-noshutdown:1,0 disable:0,1 bouquet-tv bouquet-radio timeout remotecontrol:standard,advanced,keyboard lightMode:0,1 ignoreState:0,1 macaddr:textField model wakeupCmd:textField WOL_useUdpBroadcast WOL_port WOL_mode:EW,UDP,BOTH "
. $readingFnAttributes;
$data{RC_layout}{ENIGMA2_DreamMultimedia_DM500_DM800_SVG} =
@ -86,6 +86,24 @@ sub ENIGMA2_Initialize($) {
# $data{RC_layout}{ENIGMA2_VUplus_Ultimo} = "ENIGMA2_RClayout_VUplusUltimo";
$data{RC_makenotify}{ENIGMA2} = "ENIGMA2_RCmakenotify";
# 98_powerMap.pm support
$hash->{powerMap} = {
model => 'modelid', # fallback to attribute
modelid => {
'SOLO_SE' => {
rname_E => 'energy',
rname_P => 'consumption',
map => {
stateAV => {
absent => 0.5,
off => 12,
'*' => 13,
},
},
},
},
};
return;
}
@ -1433,7 +1451,8 @@ sub ENIGMA2_ReceiveCommand($$$) {
{
my $model = ReadingsVal( $name, "model", "" );
$model =~ s/\s/_/g;
$hash->{model} = $model;
$hash->{modelid} = uc($model);
$attr{$name}{model} = uc($model);
}
}

18
fhem/FHEM/70_ONKYO_AVR.pm
View File

@ -91,6 +91,24 @@ sub ONKYO_AVR_Initialize($) {
# $data{RC_layout}{ONKYO_AVR_SVG} = "ONKYO_AVR_RClayout_SVG";
# $data{RC_layout}{ONKYO_AVR} = "ONKYO_AVR_RClayout";
$data{RC_makenotify}{ONKYO_AVR} = "ONKYO_AVR_RCmakenotify";
# 98_powerMap.pm support
$hash->{powerMap} = {
model => {
'TX-NR626' => {
rname_E => 'energy',
rname_P => 'consumption',
map => {
stateAV => {
absent => 0,
off => 0,
muted => 85,
'*' => 140,
},
},
},
},
};
}
sub ONKYO_AVR_addExtension($$$) {

770
fhem/FHEM/70_PHTV.pm
View File

File diff suppressed because it is too large Load Diff

13
fhem/FHEM/71_ONKYO_AVR_ZONE.pm
View File

@ -74,6 +74,19 @@ sub ONKYO_AVR_ZONE_Initialize($) {
# $data{RC_layout}{ONKYO_AVR_ZONE} = "ONKYO_AVR_ZONE_RClayout";
$data{RC_makenotify}{ONKYO_AVR_ZONE} = "ONKYO_AVR_RCmakenotify";
# 98_powerMap.pm support
$hash->{powerMap} = {
rname_E => 'energy',
rname_P => 'consumption',
map => {
stateAV => {
off => 0,
muted => 10,
'*' => 20,
},
},
};
$hash->{parseParams} = 1;
}

31
fhem/FHEM/74_THINKINGCLEANER.pm
View File

@ -61,6 +61,35 @@ sub THINKINGCLEANER_Initialize($) {
"disable:0,1 timeout:1,2,3,4,5 pollInterval:30,45,60,75,90 pollMultiplierWebhook pollMultiplierCleaning model webhookHttpHostname webhookPort webhookFWinstance:$webhookFWinstance restart:noArg "
. $readingFnAttributes;
# 98_powerMap.pm support
$hash->{powerMap} = {
model => 'modelid', # fallback to attribute
modelid => {
'Roomba_700_Series' => {
rname_E => 'energy',
rname_P => 'consumption',
map => {
presence => {
absent => 0,
},
deviceStatus => {
base => 0.1,
plug => 0.1,
base_recon => 33,
plug_recon => 33,
base_full => 33,
plug_full => 33,
base_trickle => 5,
plug_trickle => 5,
base_wait => 0.1,
plug_wait => 0.1,
'*' => 0,
},
},
},
},
};
return;
}
@ -1265,7 +1294,7 @@ sub THINKINGCLEANER_ReceiveCommand($$$) {
next;
}
elsif ( $r2 eq "modelnr" ) {
$hash->{MODEL} =
$hash->{modelid} =
"Roomba_" . $return->{$r}{$r2} . "_Series";
$attr{$name}{model} =
"Roomba_" . $return->{$r}{$r2} . "_Series";