FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-01-31 12:49:34 +00:00
Code Issues Releases Wiki Activity

37_SHCdev.pm: Added support for new proxy device. Set icons for devices automatically.

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@28969 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
breaker27 2024-06-14 17:34:38 +00:00
parent 133f9c185b
commit 84ea8500e1
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
fhem/FHEM/37_SHCdev.pm
View File

@ -2,7 +2,7 @@
# This file is part of the smarthomatic module for FHEM. # This file is part of the smarthomatic module for FHEM.
# #
# Copyright (c) 2014 Stefan Baumann # Copyright (c) 2014 Stefan Baumann
# 2014, 2015, 2019, 2022, 2023 Uwe Freese # 2014, 2015, 2019, 2022, 2023, 2024 Uwe Freese
# #
# You can find smarthomatic at www.smarthomatic.org. # You can find smarthomatic at www.smarthomatic.org.
# You can find FHEM at www.fhem.de. # You can find FHEM at www.fhem.de.
@ -34,11 +34,22 @@ use SHC_parser;
my $parser = new SHC_parser(); my $parser = new SHC_parser();
my %icons = (
"PowerSwitch" => "message_socket",
"Dimmer" => "light_ceiling",
"EnvSensor" => "temperature_humidity",
"Controller" => "display_dot",
"Proxy" => "it_router",
"RGBDimmer" => "control_arrow_turn_right",
"SoilMoistureMeter" => "sani_irrigation"
);
my %dev_state_icons = ( my %dev_state_icons = (
"PowerSwitch" => ".*1\\d{7}:on:off .*0\\d{7}:off:on set.*:light_question:off", "PowerSwitch" => ".*1\\d{7}:on:off .*0\\d{7}:off:on set.*:light_question:off",
"Dimmer" => "on:on off:off set.*:light_question:off", "Dimmer" => "on:on off:off set.*:light_question:off",
"EnvSensor" => undef, "EnvSensor" => undef,
"Controller" => undef, "Controller" => undef,
"Proxy" => undef,
"RGBDimmer" => undef, "RGBDimmer" => undef,
"SoilMoistureMeter" => ".*H:\\s\\d\\..*:ampel_rot" "SoilMoistureMeter" => ".*H:\\s\\d\\..*:ampel_rot"
); );
@ -48,6 +59,7 @@ my %web_cmds = (
"Dimmer" => "on:off:statusRequest", "Dimmer" => "on:off:statusRequest",
"EnvSensor" => undef, "EnvSensor" => undef,
"Controller" => undef, "Controller" => undef,
"Proxy" => undef,
"RGBDimmer" => undef, "RGBDimmer" => undef,
"SoilMoistureMeter" => undef "SoilMoistureMeter" => undef
); );
@ -140,7 +152,7 @@ sub SHCdev_Initialize($)
." readonly:1" ." readonly:1"
." forceOn:1" ." forceOn:1"
." $readingFnAttributes" ." $readingFnAttributes"
." devtype:EnvSensor,Dimmer,PowerSwitch,Controller,RGBDimmer,SoilMoistureMeter"; ." devtype:EnvSensor,Dimmer,PowerSwitch,Controller,Proxy,RGBDimmer,SoilMoistureMeter";
} }
##################################### #####################################
@ -437,6 +449,9 @@ sub SHCdev_Parse($$)
# If the devtype is defined add, if not already done, the according webCmds and devStateIcons # If the devtype is defined add, if not already done, the according webCmds and devStateIcons
my $devtype2 = AttrVal( $rname, "devtype", undef ); my $devtype2 = AttrVal( $rname, "devtype", undef );
if (defined($devtype2)) { if (defined($devtype2)) {
if (!defined($attr{$rname}{icon}) && defined($icons{$devtype2})) {
$attr{$rname}{icon} = $icons{$devtype2};
}
if (!defined($attr{$rname}{devStateIcon}) && defined($dev_state_icons{$devtype2})) { if (!defined($attr{$rname}{devStateIcon}) && defined($dev_state_icons{$devtype2})) {
$attr{$rname}{devStateIcon} = $dev_state_icons{$devtype2}; $attr{$rname}{devStateIcon} = $dev_state_icons{$devtype2};
} }

4
fhem/FHEM/lib/SHC_packet_layout.xml
View File

@ -204,6 +204,10 @@
<Value>0</Value> <Value>0</Value>
<Name>BaseStation</Name> <Name>BaseStation</Name>
</Element> </Element>
<Element>
<Value>10</Value>
<Name>Proxy</Name>
</Element>
<Element> <Element>
<Value>20</Value> <Value>20</Value>
<Name>EnvSensor</Name> <Name>EnvSensor</Name>