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

Fix more various source and comment typos #1317

Merged
merged 1 commit into from
Dec 13, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@
* <P>
* Setting the latch on the DS2409 to 'on' (see
* {@link #setLatchState(int,boolean,boolean,byte[]) seLatchState}) connects the
* channel [Main(0) or Auxillary(1)] to the 1-Wire data line. Note that this is
* channel [Main(0) or Auxiliary(1)] to the 1-Wire data line. Note that this is
* the opposite of the {@link com.dalsemi.onewire.container.OneWireContainer12
* DS2406} and {@link com.dalsemi.onewire.container.OneWireContainer05 DS2405}
* which connect their I/O lines to ground.
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ public int applyRampFilter(int input, int target) throws OpenemsException {
// Make sure that there is a highLimit set
if (this.highLimit == null) {
throw new OpenemsException(
"No high limit given in EvcsFilter. Please call setLimits bevore applying the filter.");
"No high limit given in EvcsFilter. Please call setLimits before applying the filter.");
}

// We are already there
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -255,7 +255,7 @@ public void run() throws OpenemsNamedException {
}

/**
* Reseting the minimum and maximum power channels.
* Resetting the minimum and maximum power channels.
*/
private void resetMinMaxChannels() {
evcs._setMinimumPower(0);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ public enum ChannelId implements io.openems.edge.common.channel.ChannelId {
MAXIMUM_AVAILABLE_GRID_POWER(Doc.of(OpenemsType.INTEGER) //
.unit(Unit.WATT).text("Maximum available grid power.")),
USED_ESS_MAXIMUM_DISCHARGE_POWER(Doc.of(OpenemsType.INTEGER) //
.unit(Unit.WATT).text("Dynamic maximum discharge power, that could be limited by us to ensure the possibillity to discharge the battery."));
.unit(Unit.WATT).text("Dynamic maximum discharge power, that could be limited by us to ensure the possibility to discharge the battery."));

private final Doc doc;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ public enum KebaChannelId implements io.openems.edge.common.channel.ChannelId {
.text("A static ip is configured. The Dip-Switch 2.6. must be on")), //
DIP_SWITCH_ERROR_2_6_SET_FOR_DYNAMIC_IP(Doc.of(Level.FAULT) //
.debounce(5, Debounce.TRUE_VALUES_IN_A_ROW_TO_SET_TRUE) //
.text("A dynamic ip is configured. Ether the Dip-Switch 2.6. must be off or a static ip has to be configured")), //
.text("A dynamic ip is configured. Either the Dip-Switch 2.6. must be off or a static ip has to be configured")), //
DIP_SWITCH_INFO_2_5_SET_FOR_MASTER_SLAVE_COMM(Doc.of(Level.INFO) //
.debounce(5, Debounce.TRUE_VALUES_IN_A_ROW_TO_SET_TRUE) //
.text("Master-Slave communication is configured. If this is a normal KEBA that should be not controlled by a KEBA x-series, Dip-Switch 2.5. should be off")), //
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -155,7 +155,7 @@ protected ModbusProtocol defineModbusProtocol() throws OpenemsException {
break;
}
}
// Log on first occurance
// Log on first occurrence
if (result != this.getGoodweType()) {
switch (result) {
case GOODWE_10K_BT:
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@ void activate(ComponentContext context, Config config) throws OpenemsException {
}

@Deactivate
protected void deativate() {
protected void deactivate() {
super.deactivate();
}

Expand Down
26 changes: 13 additions & 13 deletions io.openems.edge.meter.socomec/doc/MODBUS tables of Countis_E14.html
Original file line number Diff line number Diff line change
Expand Up @@ -1239,31 +1239,31 @@ <h2 align="left">Metrology No Affected by current and voltage transformers</h2>
<td>51311</td>
<td><text>0x</text>C86F</td>
<td align="center">1</td>
<td align="left">Total Positive Active Energy (no resetable) : Ea+</td>
<td align="left">Total Positive Active Energy (not resettable) : Ea+</td>
<td align="center">Wh<text> / </text>1E-06</td>
<td align="center">U16</td>
</tr>
<tr>
<td>51312</td>
<td><text>0x</text>C870</td>
<td align="center">1</td>
<td align="left">Total Positive Reactive Energy (no resetable) : Er +</td>
<td align="left">Total Positive Reactive Energy (not resettable) : Er +</td>
<td align="center">varh<text> / </text>1E-06</td>
<td align="center">U16</td>
</tr>
<tr>
<td>51313</td>
<td><text>0x</text>C871</td>
<td align="center">1</td>
<td align="left">Total Negative Active Energy (no resetable) : Ea-</td>
<td align="left">Total Negative Active Energy (not resettable) : Ea-</td>
<td align="center">Wh<text> / </text>1E-06</td>
<td align="center">U16</td>
</tr>
<tr>
<td>51314</td>
<td><text>0x</text>C872</td>
<td align="center">1</td>
<td align="left">Total Negative Reactive Energy (no resetable) : Er -</td>
<td align="left">Total Negative Reactive Energy (not resettable) : Er -</td>
<td align="center">varh<text> / </text>1E-06</td>
<td align="center">U16</td>
</tr>
Expand Down Expand Up @@ -1317,39 +1317,39 @@ <h2 align="left">Energies</h2><br></caption>
<td>50770</td>
<td><text>0x</text>C652</td>
<td align="center">2</td>
<td align="left">Total Positive Active Energy (no resetable) : Ea+</td>
<td align="left">Total Positive Active Energy (not resettable) : Ea+</td>
<td align="center">Wh<text> / </text>0.001</td>
<td align="center">U32</td>
</tr>
<tr>
<td>50772</td>
<td><text>0x</text>C654</td>
<td align="center">2</td>
<td align="left">Total Positive Reactive Energy (no resetable) : Er +</td>
<td align="left">Total Positive Reactive Energy (not resettable) : Er +</td>
<td align="center">varh<text> / </text>0.001</td>
<td align="center">U32</td>
</tr>
<tr>
<td>50774</td>
<td><text>0x</text>C656</td>
<td align="center">2</td>
<td align="left">Total Apparent Energy (no resetable) : Eap</td>
<td align="left">Total Apparent Energy (not resettable) : Eap</td>
<td align="center">VAh<text> / </text>0.001</td>
<td align="center">U32</td>
</tr>
<tr>
<td>50776</td>
<td><text>0x</text>C658</td>
<td align="center">2</td>
<td align="left">Total Negative Active Energy (no resetable) : Ea-</td>
<td align="left">Total Negative Active Energy (not resettable) : Ea-</td>
<td align="center">Wh<text> / </text>0.001</td>
<td align="center">U32</td>
</tr>
<tr>
<td>50778</td>
<td><text>0x</text>C65A</td>
<td align="center">2</td>
<td align="left">Total Negative Reactive Energy (no resetable) : Er -</td>
<td align="left">Total Negative Reactive Energy (not resettable) : Er -</td>
<td align="center">varh<text> / </text>0.001</td>
<td align="center">U32</td>
</tr>
Expand Down Expand Up @@ -1627,15 +1627,15 @@ <h2 align="left">Energies in Unit/100</h2><br></caption>
<td>50946</td>
<td><text>0x</text>C702</td>
<td align="center">2</td>
<td align="left">Total Positive Active Energy (no resetable) : Ea+</td>
<td align="left">Total Positive Active Energy (not resettable) : Ea+</td>
<td align="center">Wh<text> / </text>0.1</td>
<td align="center">U32</td>
</tr>
<tr>
<td>50948</td>
<td><text>0x</text>C704</td>
<td align="center">2</td>
<td align="left">Total Positive Reactive Energy (no resetable) : Er +</td>
<td align="left">Total Positive Reactive Energy (not resettable) : Er +</td>
<td align="center">varh<text> / </text>0.1</td>
<td align="center">U32</td>
</tr>
Expand All @@ -1651,15 +1651,15 @@ <h2 align="left">Energies in Unit/100</h2><br></caption>
<td>50952</td>
<td><text>0x</text>C708</td>
<td align="center">2</td>
<td align="left">Total Negative Active Energy (no resetable) : Ea-</td>
<td align="left">Total Negative Active Energy (not resettable) : Ea-</td>
<td align="center">Wh<text> / </text>0.1</td>
<td align="center">U32</td>
</tr>
<tr>
<td>50954</td>
<td><text>0x</text>C70A</td>
<td align="center">2</td>
<td align="left">Total Negative Reactive Energy (no resetable) : Er -</td>
<td align="left">Total Negative Reactive Energy (not resettable) : Er -</td>
<td align="center">varh<text> / </text>0.1</td>
<td align="center">U32</td>
</tr>
Expand Down
28 changes: 14 additions & 14 deletions io.openems.edge.meter.socomec/doc/MODBUS tables of Countis_E23.html
Original file line number Diff line number Diff line change
Expand Up @@ -1239,31 +1239,31 @@ <h2 align="left">Metrology No Affected by current and voltage transformers</h2>
<td>51311</td>
<td><text>0x</text>C86F</td>
<td align="center">1</td>
<td align="left">Total Positive Active Energy (no resetable) : Ea+</td>
<td align="left">Total Positive Active Energy (not resettable) : Ea+</td>
<td align="center">Wh<text> / </text>1E-06</td>
<td align="center">U16</td>
</tr>
<tr>
<td>51312</td>
<td><text>0x</text>C870</td>
<td align="center">1</td>
<td align="left">Total Positive Reactive Energy (no resetable) : Er +</td>
<td align="left">Total Positive Reactive Energy (not resettable) : Er +</td>
<td align="center">varh<text> / </text>1E-06</td>
<td align="center">U16</td>
</tr>
<tr>
<td>51313</td>
<td><text>0x</text>C871</td>
<td align="center">1</td>
<td align="left">Total Negative Active Energy (no resetable) : Ea-</td>
<td align="left">Total Negative Active Energy (not resettable) : Ea-</td>
<td align="center">Wh<text> / </text>1E-06</td>
<td align="center">U16</td>
</tr>
<tr>
<td>51314</td>
<td><text>0x</text>C872</td>
<td align="center">1</td>
<td align="left">Total Negative Reactive Energy (no resetable) : Er -</td>
<td align="left">Total Negative Reactive Energy (not resettable) : Er -</td>
<td align="center">varh<text> / </text>1E-06</td>
<td align="center">U16</td>
</tr>
Expand Down Expand Up @@ -1317,39 +1317,39 @@ <h2 align="left">Energies</h2><br></caption>
<td>50770</td>
<td><text>0x</text>C652</td>
<td align="center">2</td>
<td align="left">Total Positive Active Energy (no resetable) : Ea+</td>
<td align="left">Total Positive Active Energy (not resettable) : Ea+</td>
<td align="center">Wh<text> / </text>0.001</td>
<td align="center">U32</td>
</tr>
<tr>
<td>50772</td>
<td><text>0x</text>C654</td>
<td align="center">2</td>
<td align="left">Total Positive Reactive Energy (no resetable) : Er +</td>
<td align="left">Total Positive Reactive Energy (not resettable) : Er +</td>
<td align="center">varh<text> / </text>0.001</td>
<td align="center">U32</td>
</tr>
<tr>
<td>50774</td>
<td><text>0x</text>C656</td>
<td align="center">2</td>
<td align="left">Total Apparent Energy (no resetable) : Eap</td>
<td align="left">Total Apparent Energy (not resettable) : Eap</td>
<td align="center">VAh<text> / </text>0.001</td>
<td align="center">U32</td>
</tr>
<tr>
<td>50776</td>
<td><text>0x</text>C658</td>
<td align="center">2</td>
<td align="left">Total Negative Active Energy (no resetable) : Ea-</td>
<td align="left">Total Negative Active Energy (not resettable) : Ea-</td>
<td align="center">Wh<text> / </text>0.001</td>
<td align="center">U32</td>
</tr>
<tr>
<td>50778</td>
<td><text>0x</text>C65A</td>
<td align="center">2</td>
<td align="left">Total Negative Reactive Energy (no resetable) : Er -</td>
<td align="left">Total Negative Reactive Energy (not resettable) : Er -</td>
<td align="center">varh<text> / </text>0.001</td>
<td align="center">U32</td>
</tr>
Expand Down Expand Up @@ -1627,39 +1627,39 @@ <h2 align="left">Energies in Unit/100</h2><br></caption>
<td>50946</td>
<td><text>0x</text>C702</td>
<td align="center">2</td>
<td align="left">Total Positive Active Energy (no resetable) : Ea+</td>
<td align="left">Total Positive Active Energy (not resettable) : Ea+</td>
<td align="center">Wh<text> / </text>0.1</td>
<td align="center">U32</td>
</tr>
<tr>
<td>50948</td>
<td><text>0x</text>C704</td>
<td align="center">2</td>
<td align="left">Total Positive Reactive Energy (no resetable) : Er +</td>
<td align="left">Total Positive Reactive Energy (not resettable) : Er +</td>
<td align="center">varh<text> / </text>0.1</td>
<td align="center">U32</td>
</tr>
<tr>
<td>50950</td>
<td><text>0x</text>C706</td>
<td align="center">2</td>
<td align="left">Total Apparent Energy (no resetable) : Eap</td>
<td align="left">Total Apparent Energy (not resettable) : Eap</td>
<td align="center">VAh<text> / </text>0.1</td>
<td align="center">U32</td>
</tr>
<tr>
<td>50952</td>
<td><text>0x</text>C708</td>
<td align="center">2</td>
<td align="left">Total Negative Active Energy (no resetable) : Ea-</td>
<td align="left">Total Negative Active Energy (not resettable) : Ea-</td>
<td align="center">Wh<text> / </text>0.1</td>
<td align="center">U32</td>
</tr>
<tr>
<td>50954</td>
<td><text>0x</text>C70A</td>
<td align="center">2</td>
<td align="left">Total Negative Reactive Energy (no resetable) : Er -</td>
<td align="left">Total Negative Reactive Energy (not resettable) : Er -</td>
<td align="center">varh<text> / </text>0.1</td>
<td align="center">U32</td>
</tr>
Expand Down
Loading