jeena/telldus
1
0
Fork 0
Code Issues Pull requests Projects Packages Wiki Activity Actions

Added possiblitiy to use a minus sign (-) when setting the off when bright delay and prelight in afternoon parameters in the tellstickd.conf file.

Browse source
This commit is contained in:
Magnus Juntti 2008-02-17 19:59:20 +00:00
parent b7e55de443
commit 28b7841310
3 changed files with 26 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

1
tellstickd/README
View file

@ -35,6 +35,7 @@ Bug reports are welcome, but even more appreciated are patches with the solution
Revision history Revision history
================= =================
2008-02-17 0.3.4 Now possible to use a minus sign (-) when setting <off when bright delay> and <prelight in afternoon>
2008-02-15 0.3.3 General improvements. 2008-02-15 0.3.3 General improvements.
2008-02-15 0.3.2 Corrected a fatal bug regarding switch logic. 2008-02-15 0.3.2 Corrected a fatal bug regarding switch logic.
2008-02-15 0.3.1 Changed update interval back from 50 to 60 seconds. 2008-02-15 0.3.1 Changed update interval back from 50 to 60 seconds.

32
tellstickd/tellstickd
View file

@ -17,7 +17,7 @@ $LOG_FILE = "/var/log/tellstickd";
# You should not need to go beyond this point (unless you have found a bug or need to improve the functionality). # You should not need to go beyond this point (unless you have found a bug or need to improve the functionality).
$AUTHOR = "Magnus Juntti, mjuntti\@gmail.com"; $AUTHOR = "Magnus Juntti, mjuntti\@gmail.com";
$PROGRAM_NAME = "tellstickd"; $PROGRAM_NAME = "tellstickd";
$VERSION = "0.3.3"; $VERSION = "0.3.4";
# Structure of the configurations to be read; # Structure of the configurations to be read;
@ -156,28 +156,34 @@ sub rfcmd_exec {
} }
# Time format xx:yy for input parameters # Time format xx:yy for input parameters argument1 has to be positive, argument2 can be positive or negative
sub add_time sub add_time
{ {
my $time1 = $_[0]; my $time1 = $_[0];
my $time2 = $_[1]; my $time2 = $_[1];
my $multiplier = 1;
($Second, $Minute, $Hour, $Day, $Month, $Year, $WeekDay, $DayOfYear, $IsDST) = localtime(time); ($Second, $Minute, $Hour, $Day, $Month, $Year, $WeekDay, $DayOfYear, $IsDST) = localtime(time);
$Year += 1900; $Year += 1900;
(my $sign) = $time2 =~ /^(.*?)[0-9]/;
($time1_hour, $time1_minute) = $time1 =~ /(.*)\:(.*)/; ($time1_hour, $time1_minute) = $time1 =~ /(.*)\:(.*)/;
($time2_hour, $time2_minute) = $time2 =~ /(.*)\:(.*)/;$device_cfg[$i][8] = $inrad[8]; # On time random interval # Remove any leading signs
$device_cfg[$i][9] = $inrad[9]; # Off time random interval $time2 =~ s/^.*?[0-9]//g;
($time2_hour, $time2_minute) = $time2 =~ /(.*)\:(.*)/;
if ($sign eq "-") {
$multiplier = -1;
}
$time1_epoch_seconds = timelocal(0,$time1_minute,$time1_hour, $Day, $Month, $Year); $time1_epoch_seconds = timelocal(0,$time1_minute,$time1_hour, $Day, $Month, $Year);
$time2_offset_seconds = 3600*$time2_hour + 60*$time2_minute; $time2_offset_seconds = 3600*$time2_hour + 60*$time2_minute;
my $result_seconds = $time1_epoch_seconds + $time2_offset_seconds; my $result_seconds = $time1_epoch_seconds + $multiplier*$time2_offset_seconds;
($min,$hour)= (localtime($result_seconds))[1,2]; ($min,$hour)= (localtime($result_seconds))[1,2];
return sprintf("%02d:%02d", $hour, $min); return sprintf("%02d:%02d", $hour, $min);
} }
# Time format xx:yy for input parameters # Time format xx:yy for input parameters
@ -185,22 +191,29 @@ sub subtract_time
{ {
my $time1 = $_[0]; my $time1 = $_[0];
my $time2 = $_[1]; my $time2 = $_[1];
my $multiplier = 1;
($Second, $Minute, $Hour, $Day, $Month, $Year, $WeekDay, $DayOfYear, $IsDST) = localtime(time); ($Second, $Minute, $Hour, $Day, $Month, $Year, $WeekDay, $DayOfYear, $IsDST) = localtime(time);
$Year += 1900; $Year += 1900;
(my $sign) = $time2 =~ /^(.*?)[0-9]/;
($time1_hour, $time1_minute) = $time1 =~ /(.*)\:(.*)/; ($time1_hour, $time1_minute) = $time1 =~ /(.*)\:(.*)/;
# Remove any leading signs
$time2 =~ s/^.*?[0-9]//g;
($time2_hour, $time2_minute) = $time2 =~ /(.*)\:(.*)/; ($time2_hour, $time2_minute) = $time2 =~ /(.*)\:(.*)/;
if ($sign eq "-") {
$multiplier = -1;
}
$time1_epoch_seconds = timelocal(0,$time1_minute,$time1_hour, $Day, $Month, $Year); $time1_epoch_seconds = timelocal(0,$time1_minute,$time1_hour, $Day, $Month, $Year);
$time2_offset_seconds = 3600*$time2_hour + 60*$time2_minute; $time2_offset_seconds = 3600*$time2_hour + 60*$time2_minute;
my $result_seconds = $time1_epoch_seconds - $time2_offset_seconds; my $result_seconds = $time1_epoch_seconds - $multiplier*$time2_offset_seconds;
($min,$hour)= (localtime($result_seconds))[1,2]; ($min,$hour)= (localtime($result_seconds))[1,2];
return sprintf("%02d:%02d", $hour, $min); return sprintf("%02d:%02d", $hour, $min);
} }
sub randomize_on sub randomize_on
@ -257,6 +270,9 @@ sub is_time_format_correct
my $number_of_matches = 0; my $number_of_matches = 0;
my $tmp = $time; my $tmp = $time;
# Remove a leading signs, if it exists
$time =~ s/^.*?[0-9]//g;
if (length($time) < 4 || length($time) > 5) { if (length($time) < 4 || length($time) > 5) {
return $NO; return $NO;
} }

2
tellstickd/tellstickd.conf
View file

@ -1,6 +1,6 @@
# Tellstickd file for control of remote switches with rfcmd. # Tellstickd file for control of remote switches with rfcmd.
# #
#<protocol> <housecode> <channel> <on time> <off time> <daytime off yes/no> <off when bright delay in morning> <prelight in afternoon> <on time random interval> <off time random interval> #<protocol> <housecode> <channel> <on time> <off time> <daytime off yes/no> <off when bright delay> <prelight in afternoon> <on time random interval> <off time random interval>
# (no = 0, yes = 1) # (no = 0, yes = 1)
# Multiple definitions are possible for each device # Multiple definitions are possible for each device
# #