StephanRichter/Web4Rail
1
0
Fork 0
Code Issues Pull Requests Actions Projects Releases Wiki Activity

Implemented Turnout-Commands, added logging config

Browse Source
This commit is contained in:
Stephan Richter
2020-10-02 13:20:22 +02:00
parent 0fcc2adf4d
commit 2c5fcb09f1
16 changed files with 288 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/de/srsoftware/web4rail/tiles/Tile.java
View File

@@ -78,6 +78,7 @@ public abstract class Tile {
}
public Object click() throws IOException {
LOG.debug("Tile.click()");
return propMenu();
}

124
src/main/java/de/srsoftware/web4rail/tiles/Turnout.java
View File

@@ -1,27 +1,126 @@
package de.srsoftware.web4rail.tiles;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
import de.srsoftware.tools.Tag;
import org.json.JSONObject;
public abstract class Turnout extends Tile {
import de.srsoftware.tools.Tag;
import de.srsoftware.web4rail.Device;
import de.srsoftware.web4rail.Protocol;
import de.srsoftware.web4rail.tags.Fieldset;
import de.srsoftware.web4rail.tags.Input;
import de.srsoftware.web4rail.tags.Label;
import de.srsoftware.web4rail.tags.Radio;
public abstract class Turnout extends Tile implements Device{
public static final String STATE = "state";
private static final String PORT_A = "port_a";
private static final String PORT_B = "port_b";
protected static final String STRAIGHT = "straight";
private Protocol protocol = Protocol.DCC128;
protected int address = 0;
protected int portA = 0, portB = 0;
protected int delay = 400;
protected boolean initialized;
public enum State{
LEFT,STRAIGHT,RIGHT,UNDEF;
}
protected State state = State.STRAIGHT;
@Override
public Object click() throws IOException {
LOG.debug("Turnout.click()");
Object o = super.click();
if (address != 0 && !initialized) {
String p = null;
switch (protocol) {
case DCC14:
case DCC27:
case DCC28:
case DCC128:
p = "N";
break;
case MOTO:
p = "M";
break;
case SELECTRIX:
p = "S";
break;
default:
p = "P";
}
plan.queue("INIT {} GA "+address+" "+p);
initialized = true;
}
return o;
}
protected void init() {
if (!initialized) {
plan.queue("INIT {} GA "+address+" "+proto());
initialized = true;
}
}
@Override
public JSONObject json() {
JSONObject json = super.json();
if (portA != 0) json.put(PORT_A, portA);
if (portB != 0) json.put(PORT_B, portB);
if (address != 0) json.put(ADDRESS, address);
json.put(PROTOCOL, protocol);
return json;
}
@Override
protected Tile load(JSONObject json) throws IOException {
if (json.has(ADDRESS)) address = json.getInt(ADDRESS);
if (json.has(PORT_A)) portA = json.getInt(PORT_A);
if (json.has(PORT_B)) portB = json.getInt(PORT_B);
if (json.has(PROTOCOL)) protocol = Protocol.valueOf(json.getString(PROTOCOL));
return super.load(json);
}
@Override
public Tag propForm() {
Tag form = super.propForm();
Fieldset fieldset = new Fieldset(t("Decoder settings"));
Label protocol = new Label(t("Protocol:"));
for (Protocol proto : Protocol.values()) {
new Radio(PROTOCOL, proto.toString(), t(proto.toString()), proto == this.protocol).addTo(protocol);
}
protocol.addTo(fieldset).addTo(form);
new Input(ADDRESS, address).numeric().addTo(new Label(t("Address"))).addTo(fieldset);
return form;
}
private char proto() {
switch (protocol) {
case DCC14:
case DCC27:
case DCC28:
case DCC128:
return 'N';
case MOTO:
return 'M';
case SELECTRIX:
return 'S';
default:
return 'P';
}
}
public State state() {
return state;
}
public void state(State newState) throws IOException {
state = newState;
LOG.debug("Setting {} to {}",this,state);
plan.stream("place "+tag(null));
}
public abstract void state(State newState) throws IOException;
@Override
public Tag tag(Map<String, Object> replacements) throws IOException {
Tag tag = super.tag(replacements);
@@ -32,4 +131,13 @@ public abstract class Turnout extends Tile {
public void toggle() {
state = State.STRAIGHT;
}
@Override
public Tile update(HashMap<String, String> params) throws IOException {
if (params.containsKey(PROTOCOL)) protocol = Protocol.valueOf(params.get(PROTOCOL));
if (params.containsKey(ADDRESS)) address = Integer.parseInt(params.get(ADDRESS));
if (params.containsKey(PORT_A)) portA = Integer.parseInt(params.get(PORT_A));
if (params.containsKey(PORT_B)) portB = Integer.parseInt(params.get(PORT_B));
return super.update(params);
}
}

7
src/main/java/de/srsoftware/web4rail/tiles/Turnout3E.java
View File

@@ -1,5 +1,6 @@
package de.srsoftware.web4rail.tiles;
import java.io.IOException;
import java.util.HashMap;
import java.util.Map;
@@ -26,4 +27,10 @@ public class Turnout3E extends Turnout{
return new HashMap<>();
}
}
@Override
public void state(State newState) throws IOException {
// TODO Auto-generated method stub
LOG.warn("Turnout3E.state({}) not implemented, yet!",newState);
}
}

57
src/main/java/de/srsoftware/web4rail/tiles/TurnoutL.java
View File

@@ -1,16 +1,65 @@
package de.srsoftware.web4rail.tiles;
import java.io.IOException;
import java.util.HashMap;
import de.srsoftware.tools.Tag;
import de.srsoftware.web4rail.tags.Fieldset;
import de.srsoftware.web4rail.tags.Input;
import de.srsoftware.web4rail.tags.Label;
public class TurnoutL extends Turnout {
private static final String LEFT = "left";
@Override
public Object click() throws IOException {
LOG.debug("TurnoutL.click()");
Object o = super.click();
if (route != null) {
plan.stream(t("{} is locked by {}!",this,route));
} else {
state = (state == State.STRAIGHT) ? State.LEFT : State.STRAIGHT;
plan.stream("place "+tag(null));
} else state(state == State.STRAIGHT ? State.LEFT : State.STRAIGHT);
return o;
}
@Override
public Tag propForm() {
Tag form = super.propForm();
Tag fieldset = null;
for (Tag child : form.children()) {
if (child.is(Fieldset.TYPE)) {
fieldset = child;
break;
}
}
return propMenu();
new Input(STRAIGHT, portA).numeric().addTo(new Label(t("Straight port"))).addTo(fieldset);
new Input(LEFT, portB).numeric().addTo(new Label(t("Left port"))).addTo(fieldset);
return form;
}
@Override
public Tile update(HashMap<String, String> params) throws IOException {
if (params.containsKey(STRAIGHT)) portA = Integer.parseInt(params.get(STRAIGHT));
if (params.containsKey(LEFT)) portB = Integer.parseInt(params.get(LEFT));
return super.update(params);
}
@Override
public void state(State newState) throws IOException {
init();
LOG.debug("Setting {} to {}",this,newState);
int p = 0;
switch (newState) {
case LEFT:
p = portB;
break;
case STRAIGHT:
p = portA;
break;
default:
}
if (p != 0) plan.queue("SET {} GA "+address+" "+p+" 1 "+delay);
state = newState;
plan.stream("place "+tag(null));
}
}

57
src/main/java/de/srsoftware/web4rail/tiles/TurnoutR.java
View File

@@ -1,16 +1,65 @@
package de.srsoftware.web4rail.tiles;
import java.io.IOException;
import java.util.HashMap;
import de.srsoftware.tools.Tag;
import de.srsoftware.web4rail.tags.Fieldset;
import de.srsoftware.web4rail.tags.Input;
import de.srsoftware.web4rail.tags.Label;
public class TurnoutR extends Turnout {
private static final String RIGHT = "right";
@Override
public Object click() throws IOException {
LOG.debug("Turnoutr.click()");
Object o = super.click();
if (route != null) {
plan.stream(t("{} is locked by {}!",this,route));
} else {
state = (state == State.STRAIGHT) ? State.RIGHT : State.STRAIGHT;
plan.stream("place "+tag(null));
} else state(state == State.STRAIGHT ? State.RIGHT : State.STRAIGHT);
return o;
}
@Override
public Tag propForm() {
Tag form = super.propForm();
Tag fieldset = null;
for (Tag child : form.children()) {
if (child.is(Fieldset.TYPE)) {
fieldset = child;
break;
}
}
return propMenu();
new Input(STRAIGHT, portA).addTo(new Label(t("Straight port"))).addTo(fieldset);
new Input(RIGHT, portB).addTo(new Label(t("Right port"))).addTo(fieldset);
return form;
}
@Override
public Tile update(HashMap<String, String> params) throws IOException {
if (params.containsKey(STRAIGHT)) portA = Integer.parseInt(params.get(STRAIGHT));
if (params.containsKey(RIGHT)) portB = Integer.parseInt(params.get(RIGHT));
return super.update(params);
}
@Override
public void state(State newState) throws IOException {
init();
LOG.debug("Setting {} to {}",this,newState);
int p = 0;
switch (newState) {
case RIGHT:
p = portB;
break;
case STRAIGHT:
p = portA;
break;
default:
}
if (p != 0) plan.queue("SET {} GA "+address+" "+p+" 1 "+delay);
state = newState;
plan.stream("place "+tag(null));
}
}