Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

HPlato -- enhanced cover type to support partial opening and stop setval #889

Merged
merged 1 commit into from
Apr 28, 2024
Merged

HPlato -- enhanced cover type to support partial opening and stop setval #889

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 44 additions & 11 deletions lib/HA_Item.pm
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,8 @@ Description:
*** IMPORTANT *** : To mimic the MH 'one object one state' approach, subtypes are used in the domain based on HA attributes
- light: on, off and brightness
:rgb_color : for setting an RGB value
- cover: open,close
- cover: open,stop,close
:digital : for allowing granular setpoints
- lock: lock, unlock
- switch: on,off
- sensor, binary_sensor:
Expand Down Expand Up @@ -268,7 +269,6 @@ sub log {
}
$str = $self->break_long_str( $str, $prefix, 300 );

print $str . "\n";
&main::print_log( $str );
}

Expand Down Expand Up @@ -316,7 +316,6 @@ sub new {

if( !defined $main::Debug{ha_server} ) {
$main::Debug{ha_server} = 0;
# $main::Debug{ha_server} = 2;
}

$address = $address || $::config_parms{homeassistant_address} || 'localhost:8123';
Expand Down Expand Up @@ -550,7 +549,7 @@ sub parse_data_to_obj {
}
}
if( !$handled ) {
$self->debug( 1, "unhandled event $cmd->{entity_id} ($cmd->{state})" );
$self->debug( 2, "unhandled event $cmd->{entity_id} ($cmd->{state})" );
}
return $handled;
}
Expand Down Expand Up @@ -629,7 +628,7 @@ sub get_voice_cmds {

my $objects = "[";
my %seen;
for my $obj ( @{ $ha_server->{objects} } ) {
for my $obj ( @{ $self->{objects} } ) {
next if $seen{$obj->{object_name}}++; #remove duplicate entity names
$objects .= $obj->{object_name} . ",";
}
Expand Down Expand Up @@ -814,14 +813,17 @@ sub new {
if( $domain eq 'switch' ) {
$self->set_states( "off", "on" );
} elsif( $domain eq 'light' ) {
$self->set_states( "off", "20%", "40%", "50%", "60%", "80%", "on" ) unless (lc $self->{subtype} eq "rgb_color");
if ($self->{subtype} eq "rgb_color") {
$self->set_states("rgb");
} else {
$self->set_states( "off", "20%", "40%", "50%", "60%", "80%", "on" );
}
} elsif( $domain eq 'cover' ) {
$self->set_states( "open", "closed" );
if (lc $self->{subtype} eq "digital") {
$self->set_states( "closed", "20%", "40%", "50%", "60%", "80%", "open" );
} else {
$self->set_states( "closed", "stop", "open" );
}
} elsif( $domain eq 'lock' ) {
$self->set_states( "unlocked", "locked" );
} elsif( $domain eq 'climate' ) {
Expand Down Expand Up @@ -916,13 +918,24 @@ sub set {
my $new_state = $setval;
$self->{ha_state} = $setval;
if( $self->{domain} eq 'switch'
|| $self->{domain} eq 'cover'
|| $self->{domain} eq 'lock'
|| $self->{domain} eq 'sensor'
|| $self->{domain} eq 'binary_sensor'
) {
$self->debug( 1, "$self->{domain} event for $self->{object_name} set to $new_state->{state}" );
$self->SUPER::set( $new_state->{state}, $p_setby, $p_response );
} elsif( $self->{domain} eq 'cover' ) {
my $level = $new_state->{state};
if (lc $self->{subtype} eq "digital") {
if( $new_state->{attributes}->{current_position} ) {
$level = $new_state->{attributes}->{current_position}; # * 100 / 255;
$level .= "%";
}
}
$level = "open" if ($level eq "100%");
$level = "closed" if ($level eq "0%");
$self->debug( 1, "cover:$self->{subtype} event for $self->{object_name} set to $level" );
$self->SUPER::set( $level, $p_setby, $p_response );
} elsif( $self->{domain} eq 'select' ) {
$self->debug( 1, "$self->{domain} event for $self->{object_name} set to $new_state->{state}" );
$self->SUPER::set( $new_state->{state}, $p_setby, $p_response );
Expand Down Expand Up @@ -1080,8 +1093,13 @@ sub ha_set_state {
$service = $mode;
my ($numval) = $mode =~ /^([1-9]?[0-9]?[0-9])%?$/;
if( $numval ) {
$service = 'turn_on';
$service_data->{brightness_pct} = $numval;
if (lc $self->{domain} eq 'light') {
$service = 'turn_on';
$service_data->{brightness_pct} = $numval;
} elsif (lc $self->{domain} eq 'cover') {
$service = 'set_cover_position';
$service_data->{position} = $numval;
}
} elsif( lc $mode eq 'on' ) {
$service = 'turn_on';
} elsif( lc $mode eq 'toggle' ) {
Expand All @@ -1094,8 +1112,10 @@ sub ha_set_state {
} else {
$service = 'open_cover';
}
} elsif( lc $mode eq 'close' ) {
} elsif( lc $mode eq 'closed' ) {
$service = 'close_cover';
} elsif( lc $mode eq 'stop' ) {
$service = 'stop_cover';
} elsif( lc $mode eq 'locked' ) {
$service = 'lock';
} elsif( lc $mode eq 'unlocked' ) {
Expand Down Expand Up @@ -1138,6 +1158,19 @@ sub get_rgb {
}
}

=item C<get_rgb()>

Override the default behaviour of the current state being unselectable in IA7

=cut

sub get_state_override {
my ($self) = @_;
my $return = 0;
$return = 1 if (lc $self->{domain} eq "cover");

return $return;
}

# -[ Fini - HA_Item ]---------------------------------------------------------

Expand Down
Loading