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

Meter Carlo Gavazzi EM300: add invert config setting #1140

Merged
merged 2 commits into from
May 12, 2020
Merged

Meter Carlo Gavazzi EM300: add invert config setting #1140

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
741ec90
adds config value fot inverting power values and appropriate scale fa…
wgerbl May 11, 2020
f0179ef
Apply code best practices + checkstyle
sfeilmeier May 12, 2020
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
14 changes: 14 additions & 0 deletions ...s.edge.bridge.modbus/src/io/openems/edge/bridge/modbus/api/ElementToChannelConverter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,12 +155,26 @@ public static final ElementToChannelConverter SCALE_FACTOR_1_AND_INVERT_IF_TRUE(
return new ElementToChannelConverterChain(SCALE_FACTOR_1, INVERT_IF_TRUE(invert));
}

/**
* Applies {@link ElementToChannelConverter#SCALE_FACTOR_2} and INVERT_IF_TRUE.
*/
public static final ElementToChannelConverter SCALE_FACTOR_2_AND_INVERT_IF_TRUE(boolean invert) {
return new ElementToChannelConverterChain(SCALE_FACTOR_2, INVERT_IF_TRUE(invert));
}

/**
* Applies {@link ElementToChannelConverter#SCALE_FACTOR_3} and INVERT_IF_TRUE.
*/
public static final ElementToChannelConverter SCALE_FACTOR_3_AND_INVERT_IF_TRUE(boolean invert) {
return new ElementToChannelConverterChain(SCALE_FACTOR_3, INVERT_IF_TRUE(invert));
}

/**
* Applies {@link ElementToChannelConverter#SCALE_FACTOR_MINUS_1} and INVERT_IF_TRUE.
*/
public static final ElementToChannelConverter SCALE_FACTOR_MINUS_1_AND_INVERT_IF_TRUE(boolean invert) {
return new ElementToChannelConverterChain(SCALE_FACTOR_MINUS_1, INVERT_IF_TRUE(invert));
}

private final Function<Object, Object> elementToChannel;
private final Function<Object, Object> channelToElement;
Expand Down
5 changes: 4 additions & 1 deletion ....edge.meter.carlo.gavazzi.em300/src/io/openems/edge/meter/carlo/gavazzi/em300/Config.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@

import io.openems.edge.meter.api.MeterType;

@ObjectClassDefinition( //
@ObjectClassDefinition(//
name = "Meter Carlo Gavazzi EM300", //
description = "Implements the Carlo Gavazzi EM300-series meter.")
@interface Config {
Expand All @@ -27,6 +27,9 @@

@AttributeDefinition(name = "Modbus Unit-ID", description = "The Unit-ID of the Modbus device.")
int modbusUnitId();

@AttributeDefinition(name = "Invert Power", description = "Inverts all Power values, inverts current values, swaps production and consumptioon energy, i.e. Power is multiplied with -1.")
boolean invert() default false;

@AttributeDefinition(name = "Modbus target filter", description = "This is auto-generated by 'Modbus-ID'.")
String Modbus_target() default "";
Expand Down
157 changes: 2 additions & 155 deletions ...o.gavazzi.em300/src/io/openems/edge/meter/carlo/gavazzi/em300/MeterCarloGavazziEm300.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,70 +1,13 @@
package io.openems.edge.meter.carlo.gavazzi.em300;

import org.osgi.service.cm.ConfigurationAdmin;
import org.osgi.service.component.ComponentContext;
import org.osgi.service.component.annotations.Activate;
import org.osgi.service.component.annotations.Component;
import org.osgi.service.component.annotations.ConfigurationPolicy;
import org.osgi.service.component.annotations.Deactivate;
import org.osgi.service.component.annotations.Reference;
import org.osgi.service.component.annotations.ReferenceCardinality;
import org.osgi.service.component.annotations.ReferencePolicy;
import org.osgi.service.component.annotations.ReferencePolicyOption;
import org.osgi.service.metatype.annotations.Designate;

import io.openems.common.channel.Unit;
import io.openems.common.types.OpenemsType;
import io.openems.edge.bridge.modbus.api.AbstractOpenemsModbusComponent;
import io.openems.edge.bridge.modbus.api.BridgeModbus;
import io.openems.edge.bridge.modbus.api.ElementToChannelConverter;
import io.openems.edge.bridge.modbus.api.ModbusProtocol;
import io.openems.edge.bridge.modbus.api.element.DummyRegisterElement;
import io.openems.edge.bridge.modbus.api.element.SignedDoublewordElement;
import io.openems.edge.bridge.modbus.api.element.WordOrder;
import io.openems.edge.bridge.modbus.api.task.FC4ReadInputRegistersTask;
import io.openems.edge.common.channel.Doc;
import io.openems.edge.common.component.OpenemsComponent;
import io.openems.edge.common.taskmanager.Priority;
import io.openems.edge.meter.api.AsymmetricMeter;
import io.openems.edge.meter.api.MeterType;
import io.openems.edge.meter.api.SymmetricMeter;

@Designate(ocd = Config.class, factory = true)
@Component(name = "Meter.CarloGavazzi.EM300", immediate = true, configurationPolicy = ConfigurationPolicy.REQUIRE)
public class MeterCarloGavazziEm300 extends AbstractOpenemsModbusComponent
implements SymmetricMeter, AsymmetricMeter, OpenemsComponent {

private MeterType meterType = MeterType.PRODUCTION;

@Reference
protected ConfigurationAdmin cm;

public MeterCarloGavazziEm300() {
super(//
OpenemsComponent.ChannelId.values(), //
SymmetricMeter.ChannelId.values(), //
AsymmetricMeter.ChannelId.values(), //
ChannelId.values() //
);
}

@Reference(policy = ReferencePolicy.STATIC, policyOption = ReferencePolicyOption.GREEDY, cardinality = ReferenceCardinality.MANDATORY)
protected void setModbus(BridgeModbus modbus) {
super.setModbus(modbus);
}

@Activate
void activate(ComponentContext context, Config config) {
this.meterType = config.type();

super.activate(context, config.id(), config.alias(), config.enabled(), config.modbusUnitId(), this.cm, "Modbus",
config.modbus_id());
}

@Deactivate
protected void deactivate() {
super.deactivate();
}
public interface MeterCarloGavazziEm300 extends SymmetricMeter, AsymmetricMeter, OpenemsComponent {

public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
APPARENT_POWER_L1(Doc.of(OpenemsType.INTEGER) //
Expand All @@ -75,10 +18,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
.unit(Unit.VOLT_AMPERE)), //
APPARENT_POWER(Doc.of(OpenemsType.INTEGER) //
.unit(Unit.VOLT_AMPERE)), //
REACTIVE_ENERGY_POSITIVE(Doc.of(OpenemsType.INTEGER) //
.unit(Unit.KILOWATT_HOURS)), //
REACTIVE_ENERGY_NEGATIVE(Doc.of(OpenemsType.INTEGER) //
.unit(Unit.KILOWATT_HOURS));
;

private final Doc doc;

Expand All @@ -90,97 +30,4 @@ public Doc doc() {
return this.doc;
}
}

@Override
public MeterType getMeterType() {
return this.meterType;
}

@Override
protected ModbusProtocol defineModbusProtocol() {
final int OFFSET = 300000 + 1;
/**
* See Modbus definition PDF-file in doc directory and
* https://www.galoz.co.il/wp-content/uploads/2014/11/EM341-Modbus.pdf
*/
return new ModbusProtocol(this, //
new FC4ReadInputRegistersTask(300001 - OFFSET, Priority.LOW, //
m(AsymmetricMeter.ChannelId.VOLTAGE_L1,
new SignedDoublewordElement(300001 - OFFSET).wordOrder(WordOrder.LSWMSW),
ElementToChannelConverter.SCALE_FACTOR_2),
m(AsymmetricMeter.ChannelId.VOLTAGE_L2,
new SignedDoublewordElement(300003 - OFFSET).wordOrder(WordOrder.LSWMSW),
ElementToChannelConverter.SCALE_FACTOR_2),
m(AsymmetricMeter.ChannelId.VOLTAGE_L3,
new SignedDoublewordElement(300005 - OFFSET).wordOrder(WordOrder.LSWMSW),
ElementToChannelConverter.SCALE_FACTOR_2)),
new FC4ReadInputRegistersTask(300013 - OFFSET, Priority.HIGH, //
m(AsymmetricMeter.ChannelId.CURRENT_L1,
new SignedDoublewordElement(300013 - OFFSET).wordOrder(WordOrder.LSWMSW),
ElementToChannelConverter.SCALE_FACTOR_2),
m(AsymmetricMeter.ChannelId.CURRENT_L2,
new SignedDoublewordElement(300015 - OFFSET).wordOrder(WordOrder.LSWMSW),
ElementToChannelConverter.SCALE_FACTOR_2),
m(AsymmetricMeter.ChannelId.CURRENT_L3,
new SignedDoublewordElement(300017 - OFFSET).wordOrder(WordOrder.LSWMSW),
ElementToChannelConverter.SCALE_FACTOR_2),
m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L1,
new SignedDoublewordElement(300019 - OFFSET).wordOrder(WordOrder.LSWMSW),
ElementToChannelConverter.SCALE_FACTOR_MINUS_1),
m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L2,
new SignedDoublewordElement(300021 - OFFSET).wordOrder(WordOrder.LSWMSW),
ElementToChannelConverter.SCALE_FACTOR_MINUS_1),
m(AsymmetricMeter.ChannelId.ACTIVE_POWER_L3,
new SignedDoublewordElement(300023 - OFFSET).wordOrder(WordOrder.LSWMSW),
ElementToChannelConverter.SCALE_FACTOR_MINUS_1),
m(MeterCarloGavazziEm300.ChannelId.APPARENT_POWER_L1,
new SignedDoublewordElement(300025 - OFFSET).wordOrder(WordOrder.LSWMSW),
ElementToChannelConverter.SCALE_FACTOR_MINUS_1),
m(MeterCarloGavazziEm300.ChannelId.APPARENT_POWER_L2,
new SignedDoublewordElement(300027 - OFFSET).wordOrder(WordOrder.LSWMSW),
ElementToChannelConverter.SCALE_FACTOR_MINUS_1),
m(MeterCarloGavazziEm300.ChannelId.APPARENT_POWER_L3,
new SignedDoublewordElement(300029 - OFFSET).wordOrder(WordOrder.LSWMSW),
ElementToChannelConverter.SCALE_FACTOR_MINUS_1),
m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L1,
new SignedDoublewordElement(300031 - OFFSET).wordOrder(WordOrder.LSWMSW),
ElementToChannelConverter.SCALE_FACTOR_MINUS_1),
m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L2,
new SignedDoublewordElement(300033 - OFFSET).wordOrder(WordOrder.LSWMSW),
ElementToChannelConverter.SCALE_FACTOR_MINUS_1),
m(AsymmetricMeter.ChannelId.REACTIVE_POWER_L3,
new SignedDoublewordElement(300035 - OFFSET).wordOrder(WordOrder.LSWMSW),
ElementToChannelConverter.SCALE_FACTOR_MINUS_1),
new DummyRegisterElement(300037 - OFFSET, 300040 - OFFSET), //
m(SymmetricMeter.ChannelId.ACTIVE_POWER,
new SignedDoublewordElement(300041 - OFFSET).wordOrder(WordOrder.LSWMSW),
ElementToChannelConverter.SCALE_FACTOR_MINUS_1),
m(MeterCarloGavazziEm300.ChannelId.APPARENT_POWER,
new SignedDoublewordElement(300043 - OFFSET).wordOrder(WordOrder.LSWMSW),
ElementToChannelConverter.SCALE_FACTOR_MINUS_1),
m(SymmetricMeter.ChannelId.REACTIVE_POWER,
new SignedDoublewordElement(300045 - OFFSET).wordOrder(WordOrder.LSWMSW),
ElementToChannelConverter.SCALE_FACTOR_MINUS_1)));
// new FC4ReadInputRegistersTask(300052 - OFFSET, Priority.LOW, //
// m(MeterCarloGavazziEm300.ChannelId.FREQUENCY, new SignedWordElement(300052 - OFFSET),
// ElementToChannelConverter.SCALE_FACTOR_2),
// m(MeterCarloGavazziEm300.ChannelId.ACTIVE_ENERGY_POSITIVE,
// new UnsignedDoublewordElement(300053 - OFFSET),
// ElementToChannelConverter.SCALE_FACTOR_1),
// m(MeterCarloGavazziEm300.ChannelId.REACTIVE_ENERGY_POSITIVE,
// new UnsignedDoublewordElement(300055 - OFFSET),
// ElementToChannelConverter.SCALE_FACTOR_1)),
// new FC4ReadInputRegistersTask(300079 - OFFSET, Priority.LOW, //
// m(MeterCarloGavazziEm300.ChannelId.ACTIVE_ENERGY_NEGATIVE,
// new UnsignedDoublewordElement(300079 - OFFSET),
// ElementToChannelConverter.SCALE_FACTOR_1),
// m(MeterCarloGavazziEm300.ChannelId.REACTIVE_ENERGY_NEGATIVE,
// new UnsignedDoublewordElement(300081 - OFFSET),
// ElementToChannelConverter.SCALE_FACTOR_1)));
}

@Override
public String debugLog() {
return "L:" + this.getActivePower().value().asString();
}
}
Loading