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

Jump to bottom

[innogysmarthome] Fix isr2stop #7439

Merged
merged 5 commits into from Apr 24, 2020
Merged

[innogysmarthome] Fix isr2stop #7439

merged 5 commits into from Apr 24, 2020

Conversation

mmans
Copy link

@mmans mmans commented Apr 21, 2020 •
edited

[innogysmarthome] Optimizes the control of Shutters (ISR2) by using the correct api-calls. Adding the possibility to use the "STOP" command when the shutters are moving.

In the current release the binding uses the "SetState" command to move the shutters (When user clicks on arrow buttons of the default sitemap-widget). So in fact it sets the position variable to 0% or 100%. The stop button was not working. In this PR I use the same API-call as Innogy uses in their app to start moving the shutters (RampStart). I also added support for the STOP-button by using the "RampStop" API-call. This was a missing feature.

@mmans mmans requested a review from ollie-dev as a code owner April 21, 2020 17:25
working but ugly
fcc44c9 
Signed-off-by: Marco Mans <marco.mans@engie.com>
@TravisBuddy
Copy link

Travis tests have failed

Hey @mmans,
please read the following log in order to understand the failure reason. There might also be some helpful tips along the way.
It will be awesome if you fix what is wrong and commit the changes.

1 similar comment
@TravisBuddy
Copy link

Travis tests have failed

Hey @mmans,
please read the following log in order to understand the failure reason. There might also be some helpful tips along the way.
It will be awesome if you fix what is wrong and commit the changes.

Updated Javadoc
923488d 
Signed-off-by: Marco Mans <marco.mans@engie.com>
@TravisBuddy
Copy link

Travis tests have failed

Hey @mmans,
please read the following log in order to understand the failure reason. There might also be some helpful tips along the way.
It will be awesome if you fix what is wrong and commit the changes.

Fixed travis complains
5a63048 
Signed-off-by: Marco Mans <marco.mans@engie.com>
@TravisBuddy
Copy link

Travis tests were successful

Hey @mmans,
we found no major flaws with your code. Still you might want to look at this logfile, as we usually suggest some optional improvements.

@cpmeister cpmeister changed the title Fix isr2stop [innogysmarthome] Fix isr2stop Apr 21, 2020
@TravisBuddy
Copy link

Travis tests have failed

Hey @mmans,
please read the following log in order to understand the failure reason. There might also be some helpful tips along the way.
It will be awesome if you fix what is wrong and commit the changes.

J-N-K
J-N-K requested changes Apr 24, 2020
View reviewed changes
...in/java/org/openhab/binding/innogysmarthome/internal/client/entity/action/ShutterAction.java Outdated
STOP
}

private final String TYPE_STOP_RAMP = "StopRamp";
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why are these not static?

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

oops :)

.../src/main/java/org/openhab/binding/innogysmarthome/internal/handler/InnogyBridgeHandler.java Outdated
@@ -110,7 +111,8 @@
private @Nullable DeviceStructureManager deviceStructMan;
private @Nullable String bridgeId;
private @Nullable ScheduledFuture<?> reinitJob;
private @NonNullByDefault({}) InnogyBridgeConfiguration bridgeConfiguration;
private @NonNullByDefault({})
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please revert this format change. Single annotations are on the same line.

Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I changed it back.

Marco Mans added 2 commits April 24, 2020 19:33
Travis must be female...
f597204 
Signed-off-by: Marco Mans <marco.mans@engie.com>
Resolved PR comments
6434a9a 
Signed-off-by: Marco Mans <marco.mans@engie.com>
@J-N-K J-N-K merged commit 5ec701b into openhab:2.5.x Apr 24, 2020
@TravisBuddy
Copy link

Travis tests were successful

Hey @mmans,
we found no major flaws with your code. Still you might want to look at this logfile, as we usually suggest some optional improvements.

@cpmeister cpmeister added this to the 2.5.5 milestone Apr 24, 2020
@cpmeister cpmeister added the enhancement An enhancement or new feature for an existing add-on label Apr 24, 2020
yfre pushed a commit to yfre/openhab-addons that referenced this pull request Apr 27, 2020
@mmans
[innogysmarthome] Fix isr2stop (openhab#7439)
29b8950 
Signed-off-by: Marco Mans <marco.mans@engie.com>
Signed-off-by: Eugen Freiter <freiter@gmx.de>
@mmans mmans mentioned this pull request May 11, 2020
Closed
LoungeFlyZ pushed a commit to LoungeFlyZ/openhab2-addons that referenced this pull request Jun 8, 2020
@mmans @LoungeFlyZ
[innogysmarthome] Fix isr2stop (openhab#7439)
8e318d7 
Signed-off-by: Marco Mans <marco.mans@engie.com>
J-N-K pushed a commit to J-N-K/openhab-addons that referenced this pull request Jul 14, 2020
@mmans @J-N-K
[innogysmarthome] Fix isr2stop (openhab#7439)
9ea9497 
Signed-off-by: Marco Mans <marco.mans@engie.com>
CSchlipp pushed a commit to CSchlipp/openhab-addons that referenced this pull request Jul 26, 2020
@mmans @CSchlipp
[innogysmarthome] Fix isr2stop (openhab#7439)
32ab0d5 
Signed-off-by: Marco Mans <marco.mans@engie.com>
Signed-off-by: CSchlipp <christian@schlipp.de>
andrewfg pushed a commit to andrewfg/openhab-addons that referenced this pull request Aug 31, 2020
@mmans @andrewfg
[innogysmarthome] Fix isr2stop (openhab#7439)
3f06ca9 
Signed-off-by: Marco Mans <marco.mans@engie.com>
andrewfg pushed a commit to andrewfg/openhab-addons that referenced this pull request Aug 31, 2020
@mmans @andrewfg
[innogysmarthome] Fix isr2stop (openhab#7439)
1d659ff 
Signed-off-by: Marco Mans <marco.mans@engie.com>
andrewfg pushed a commit to andrewfg/openhab-addons that referenced this pull request Aug 31, 2020
@mmans @andrewfg
[innogysmarthome] Fix isr2stop (openhab#7439)
92871b7 
Signed-off-by: Marco Mans <marco.mans@engie.com>
andrewfg pushed a commit to andrewfg/openhab-addons that referenced this pull request Aug 31, 2020
@mmans @andrewfg
[innogysmarthome] Fix isr2stop (openhab#7439)
63c9e6d 
Signed-off-by: Marco Mans <marco.mans@engie.com>
DaanMeijer pushed a commit to DaanMeijer/openhab-addons that referenced this pull request Sep 1, 2020
@mmans @DaanMeijer
[innogysmarthome] Fix isr2stop (openhab#7439)
da66a3e 
Signed-off-by: Marco Mans <marco.mans@engie.com>
Signed-off-by: Daan Meijer <daan@studioseptember.nl>
markus7017 pushed a commit to markus7017/openhab-addons that referenced this pull request Sep 19, 2020
@mmans @markus7017
[innogysmarthome] Fix isr2stop (openhab#7439)
bd8f065 
Signed-off-by: Marco Mans <marco.mans@engie.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@J-N-K J-N-K J-N-K approved these changes

@ollie-dev ollie-dev Awaiting requested review from ollie-dev ollie-dev is a code owner

Assignees
No one assigned
Labels
enhancement An enhancement or new feature for an existing add-on
Projects
None yet
Milestone
2.5.5
Development

Successfully merging this pull request may close these issues.

None yet
4 participants
@mmans @TravisBuddy @J-N-K @cpmeister