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.

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

Implement Asymmetric Active Power Voltage Characteristic and Symmetric Reactive Power Voltage Characteristic Controllers #1258

Merged
merged 69 commits into from
Nov 6, 2020

Conversation

huseyinsaht
Copy link
Contributor

No description provided.

huseyinsaht and others added 30 commits July 29, 2019 12:07
# Conflicts:
#	io.openems.edge.application/EdgeApp.bndrun
# Conflicts:
#	io.openems.edge.application/EdgeApp.bndrun
#	io.openems.edge.controller.asymmetric.powervoltagecharacteristic/bnd.bnd
# Conflicts:
#	io.openems.edge.application/EdgeApp.bndrun
#	io.openems.edge.controller.asymmetric.powervoltagecharacteristic/src/io/openems/edge/controller/asymmetric/reactivepowervoltagecharacteristic/ReactivePowerVoltageCharacteristic.java
#	io.openems.edge.meter.janitza/src/io/openems/edge/meter/janitza/umg604/MeterJanitzaUmg604.java
…om/OpenEMS/openems into feature/powervoltagecharacteristic

# Conflicts:
#	io.openems.edge.controller.asymmetric.powervoltagecharacteristic/src/io/openems/edge/controller/asymmetric/activepowervoltagecharacteristic/ActivePowerVoltageCharacteristic.java
#	io.openems.edge.controller.asymmetric.powervoltagecharacteristic/src/io/openems/edge/controller/asymmetric/activepowervoltagecharacteristic/Utils.java
#	io.openems.edge.controller.asymmetric.powervoltagecharacteristic/src/io/openems/edge/controller/asymmetric/powercharacteristic/AbstractPowerCharacteristic.java
#	io.openems.edge.controller.asymmetric.powervoltagecharacteristic/src/io/openems/edge/controller/asymmetric/powercharacteristic/Utils.java
#	io.openems.edge.controller.asymmetric.powervoltagecharacteristic/src/io/openems/edge/controller/asymmetric/reactivepowervoltagecharacteristic/Config.java
#	io.openems.edge.controller.asymmetric.powervoltagecharacteristic/src/io/openems/edge/controller/asymmetric/reactivepowervoltagecharacteristic/ReactivePowerVoltageCharacteristic.java
…ckage, abstract class moved to edge.common.powercharacteristic
Copy link
Contributor

@sfeilmeier sfeilmeier left a comment

Choose a reason for hiding this comment

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

Well done!

@sfeilmeier sfeilmeier merged commit 5a7803c into develop Nov 6, 2020
@sfeilmeier sfeilmeier deleted the feature/powervoltagecharacteristic branch November 6, 2020 11:37
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants