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

MaxCommon : Fix on,off value for weekprofile

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@21049 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
Wzut 2020-01-25 18:35:29 +00:00
parent 76053fa64f
commit 82c7d9e617
1 changed files with 34 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
fhem/FHEM/MaxCommon.pm
View File

@ -1,5 +1,28 @@
package MaxCommon; ##############################################
# $Id$
#
# (c) 2012 Copyright: Matthias Gehre, M.Gehre@gmx.de
# (c) 2019 Copyright: Wzut
#
# All rights reserved
#
# FHEM Forum : http://forum.fhem.de/
#
# This code is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
# the Free Software Foundation; either version 2 of the License, or
# (at your option) any later version.
# The GNU General Public License can be found at
# http://www.gnu.org/copyleft/gpl.html.
# A copy is found in the textfile GPL.txt and important notices to the license
# from the author is found in LICENSE.txt distributed with these scripts.
# This script is distributed in the hope that it will be useful,
# but WITHOUT ANY WARRANTY; without even the implied warranty of
# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
# GNU General Public License for more details.
################################################################
package MaxCommon;
require Exporter; require Exporter;
@ISA = qw(Exporter); @ISA = qw(Exporter);
@EXPORT = qw(%device_types %msgId2Cmd %msgCmd2Id $defaultWeekProfile MAX_ParseTemperature validTemperature); @EXPORT = qw(%device_types %msgId2Cmd %msgCmd2Id $defaultWeekProfile MAX_ParseTemperature validTemperature);
@ -30,16 +53,16 @@ require Exporter;
"30" => "ShutterContactState", "30" => "ShutterContactState",
"40" => "SetTemperature", #to thermostat "40" => "SetTemperature", # to thermostat
"42" => "WallThermostatControl", #by WallMountedThermostat "42" => "WallThermostatControl", # by WallMountedThermostat
#Sending this without payload to thermostat sets desiredTempeerature to the comfort/eco temperature # Sending this without payload to thermostat sets desiredTempeerature to the comfort/eco temperature
#We don't use it, we just do SetTemperature # We don't use it, we just do SetTemperature
"43" => "SetComfortTemperature", "43" => "SetComfortTemperature",
"44" => "SetEcoTemperature", "44" => "SetEcoTemperature",
"50" => "PushButtonState", "50" => "PushButtonState",
"60" => "ThermostatState", #by HeatingThermostat "60" => "ThermostatState", # by HeatingThermostat
"70" => "WallThermostatState", "70" => "WallThermostatState",
@ -48,15 +71,16 @@ require Exporter;
"F1" => "WakeUp", "F1" => "WakeUp",
"F0" => "Reset", "F0" => "Reset",
); );
%msgCmd2Id = reverse %msgId2Cmd; %msgCmd2Id = reverse %msgId2Cmd;
$defaultWeekProfile = "444855084520452045204520452045204520452045204520452044485508452045204520452045204520452045204520452045204448546c44cc55144520452045204520452045204520452045204448546c44cc55144520452045204520452045204520452045204448546c44cc55144520452045204520452045204520452045204448546c44cc55144520452045204520452045204520452045204448546c44cc5514452045204520452045204520452045204520"; $defaultWeekProfile = "444855084520452045204520452045204520452045204520452044485508452045204520452045204520452045204520452045204448546c44cc55144520452045204520452045204520452045204448546c44cc55144520452045204520452045204520452045204448546c44cc55144520452045204520452045204520452045204448546c44cc55144520452045204520452045204520452045204448546c44cc5514452045204520452045204520452045204520";
sub validTemperature { return $_[0] eq "on" || $_[0] eq "off" || ($_[0] =~ /^\d+(\.[05])?$/ && $_[0] >= 5 && $_[0] <= 30); }
#Identify for numeric values and maps "on" and "off" to their temperatures sub validTemperature { return $_[0] eq "on" || $_[0] eq "off" || ($_[0] =~ /^\d+(\.[05])?$/ && $_[0] >= 4.5 && $_[0] <= 30.5); }
sub
MAX_ParseTemperature($) # Identify for numeric values and maps "on" and "off" to their temperatures
sub MAX_ParseTemperature($)
{ {
return $_[0] eq "on" ? 30.5 : ($_[0] eq "off" ? 4.5 :$_[0]); return $_[0] eq "on" ? 30.5 : ($_[0] eq "off" ? 4.5 :$_[0]);
} }