diff --git a/pom.xml b/pom.xml
index 0d4a543..cb041d8 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
4.0.0
de.srsoftware
web4rail
- 1.3.1
+ 1.3.2
Web4Rail
jar
Java Model Railway Control
diff --git a/resources/css/style.css b/resources/css/style.css
index 5afb953..58ff6ce 100644
--- a/resources/css/style.css
+++ b/resources/css/style.css
@@ -194,10 +194,11 @@ h2{
.signal.red .sig_a{
fill: red;
}
+.signal.HL2 .sig_a,
.signal.green .sig_a{
fill: lime;
}
-.signal.HL2 .sig_a{
+.signal.HL2 .sig_b{
fill: yellow;
}
diff --git a/resources/svg/SignalE.svg b/resources/svg/SignalE.svg
index 490188b..756b671 100644
--- a/resources/svg/SignalE.svg
+++ b/resources/svg/SignalE.svg
@@ -1,7 +1,7 @@
\ No newline at end of file
diff --git a/resources/svg/SignalN.svg b/resources/svg/SignalN.svg
index dc0c620..2a70b16 100644
--- a/resources/svg/SignalN.svg
+++ b/resources/svg/SignalN.svg
@@ -1,7 +1,7 @@
\ No newline at end of file
diff --git a/resources/svg/SignalS.svg b/resources/svg/SignalS.svg
index f9796ff..81584bb 100644
--- a/resources/svg/SignalS.svg
+++ b/resources/svg/SignalS.svg
@@ -1,7 +1,7 @@
\ No newline at end of file
diff --git a/resources/svg/SignalW.svg b/resources/svg/SignalW.svg
index 53e18c2..c53df39 100644
--- a/resources/svg/SignalW.svg
+++ b/resources/svg/SignalW.svg
@@ -1,7 +1,7 @@
\ No newline at end of file
diff --git a/src/main/java/de/srsoftware/web4rail/tiles/Signal.java b/src/main/java/de/srsoftware/web4rail/tiles/Signal.java
index c41e5b8..a86c433 100644
--- a/src/main/java/de/srsoftware/web4rail/tiles/Signal.java
+++ b/src/main/java/de/srsoftware/web4rail/tiles/Signal.java
@@ -6,16 +6,17 @@ import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Map.Entry;
+import java.util.TreeSet;
+import java.util.Vector;
+import java.util.concurrent.TimeoutException;
import org.json.JSONArray;
import org.json.JSONObject;
-import java.util.TreeSet;
-import java.util.Vector;
-
import de.srsoftware.tools.Tag;
import de.srsoftware.web4rail.Command;
import de.srsoftware.web4rail.Plan.Direction;
+import de.srsoftware.web4rail.Protocol;
import de.srsoftware.web4rail.Window;
import de.srsoftware.web4rail.tags.Button;
import de.srsoftware.web4rail.tags.Checkbox;
@@ -30,10 +31,12 @@ public abstract class Signal extends Tile {
public static final String GREEN = "green";
public static final TreeSet knownStates = new TreeSet(List.of(RED, GREEN));
private final HashMap> aspects = new HashMap>();
+ private final HashSet initialized = new HashSet();
private static final String ADDRESS = "addr";
private static final String HOLD = "hold";
private static final String NEW_ASPECT = "new_aspect";
private static final String ASPECTS = "aspects";
+ private Protocol protocol = Protocol.DCC128;
private String state = RED;
@@ -100,6 +103,22 @@ public abstract class Signal extends Tile {
return super.load(json);
}
+ 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';
+ }
+ }
+
@Override
protected Window properties(List