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

Corrected a fatal bug regarding switch logic.

Browse source
This commit is contained in:
Magnus Juntti 2008-02-15 08:12:35 +00:00
parent a67fa2653b
commit 6ba85200c4
2 changed files with 5 additions and 4 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-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.
2008-02-14 0.3.0 New feature: On- and off times can be randomized within a given interval. Changed update interval from 60 to 50 seconds. 2008-02-14 0.3.0 New feature: On- and off times can be randomized within a given interval. Changed update interval from 60 to 50 seconds.
2008-02-12 0.2.1 Changed behaviour when program is called without argument. Now presents: Try "tellstickd --help" for more information. 2008-02-12 0.2.1 Changed behaviour when program is called without argument. Now presents: Try "tellstickd --help" for more information.

8
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.1"; $VERSION = "0.3.2";
# Structure of the configurations to be read; # Structure of the configurations to be read;
@ -93,8 +93,8 @@ sub is_inbetween_times
$time1 =~ s/://g; $time1 =~ s/://g;
$time2 =~ s/://g; $time2 =~ s/://g;
$curr_time =~ s/^0*//; $curr_time =~ s/^0*//;
$sunrise_time =~ s/^0*//; $time1 =~ s/^0*//;
$sunset_time =~ s/^0*//; $time2 =~ s/^0*//;
# If we pass midnight, the following has to be checked # If we pass midnight, the following has to be checked
if ($time2 <= $time1) { if ($time2 <= $time1) {
@ -522,7 +522,7 @@ while (1) {
# First if we consider daytime off # First if we consider daytime off
if ($device_cfg[$i][5] == $YES) { if ($device_cfg[$i][5] == $YES) {
if (is_inbetween_times($device_cfg[$i][3], $device_cfg[$i][4], $current_time) == $YES && is_inbetween_times($device_cfg[$i][20], $device_cfg[$i][21]) == $NO) { if (is_inbetween_times($device_cfg[$i][3], $device_cfg[$i][4], $current_time) == $YES && is_inbetween_times($device_cfg[$i][20], $device_cfg[$i][21], $current_time) == $NO) {
rfcmd_exec($i, 1); rfcmd_exec($i, 1);
} }
else { else {