FHEM/fhem-mirror
2
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-04-25 22:09:21 +00:00
Code Issues Releases Wiki Activity

70_BOTVAC.pm: remove redundant reading isScheduleEnabled, fix style, fix boolean

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@19249 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
vuffiraa 2019-04-23 19:28:15 +00:00
parent 2e40e26c1d
commit b3bae00876
1 changed files with 29 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
fhem/FHEM/70_BOTVAC.pm
View File

@ -879,7 +879,7 @@ sub ReceiveCommand($$$) {
# getSchedule, enableSchedule, disableSchedule # getSchedule, enableSchedule, disableSchedule
if ( ref($return->{data}) eq "HASH" ) { if ( ref($return->{data}) eq "HASH" ) {
my $scheduleData = $return->{data}; my $scheduleData = $return->{data};
readingsBulkUpdateIfChanged($hash, "scheduleEnabled", $scheduleData->{enabled}); readingsBulkUpdateIfChanged($hash, "scheduleEnabled", GetBoolean($scheduleData->{enabled}));
readingsBulkUpdateIfChanged($hash, "scheduleType", $scheduleData->{type}) readingsBulkUpdateIfChanged($hash, "scheduleType", $scheduleData->{type})
if (defined($scheduleData->{type})); if (defined($scheduleData->{type}));
@ -1060,19 +1060,19 @@ sub ReceiveCommand($$$) {
} }
if ( ref($return->{details}) eq "HASH" ) { if ( ref($return->{details}) eq "HASH" ) {
my $details = $return->{details}; my $details = $return->{details};
readingsBulkUpdateIfChanged($hash, "isCharging", $details->{isCharging}); readingsBulkUpdateIfChanged($hash, "isCharging", GetBoolean($details->{isCharging}));
readingsBulkUpdateIfChanged($hash, "isDocked", $details->{isDocked}); readingsBulkUpdateIfChanged($hash, "isDocked", GetBoolean($details->{isDocked}));
readingsBulkUpdateIfChanged($hash, "isScheduleEnabled", $details->{isScheduleEnabled}); readingsBulkUpdateIfChanged($hash, "scheduleEnabled", GetBoolean($details->{isScheduleEnabled}));
readingsBulkUpdateIfChanged($hash, "dockHasBeenSeen", $details->{dockHasBeenSeen}); readingsBulkUpdateIfChanged($hash, "dockHasBeenSeen", GetBoolean($details->{dockHasBeenSeen}));
readingsBulkUpdateIfChanged($hash, "batteryPercent", $details->{charge}); readingsBulkUpdateIfChanged($hash, "batteryPercent", $details->{charge});
} }
if ( ref($return->{availableCommands}) eq "HASH" ) { if ( ref($return->{availableCommands}) eq "HASH" ) {
my $availableCommands = $return->{availableCommands}; my $availableCommands = $return->{availableCommands};
readingsBulkUpdateIfChanged($hash, ".start", $availableCommands->{start}); readingsBulkUpdateIfChanged($hash, ".start", GetBoolean($availableCommands->{start}));
readingsBulkUpdateIfChanged($hash, ".pause", $availableCommands->{pause}); readingsBulkUpdateIfChanged($hash, ".pause", GetBoolean($availableCommands->{pause}));
readingsBulkUpdateIfChanged($hash, ".resume", $availableCommands->{resume}); readingsBulkUpdateIfChanged($hash, ".resume", GetBoolean($availableCommands->{resume}));
readingsBulkUpdateIfChanged($hash, ".goToBase", $availableCommands->{goToBase}); readingsBulkUpdateIfChanged($hash, ".goToBase", GetBoolean($availableCommands->{goToBase}));
readingsBulkUpdateIfChanged($hash, ".stop", $availableCommands->{stop}) readingsBulkUpdateIfChanged($hash, ".stop", GetBoolean($availableCommands->{stop}))
unless ($cmd =~ /start.*/ or $cmd eq "getRobotManualCleaningInfo"); unless ($cmd =~ /start.*/ or $cmd eq "getRobotManualCleaningInfo");
} }
if ( ref($return->{availableServices}) eq "HASH" ) { if ( ref($return->{availableServices}) eq "HASH" ) {
@ -1386,6 +1386,22 @@ sub CheckRegistration($$$$$) {
return; return;
} }
sub GetBoolean($) {
my ($value) = @_;
my $booleans = {
'0' => "0",
'false' => "0",
'1' => "1",
'true' => "1"
};
if (defined( $booleans->{$value})) {
return $booleans->{$value};
} else {
return $value;
}
}
sub BuildState($$$$) { sub BuildState($$$$) {
my ($hash,$state,$action,$error) = @_; my ($hash,$state,$action,$error) = @_;
my $states = { my $states = {
@ -1647,8 +1663,8 @@ sub GetStatistics($) {
$ret .= '<html><head><meta charset="utf-8">'; $ret .= '<html><head><meta charset="utf-8">';
$ret .= '<style>'; $ret .= '<style>';
$ret .= ' .botvac tbody {border-top: 1px solid gray; border-bottom: 1px solid gray;}'; $ret .= ' .botvac tbody {border-top: 1px solid gray; border-bottom: 1px solid gray;}';
$ret .= ' .botvac th, td {text-align: -webkit-center; padding-right: 1em;}'; $ret .= ' .botvac th, .botvac td {text-align: center; padding-right: 1em;}';
$ret .= ' .botvac caption {text-align: -webkit-left; padding-bottom: 1em; margin-bottom: 1em;}'; $ret .= ' .botvac caption {text-align: left; padding-bottom: 1em; margin-bottom: 1em;}';
$ret .= '</style>'; $ret .= '</style>';
$ret .= '</head><body><table class="botvac">'; $ret .= '</head><body><table class="botvac">';
$ret .= '<caption><b>Report: '.ReadingsVal($name,"name","name").', '.InternalVal($name,"VENDOR","VENDOR").', '.ReadingsVal($name,"model","model").'</b></caption>'; $ret .= '<caption><b>Report: '.ReadingsVal($name,"name","name").', '.InternalVal($name,"VENDOR","VENDOR").', '.ReadingsVal($name,"model","model").'</b></caption>';