From 964eec3fce1e630d252e3c9e26f24e3b74a1b4aa Mon Sep 17 00:00:00 2001
From: Mike Dunston <michael.dunston@oracle.com>
Date: Fri, 8 Dec 2017 12:29:14 -0800
Subject: [PATCH 1/2] DCC++ ESP changes + cleanups

1) Removing unused ArrayList<Integer>
2) Adding support for named power districts and current draws.
3) Adding version parser for ESP32 based basestation.
---
 java/src/jmri/jmrix/dccpp/DCCppConstants.java |  3 +
 java/src/jmri/jmrix/dccpp/DCCppReply.java     | 61 +++++++++++++++----
 2 files changed, 52 insertions(+), 12 deletions(-)

diff --git a/java/src/jmri/jmrix/dccpp/DCCppConstants.java b/java/src/jmri/jmrix/dccpp/DCCppConstants.java
index c2e43e753d2..28733995045 100644
--- a/java/src/jmri/jmrix/dccpp/DCCppConstants.java
+++ b/java/src/jmri/jmrix/dccpp/DCCppConstants.java
@@ -135,7 +135,9 @@ public final class DCCppConstants {
     public final static String PROGRAM_REPLY_REGEX = "\\s*r\\s*(\\d+)\\|(\\d+)\\|(\\d+)\\s+([-]*\\d+)\\s*";
     public final static String PROGRAM_BIT_REPLY_REGEX = "\\s*r\\s*(\\d+)\\|(\\d+)\\|(\\d+)\\s+(\\d+)\\s+(\\d+)\\s*";
     public final static String CURRENT_REPLY_REGEX = "\\s*a\\s*(\\d+)";
+    public final static String CURRENT_REPLY_NAMED_REGEX = "\\s*a\\s*(\\w+)\\s*(\\d+)";
     public final static String TRACK_POWER_REPLY_REGEX = "\\s*p\\s*([0,1])\\s*";
+    public final static String TRACK_POWER_REPLY_NAMED_REGEX = "\\s*p\\s*(\\d+)\\s+(\\w+)\\s*";
     public final static String SENSOR_REPLY_REGEX = "\\s*[Qq]\\s*(\\d+)\\s*";
     public final static String SENSOR_DEF_REPLY_REGEX = "\\s*Q\\s*(\\d+)\\s+(\\d+)\\s+([0|1])\\s*";
     public final static String SENSOR_ACTIVE_REPLY_REGEX = "\\s*Q\\s*(\\d+)\\s*";
@@ -148,6 +150,7 @@ public final class DCCppConstants {
 //    public final static String STATUS_REPLY_REGEX = "i(DCC\\+\\+.*): BUILD (.*)"; // V1.0
 //    public final static String STATUS_REPLY_REGEX = "i(DCC\\+\\+[^:]*): BUILD (.*)"; // V1.0 / V1.1
     public final static String STATUS_REPLY_REGEX = "i(DCC\\+\\+[^:]*):(?:\\sBUILD)? (.*)"; // V1.0 / V1.1 / V1.2
+    public final static String STATUS_REPLY_ESP32_REGEX = "iDCC\\+\\+.*ESP32.*: V-([\\d\\.]+)\\s+/\\s+(.*)"; // V1.0
     //public final static String STATUS_REPLY_REGEX = "i(DCC\\+\\+\\s?.*):\\s?(?:BUILD)? (.*)"; // V1.0 / V1.1 / V1.2
     public final static String FREE_MEMORY_REPLY_REGEX = "\\s*f\\s*(\\d+)\\s*";
     public final static String WRITE_EEPROM_REPLY_REGEX = "\\s*e\\s*(\\d+)\\s+(\\d+)\\s+(\\d+)\\s*";
diff --git a/java/src/jmri/jmrix/dccpp/DCCppReply.java b/java/src/jmri/jmrix/dccpp/DCCppReply.java
index b8f4fad6513..920410bfa23 100644
--- a/java/src/jmri/jmrix/dccpp/DCCppReply.java
+++ b/java/src/jmri/jmrix/dccpp/DCCppReply.java
@@ -1,6 +1,5 @@
 package jmri.jmrix.dccpp;
 
-import java.util.ArrayList;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 import java.util.regex.PatternSyntaxException;
@@ -45,7 +44,6 @@
 
 public class DCCppReply extends jmri.jmrix.AbstractMRReply {
 
-    private ArrayList<Integer> valueList = new ArrayList<Integer>();
     protected String myRegex;
     protected StringBuilder myReply;
 
@@ -61,7 +59,6 @@ public DCCppReply() {
     public DCCppReply(DCCppReply reply) {
         super(reply);
         setBinary(false);
-        valueList = new ArrayList<Integer>(reply.valueList);
         myRegex = reply.myRegex;
         myReply = reply.myReply;
     }
@@ -70,11 +67,6 @@ public DCCppReply(DCCppReply reply) {
     public DCCppReply(String reply) {
         super();
         setBinary(false);
-        valueList = new ArrayList<Integer>();
-        //char charList[] = reply.toCharArray();
-        //for(int i=0;i<charList.length;i++){
-        //    valueList.add((int)charList[i]);
-        //}
         myRegex = "";
         myReply = new StringBuilder(reply);
         _nDataChars = toString().length();
@@ -163,8 +155,14 @@ public String toMonitorString(){
                 text += "\tBuild: " + getStatusBuildDateString();
                 break;
             case DCCppConstants.POWER_REPLY:
-                text = "Power Status: ";
-                text += ((char) (getElement(1) & 0x00FF) == '1' ? "ON" : "OFF");
+                if(isNamedPowerReply()) {
+                    text = "Power Status: \n";
+                    text += "\tName:" + getPowerDistrictName();
+                    text += "\tStatus:" + getPowerDistrictStatus();
+                } else {
+                    text = "Power Status: ";
+                    text += ((char) (getElement(1) & 0x00FF) == '1' ? "ON" : "OFF");
+                }
                 break;
             case DCCppConstants.CURRENT_REPLY:
                 text = "Current: " + getCurrentString() + " / 1024";
@@ -209,7 +207,6 @@ public void parseReply(String s) {
         DCCppReply r = DCCppReply.parseDCCppReply(s);
         log.debug("in parseReply() string: {}", s);
         if (r != null) {
-            this.valueList = r.valueList;
             this.myRegex = r.myRegex;
             this.myReply = r.myReply;
             this._nDataChars = r._nDataChars;
@@ -235,7 +232,10 @@ public static DCCppReply parseDCCppReply(String s) {
         DCCppReply r = new DCCppReply(s);
         switch(s.charAt(0)) {
             case DCCppConstants.STATUS_REPLY:
-                if (s.matches(DCCppConstants.STATUS_REPLY_REGEX)) {
+                if (s.matches(DCCppConstants.STATUS_REPLY_ESP32_REGEX)) {
+                    log.debug("Status Reply: {}", r.toString());
+                    r.myRegex = DCCppConstants.STATUS_REPLY_ESP32_REGEX;
+                } else if (s.matches(DCCppConstants.STATUS_REPLY_REGEX)) {
                     log.debug("Status Reply: {}", r.toString());
                     r.myRegex = DCCppConstants.STATUS_REPLY_REGEX;
                 } 
@@ -278,11 +278,15 @@ public static DCCppReply parseDCCppReply(String s) {
             case DCCppConstants.POWER_REPLY:
                 if (s.matches(DCCppConstants.TRACK_POWER_REPLY_REGEX)) {
                     r.myRegex = DCCppConstants.TRACK_POWER_REPLY_REGEX;
+                } else if (s.matches(DCCppConstants.TRACK_POWER_REPLY_NAMED_REGEX)) {
+                    r.myRegex = DCCppConstants.TRACK_POWER_REPLY_NAMED_REGEX;
                 }
                 return(r);
             case DCCppConstants.CURRENT_REPLY:
                 if (s.matches(DCCppConstants.CURRENT_REPLY_REGEX)) {
                     r.myRegex = DCCppConstants.CURRENT_REPLY_REGEX;
+                } else if (s.matches(DCCppConstants.CURRENT_REPLY_NAMED_REGEX)) {
+                    r.myRegex = DCCppConstants.CURRENT_REPLY_NAMED_REGEX;
                 }
                 return(r);
             case DCCppConstants.WRITE_EEPROM_REPLY:
@@ -724,8 +728,35 @@ public int getReadValueInt() {
         return(Integer.parseInt(this.getReadValueString()));
     }
 
+    public String getPowerDistrictName() {
+        if (this.isNamedPowerReply()) {
+            return(this.getValueString(2));
+        } else {
+            log.error("NamedPowerReply Parser called on non-NamedPowerReply message type {} message {}", this.getOpCodeChar(), this.toString());
+            return("");
+        }
+    }
+
+    public String getPowerDistrictStatus() {
+        if (this.isNamedPowerReply()) {
+           if(this.getValueString(1).equals(DCCppConstants.POWER_OFF)) {
+               return("OFF");
+           } else if(this.getValueString(1).equals(DCCppConstants.POWER_ON)) {
+               return("ON");
+           } else {
+               return("OVERLOAD");
+           }
+        } else {
+            log.error("NamedPowerReply Parser called on non-NamedPowerReply message type {} message {}", this.getOpCodeChar(), this.toString());
+            return("");
+        }
+    }
+
     public String getCurrentString() {
         if (this.isCurrentReply()) {
+            if(this.isNamedCurrentReply()) {
+                return(this.getValueString(2));
+            }
             return(this.getValueString(1));
         } else {
             log.error("CurrentReply Parser called on non-CurrentReply message type {} message {}", this.getOpCodeChar(), this.toString());
@@ -1000,7 +1031,9 @@ public String getCommTypeValueString() {
     public boolean isProgramReply() { return (this.matches(DCCppConstants.PROGRAM_REPLY_REGEX)); }
     public boolean isProgramBitReply() { return (this.matches(DCCppConstants.PROGRAM_BIT_REPLY_REGEX)); }
     public boolean isPowerReply() { return (this.getOpCodeChar() == DCCppConstants.POWER_REPLY); }
+    public boolean isNamedPowerReply() { return(this.matches(DCCppConstants.TRACK_POWER_REPLY_NAMED_REGEX)); }
     public boolean isCurrentReply() { return (this.getOpCodeChar() == DCCppConstants.CURRENT_REPLY); }
+    public boolean isNamedCurrentReply() { return(this.matches(DCCppConstants.CURRENT_REPLY_NAMED_REGEX)); }
     public boolean isMemoryReply() { return (this.getOpCodeChar() == DCCppConstants.MEMORY_REPLY); }
     public boolean isVersionReply() { return (this.getOpCodeChar() == DCCppConstants.STATUS_REPLY); }
 //    public boolean isListPacketRegsReply() { return (this.getOpCodeChar() == DCCppConstants.LISTPACKET_REPLY); }
@@ -1012,6 +1045,7 @@ public boolean isSensorReply() { return((this.getOpCodeChar() == DCCppConstants.
     public boolean isMADCFailReply() { return(this.getOpCodeChar() == DCCppConstants.MADC_FAIL_REPLY); }
     public boolean isMADCSuccessReply() { return(this.getOpCodeChar() == DCCppConstants.MADC_SUCCESS_REPLY); }
     public boolean isStatusReply() { return(this.getOpCodeChar() == DCCppConstants.STATUS_REPLY); }
+    public boolean isESPStatusReply() { return(this.matches(DCCppConstants.STATUS_REPLY_ESP32_REGEX)); }
     public boolean isFreeMemoryReply() { return(this.matches(DCCppConstants.FREE_MEMORY_REPLY_REGEX)); }
     public boolean isOutputListReply() { return(this.matches(DCCppConstants.OUTPUT_LIST_REPLY_REGEX)); }
     public boolean isOutputCmdReply() { return(this.matches(DCCppConstants.OUTPUT_REPLY_REGEX)); }
@@ -1025,7 +1059,9 @@ public boolean isValidReplyFormat() {
             (this.matches(DCCppConstants.LIST_SENSORS_REPLY_REGEX)) ||
             (this.matches(DCCppConstants.PROGRAM_REPLY_REGEX)) ||
             (this.matches(DCCppConstants.TRACK_POWER_REPLY_REGEX)) ||
+            (this.matches(DCCppConstants.TRACK_POWER_REPLY_NAMED_REGEX)) ||
             (this.matches(DCCppConstants.CURRENT_REPLY_REGEX)) ||
+            (this.matches(DCCppConstants.CURRENT_REPLY_NAMED_REGEX)) ||
             (this.matches(DCCppConstants.SENSOR_REPLY_REGEX)) ||
             (this.matches(DCCppConstants.BROKEN_SENSOR_REPLY_REGEX)) ||
             (this.matches(DCCppConstants.SENSOR_DEF_REPLY_REGEX)) ||
@@ -1035,6 +1071,7 @@ public boolean isValidReplyFormat() {
             (this.matches(DCCppConstants.MADC_FAIL_REPLY_REGEX)) ||
             (this.matches(DCCppConstants.MADC_SUCCESS_REPLY_REGEX)) ||
             (this.matches(DCCppConstants.STATUS_REPLY_REGEX)) ||
+            (this.matches(DCCppConstants.STATUS_REPLY_ESP32_REGEX)) ||
             (this.isVersionReply())
         ) {
             return(true);

From 52181b115e00d70bcda7ba42e763698c7eb16068 Mon Sep 17 00:00:00 2001
From: Mike Dunston <michael.dunston@oracle.com>
Date: Fri, 8 Dec 2017 13:06:32 -0800
Subject: [PATCH 2/2] adding tests for named current and power district
 features

---
 .../test/jmri/jmrix/dccpp/DCCppReplyTest.java | 35 +++++++++++++++++++
 1 file changed, 35 insertions(+)

diff --git a/java/test/jmri/jmrix/dccpp/DCCppReplyTest.java b/java/test/jmri/jmrix/dccpp/DCCppReplyTest.java
index 44f9028fe75..27b21ed5d34 100644
--- a/java/test/jmri/jmrix/dccpp/DCCppReplyTest.java
+++ b/java/test/jmri/jmrix/dccpp/DCCppReplyTest.java
@@ -74,6 +74,41 @@ public void testCommTypeReply() {
         
     }
 
+    // Test named power districts
+    @Test
+    public void testNamedPowerDistrictReply() {
+        DCCppReply l = DCCppReply.parseDCCppReply("p 0 MAIN");
+        Assert.assertTrue(l.isNamedPowerReply());
+        Assert.assertEquals('p', l.getOpCodeChar());
+        Assert.assertEquals("MAIN", l.getPowerDistrictName());
+        Assert.assertEquals("OFF", l.getPowerDistrictStatus());
+
+        l = DCCppReply.parseDCCppReply("p 1 MAIN");
+        Assert.assertTrue(l.isNamedPowerReply());
+        Assert.assertEquals('p', l.getOpCodeChar());
+        Assert.assertEquals("MAIN", l.getPowerDistrictName());
+        Assert.assertEquals("ON", l.getPowerDistrictStatus());
+
+        l = DCCppReply.parseDCCppReply("p 2 MAIN");
+        Assert.assertTrue(l.isNamedPowerReply());
+        Assert.assertEquals('p', l.getOpCodeChar());
+        Assert.assertEquals("MAIN", l.getPowerDistrictName());
+        Assert.assertEquals("OVERLOAD", l.getPowerDistrictStatus());
+    }
+
+    // Test named power districts
+    @Test
+    public void testNamedCurrentReply() {
+        DCCppReply l = DCCppReply.parseDCCppReply("a MAIN 0");
+        Assert.assertTrue(l.isNamedCurrentReply());
+        Assert.assertEquals('a', l.getOpCodeChar());
+        Assert.assertEquals("0", l.getCurrentString());
+
+        l = DCCppReply.parseDCCppReply("a MAIN 100");
+        Assert.assertTrue(l.isNamedCurrentReply());
+        Assert.assertEquals('a', l.getOpCodeChar());
+        Assert.assertEquals("100", l.getCurrentString());
+    }
     // The minimal setup for log4J
     @Before
     public void setUp() {