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

working on autorouting and turnout code

Browse Source
This commit is contained in:
Stephan Richter
2020-10-20 01:32:16 +02:00
parent 6acbb9769b
commit f5dbb0916a
10 changed files with 111 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -24,9 +24,10 @@ public abstract class Turnout extends Tile implements Device{
private Protocol protocol = Protocol.DCC128;
protected int address = 0;
protected int portA = 0, portB = 0;
protected int portA = 0, portB = 1;
protected int delay = 400;
protected boolean initialized;
protected boolean initialized = false;
protected boolean error = false;
public enum State{
LEFT,STRAIGHT,RIGHT,UNDEF;
@@ -36,11 +37,21 @@ public abstract class Turnout extends Tile implements Device{
@Override
public Object click() throws IOException {
LOG.debug("Turnout.click()");
LOG.debug(getClass().getSimpleName()+".click()");
init();
return super.click();
}
public void error(Reply reply) {
this.error = true;
try {
plan.stream(tag(null).toString());
} catch (IOException e) {
LOG.error("Was not able to stream: ",e);
}
throw new RuntimeException(reply.message());
}
protected void init() {
if (!initialized) {
plan.queue("INIT {} GA "+address+" "+proto());
@@ -52,7 +63,7 @@ public abstract class Turnout extends Tile implements Device{
public JSONObject json() {
JSONObject json = super.json();
if (portA != 0) json.put(PORT_A, portA);
if (portB != 0) json.put(PORT_B, portB);
if (portB != 1) json.put(PORT_B, portB);
if (address != 0) json.put(ADDRESS, address);
json.put(PROTOCOL, protocol);
return json;
@@ -101,14 +112,28 @@ public abstract class Turnout extends Tile implements Device{
}
public abstract CompletableFuture<Reply> state(State newState) throws IOException;
public void success() {
this.error = false;
try {
plan.stream(tag(null).toString());
} catch (IOException e) {
throw new RuntimeException(e);
}
}
@Override
public Tag tag(Map<String, Object> replacements) throws IOException {
Tag tag = super.tag(replacements);
tag.clazz(tag.get("class")+(" "+state).toLowerCase());
tag.clazz(tag.get("class")+(" "+state).toLowerCase()+(error?" error":""));
return tag;
}
@Override
public String title() {
return getClass().getSimpleName()+t("(Address: {}, Ports {} and {})",address,portA,portB);
}
public void toggle() {
state = State.STRAIGHT;
}