Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

HOMESTATEtk: initial checkin to prepare for 00_HOMESTATE public beta

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@14214 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
jpawlowski 2017-05-07 23:59:24 +00:00
parent 1cb77c3ec9
commit 39a3f7edfb
3 changed files with 1309 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1302
fhem/FHEM/HOMESTATEtk.pm Normal file
View File

File diff suppressed because it is too large Load Diff

13
fhem/FHEM/UConv.pm
View File

@ -1242,10 +1242,13 @@ sub GetDaytime(;$$$$) {
# Midnight # Midnight
$ret->{events}{ $ret->{midnight_t} }{TIME} = $ret->{events}{ $ret->{midnight_t} }{TIME} =
main::FmtDateTime( $ret->{midnight_t} ); main::FmtDateTime( $ret->{midnight_t} );
$ret->{events}{ $ret->{midnight_t} }{DESC} = "Begin new calendar day"; $ret->{events}{ $ret->{midnight_t} }{DESC} =
"Begin night time and new calendar day";
$ret->{events}{ $ret->{1}{midnight_t} }{TIME} = $ret->{events}{ $ret->{1}{midnight_t} }{TIME} =
main::FmtDateTime( $ret->{1}{midnight_t} ); main::FmtDateTime( $ret->{1}{midnight_t} );
$ret->{events}{ $ret->{1}{midnight_t} }{DESC} = "Begin new calendar day"; $ret->{events}{ $ret->{1}{midnight_t} }{TIME} =~ s/00:00:00/24:00:00/;
$ret->{events}{ $ret->{1}{midnight_t} }{DESC} =
"End calendar day and begin night time";
# Holidays # Holidays
$ret->{events}{ $ret->{midnight_t} }{DESC} .= $ret->{events}{ $ret->{midnight_t} }{DESC} .=
@ -1287,7 +1290,7 @@ sub GetDaytime(;$$$$) {
my $t = int( $b + 0.5 ); my $t = int( $b + 0.5 );
$ret->{events}{$t}{TIME} = main::FmtDateTime($t); $ret->{events}{$t}{TIME} = main::FmtDateTime($t);
if ( $i == $ret->{daytimeStages} + 1 ) { if ( $i == $ret->{daytimeStages} + 1 ) {
$ret->{events}{$t}{DESC} = "Begin nighttime"; $ret->{events}{$t}{DESC} = "Begin midevening time";
} }
else { else {
$ret->{events}{$t}{DESC} = "Begin daytime stage $i" $ret->{events}{$t}{DESC} = "Begin daytime stage $i"
@ -1821,10 +1824,6 @@ sub _time(;$$$) {
} }
sub _GetIndexFromArray($$) { sub _GetIndexFromArray($$) {
# my ( $string, @array ) = @_;
# my ($index) = grep { $array[$_] =~ /^$string$/i } ( 0 .. @array - 1 );
# return defined $index ? $index : undef;
my ( $string, $array ) = @_; my ( $string, $array ) = @_;
return undef unless ( ref($array) eq "ARRAY" ); return undef unless ( ref($array) eq "ARRAY" );
my ($index) = grep { $array->[$_] =~ /^$string$/i } ( 0 .. @$array - 1 ); my ($index) = grep { $array->[$_] =~ /^$string$/i } ( 0 .. @$array - 1 );

1
fhem/MAINTAINER.txt
View File

@ -445,6 +445,7 @@ FHEM/Color.pm justme1968 http://forum.fhem.de Sonstiges
FHEM/FritzBoxUtils.pm rudolfkoenig http://forum.fhem.de FRITZ!Box FHEM/FritzBoxUtils.pm rudolfkoenig http://forum.fhem.de FRITZ!Box
FHEM/HMCCUConf.pm zap http://forum.fhem.de HomeMatic FHEM/HMCCUConf.pm zap http://forum.fhem.de HomeMatic
FHEM/HMConfig.pm martinp876 http://forum.fhem.de HomeMatic FHEM/HMConfig.pm martinp876 http://forum.fhem.de HomeMatic
FHEM/HOMESTATEtk.pm loredo http://forum.fhem.de Automatisierung
FHEM/HttpUtils.pm rudolfkoenig http://forum.fhem.de Automatisierung FHEM/HttpUtils.pm rudolfkoenig http://forum.fhem.de Automatisierung
FHEM/MaxCommon.pm rudolfkoenig/orphan http://forum.fhem.de MAX FHEM/MaxCommon.pm rudolfkoenig/orphan http://forum.fhem.de MAX
FHEM/msgSchema.pm loredo http://forum.fhem.de Automatisierung FHEM/msgSchema.pm loredo http://forum.fhem.de Automatisierung