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

[enocean] Added support for Heat Recovery Ventilation devices (#9465) #9468

Merged
merged 4 commits into from
Feb 4, 2021
Merged

[enocean] Added support for Heat Recovery Ventilation devices (#9465) #9468

merged 4 commits into from
Feb 4, 2021

Conversation

fruggy83
Copy link
Contributor

  • Implemented EEP family D2_50
  • Added new thing type (heatRecoveryVentilation) and channels for heat recovery ventilation units

Fixes #9465

Signed-off-by: Daniel Weber [email protected]

J-N-K
J-N-K requested changes Dec 25, 2020
View reviewed changes
Copy link
Member

@J-N-K J-N-K left a comment

Choose a reason for hiding this comment

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

Otherwise LGTM

...ding.enocean/src/main/java/org/openhab/binding/enocean/internal/EnOceanBindingConstants.java Outdated Show resolved Hide resolved
...ding.enocean/src/main/java/org/openhab/binding/enocean/internal/EnOceanBindingConstants.java Outdated
public static final String CHANNEL_EXHAUSTAIRFANAIRFLOWRATE = "exhaustAirFanAirFlowRate";
public static final String CHANNEL_SUPPLYFANSPEED = "supplyFanSpeed";
public static final String CHANNEL_EXHAUSTFANSPEED = "exhaustFanSpeed";

public static final Map<String, EnOceanChannelDescription> CHANNELID2CHANNELDESCRIPTION = Collections
Copy link
Member

Choose a reason for hiding this comment

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

Use Map.of here

Copy link
Contributor Author

Choose a reason for hiding this comment

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

As I have more than 10 entries here, I am using Map.ofEntries, hope this is the expected way

...nhab.binding.enocean/src/main/java/org/openhab/binding/enocean/internal/eep/D2_50/D2_50.java Outdated Show resolved Hide resolved
...n/src/main/java/org/openhab/binding/enocean/internal/handler/EnOceanBaseActuatorHandler.java Outdated Show resolved Hide resolved
@fruggy83
Copy link
Contributor Author

fruggy83 commented Jan 6, 2021

@J-N-K Thanks a lot for your review. Your comments also revealed an error in my vscode settings 👍 IDE said JDK11 is used but my settings pointed to JDK8 path. So I could not use these "of" functions.

As every year: How do we proceed with the license header of the newly added files? Should I already update it to 2021 (Jenkis build will fail) or do you update it during the merge?

@fwolter
Copy link
Member

fwolter commented Jan 13, 2021

You can rebase your branch, then the headers you didn't touch are updated automatically. If you added new code files, you can run mvn license:format in the root directoy of this repo to update the years. This should be done before merging.

Here are the commands for rebasing your branch:

If not already done, add the upstream openHAB addon repo as a remote to your local repo and fetch it:

git remote add upstream https://github.com/openhab/openhab-addons.git
git fetch upstream

Then, you can rebase your PR's branch onto main:

git rebase upstream/main

Finally force-push the rebased branch to this PR's branch:

git push origin [your branch name of this PR] --force-with-lease

@cpmeister cpmeister added the enhancement An enhancement or new feature for an existing add-on label Jan 15, 2021
@wborn wborn added rebuild Triggers Jenkins PR build and removed rebuild Triggers Jenkins PR build labels Jan 19, 2021
@fruggy83
[enocean] Added support for Heat Recovery Ventilation devices (openha…
ff3a31e 
…b#9465)

 * Implemented EEP family D2_50
 * Added new thing type (heatRecoveryVentilation) and channels for heat recovery ventilation units

Fixes openhab#9465

Signed-off-by: Daniel Weber <[email protected]>
@fruggy83
[enocean] Added support for Heat Recovery Ventilation devices (openha…
e2561d5 
…b#9465)

 * code refactoring (JAVA11 improvements)

Fixes openhab#9465

Signed-off-by: Daniel Weber <[email protected]>
@fruggy83 fruggy83 force-pushed the issue9465_HeatRecoveryVentilationUnits branch from e70812b to e2561d5 Compare January 29, 2021 09:42
@fruggy83
[enocean] Added support for Heat Recovery Ventilation devices (openha…
44edc3c 
…b#9465)

 * Removed unnecessary EEP classes
 * Made final fields static
 * Added @NonNullByDefault to EEP Class

Fixes openhab#9465

Signed-off-by: Daniel Weber <[email protected]>
@fruggy83
[enocean] Added support for Heat Recovery Ventilation devices (openha…
68aaac1 
…b#9465)

 * Removed @NonNullByDefault to not mess up PR with non related changes

Fixes openhab#9465

Signed-off-by: Daniel Weber <[email protected]>
@fruggy83
Copy link
Contributor Author

@cpmeister Thanks a lot for your review comments. I hope I have resolved all problems now. I would like to address this NonNullByDefault point in a seperate PR, if this is ok.

@fwolter Thanks a lot for your hints regarding rebasing.

@Hilbrand Hilbrand requested review from cpmeister and J-N-K February 1, 2021 11:47
cpmeister
cpmeister approved these changes Feb 4, 2021
View reviewed changes
Copy link
Contributor

@cpmeister cpmeister left a comment

Choose a reason for hiding this comment

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

LGTM

@cpmeister cpmeister merged commit 96f15c5 into openhab:main Feb 4, 2021
@cpmeister cpmeister added this to the 3.1 milestone Feb 4, 2021
themillhousegroup pushed a commit to themillhousegroup/openhab2-addons that referenced this pull request May 10, 2021
@fruggy83 @themillhousegroup
[enocean] Added support for Heat Recovery Ventilation devices (openha…
698b832 
…b#9465) (openhab#9468)

* [enocean] Added support for Heat Recovery Ventilation devices (openhab#9465)

 * Implemented EEP family D2_50
 * Added new thing type (heatRecoveryVentilation) and channels for heat recovery ventilation units

Fixes openhab#9465

* [enocean] Added support for Heat Recovery Ventilation devices (openhab#9465)

 * code refactoring (JAVA11 improvements)

Fixes openhab#9465

* [enocean] Added support for Heat Recovery Ventilation devices (openhab#9465)

 * Removed unnecessary EEP classes
 * Made final fields static
 * Added @NonNullByDefault to EEP Class

Fixes openhab#9465

* [enocean] Added support for Heat Recovery Ventilation devices (openhab#9465)

 * Removed @NonNullByDefault to not mess up PR with non related changes

Fixes openhab#9465

Signed-off-by: Daniel Weber <[email protected]>
Signed-off-by: John Marshall <[email protected]>
thinkingstone pushed a commit to thinkingstone/openhab-addons that referenced this pull request Nov 7, 2021
@fruggy83 @thinkingstone
[enocean] Added support for Heat Recovery Ventilation devices (openha…
7a76aac 
…b#9465) (openhab#9468)

* [enocean] Added support for Heat Recovery Ventilation devices (openhab#9465)

 * Implemented EEP family D2_50
 * Added new thing type (heatRecoveryVentilation) and channels for heat recovery ventilation units

Fixes openhab#9465

* [enocean] Added support for Heat Recovery Ventilation devices (openhab#9465)

 * code refactoring (JAVA11 improvements)

Fixes openhab#9465

* [enocean] Added support for Heat Recovery Ventilation devices (openhab#9465)

 * Removed unnecessary EEP classes
 * Made final fields static
 * Added @NonNullByDefault to EEP Class

Fixes openhab#9465

* [enocean] Added support for Heat Recovery Ventilation devices (openhab#9465)

 * Removed @NonNullByDefault to not mess up PR with non related changes

Fixes openhab#9465

Signed-off-by: Daniel Weber <[email protected]>
marcfischerboschio pushed a commit to bosch-io/openhab-addons that referenced this pull request May 5, 2022
@fruggy83
[enocean] Added support for Heat Recovery Ventilation devices (openha…
6a4e73f 
…b#9465) (openhab#9468)

* [enocean] Added support for Heat Recovery Ventilation devices (openhab#9465)

 * Implemented EEP family D2_50
 * Added new thing type (heatRecoveryVentilation) and channels for heat recovery ventilation units

Fixes openhab#9465

* [enocean] Added support for Heat Recovery Ventilation devices (openhab#9465)

 * code refactoring (JAVA11 improvements)

Fixes openhab#9465

* [enocean] Added support for Heat Recovery Ventilation devices (openhab#9465)

 * Removed unnecessary EEP classes
 * Made final fields static
 * Added @NonNullByDefault to EEP Class

Fixes openhab#9465

* [enocean] Added support for Heat Recovery Ventilation devices (openhab#9465)

 * Removed @NonNullByDefault to not mess up PR with non related changes

Fixes openhab#9465

Signed-off-by: Daniel Weber <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@cpmeister cpmeister cpmeister approved these changes

@J-N-K J-N-K Awaiting requested review from J-N-K

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

Successfully merging this pull request may close these issues.

[enocean] Add support for Heat Recovery Ventilation devices
5 participants
@fruggy83 @fwolter @cpmeister @J-N-K @wborn