Merge pull request #1103 from mstevetodd/master

a few text tweaks

EngineDriver/src/main/assets/about_page.html

@@ -19,9 +19,9 @@ <h1>Engine Driver Throttle for Android</h1>
 <p><b>Changes for this version include:</b></p>
 <ul>
     <li>Support for 32 Function Roster Entries</li>
-    <li>New WiThrottle CV Progaming on Main page. (note: not supported on all Command Stations)</li>
+    <li>New WiThrottle "CV Programming on Main" page. (note: not supported on all Command Stations)</li>
     <li>New preference to allow for double back button presses to exit the app</li>
-    <li>Support for JMRI DCCppOverTCP Server.</li>
+    <li>Discovery of JMRI DCCppOverTCP Server.</li>
     <li>Include any server with port 2560 as a DCC-EX server when connection preference set to 'Auto'</li>
     <li>Change the owner filter pref default to false</li>
     <li>UI improvements for the DCC-EX and Function Defaults pages</li>
@@ -65,7 +65,7 @@ <h1>Engine Driver Throttle for Android</h1>
 <h3>Prerequisites (for JMRI):</h3>
 <p>Verify your Android device can connect to your network via WiFi and obtain an IP address.<br/>Make
     sure you are running one of the latest versions of <a href="http://jmri.org/" target="_blank">JMRI</a>
-    (3.8 works, 4.20+ works much better) on your PC, connected to your layout.&nbsp; Start up JMRI
+    (3.8 works, 5.8+ works much better) on your PC, connected to your layout.&nbsp; Start up JMRI
     and verify you can use the included "Throttle" window to control a loco on your layout.</p>
 <p>Start the <a
         href="http://jmri.org/help/en/package/jmri/jmrit/withrottle/UserInterface.shtml"
@@ -83,12 +83,10 @@ <h3>Prerequisites (for Digitrax LnWi):</h3>
 <h3>Prerequisites (for DCC-EX EX-CommandStation):</h3>
 <p>Engine Driver can connect directly to DCC-EX EX-CommandStations, that are in Station Mode or
     Access Point Mode, using either the WiThrottle protocol or the native DCC-EX command protocol.
-    Engine Driver will use WiThrottle by default.  If you wish to use native DCC-EX commands
-    you must change the Engine Driver preference. <br />
-    If you use the native DCC-EX commands an additional menu item (DCC-EX) will be available for
-    programming CVs and other functions. <br />
-    Note: If you connect the EX-CommandStation via JMRI, you must use WiThrottle, and therefor the
-    additional features will not be available.</p>
+    <br />
+    If you use the native DCC-EX commands additional DCC-EX menu items will be available for
+    programming CVs and other functions.
+    </p>
 <h3>Operation:</h3>
 <p>On your phone, start the Engine Driver app and wait for your server's address to show up in
     "Discovered Services".</p>

EngineDriver/src/main/res/values/strings.xml

@@ -1269,7 +1269,7 @@
     -->
 
     <string name="prefShowWitPomTitle">Show WiThrottle PoM Page</string>
-    <string name="prefShowWitPomSummary">Choose if the WiThrottle CV Programing on MAIN (Operation Mode) menu and page should be available.</string>
+    <string name="prefShowWitPomSummary">Choose if the WiThrottle CV Programming on MAIN (Operations Mode) menu and page should be available.</string>
 
     <string name="prefFeedbackOnDisconnectTitle">Feedback on Disconnect</string>
     <string name="prefFeedbackOnDisconnectSummary">Play sound and vibrate on unexpected disconnect</string>
@@ -1287,8 +1287,8 @@
     <string name="prefAlwaysUseFunctionsFromServerTitle">Always use function labels from server</string>
     <string name="prefAlwaysUseFunctionsFromServerSummary">When disabled, use EngineDriver default labels for locos selected by address (not Roster), ignoring server default labels.</string>
 
-    <string name="useProtocolDCCEX">Use native DCC-EX commands (not WiThrottle)"</string>
-    <string name="useProtocolDCCEXplusAutoHint">Use native DCC-EX? For \'Auto\', name must contain \"DCCEX\" or \"DCC-EX\" or use port 2560</string>
+    <string name="useProtocolDCCEX">Use WiThrottle or DCC-EX protocol?"</string>
+    <string name="useProtocolDCCEXplusAutoHint">WiThrottle or DCC-EX protocol? (\'Auto\' looks for \"DCCEX\", \"DCC-EX\" or port 2560)</string>
     <string name="usingProtocolDCCEX">Using the DCC-EX protocol.\nUncheck \"Use native DCC-EX commands\" preference to use the WiThrottle protocol.</string>
 
     <string name="prefDccexConnectionOptionTitle">Show protocol option</string>

changelog-and-todo-list.txt

@@ -3,7 +3,7 @@
  * New WiThrottle CV PoM page
  * Bug fix for <p 0|1>  (space after p)  - only seen in the JMRI DCC++ simulator
  * Include any server with port 2560 as a DCC-EX server when connection preference set to 'Auto'
- * Support for JMRI DCCppOverTCP Server. Now also checks for the mDNS service "_dccppovertcpserver._tcp.local."
+ * Discovery for JMRI DCCppOverTCP Server, checks for the mDNS service "_dccppovertcpserver._tcp.local."
 **Version 2.37.180
  * fastclock fix
  * reinstate mipmap icon
@@ -766,8 +766,6 @@
  *   TODO: toast messages on release of loco (even on Exit) and update of preferences
  *   TODO: split RESPONSE message into multiples, and remove string parsing from other activities
  *   TODO: rewrite procedural process_xxx functions into proper OO classes
- *   TODO: lint removal
- *   TODO: remove deprecated code
  * intro
  *   TODO: if saved preferences found, prompt for import and shortcircuit intro
  * web
@@ -790,6 +788,7 @@
  *   TODO: while reconnecting, make "Exit EngineDriver?" immediate, not wait for next timeout
  *   TODO: add "Check for Updates" link to first menu and to About page.
  *   TODO: Add option to choose which server to automatically connect to
+ *   TODO: Add DCC-EX to "Auto-connect to first server?"
  * threaded_application
  *   TODO: verify MRC fastclock messages
  *   TODO: when MT+ received, if the loco is in a consist, request the consist address also