Merge pull request #296 from mstevetodd/master

tag for new Beta 2.20.59
JMRI · Jul 21, 2018 · 7bcd363 · 7bcd363
2 parents 7a8a36f + f717631
commit 7bcd363
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 4 deletions.
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
@@ -2,8 +2,8 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     package="jmri.enginedriver"
-    android:versionCode="58"
-    android:versionName="2.20.58" android:installLocation="auto">
+    android:versionCode="59"
+    android:versionName="2.20.59" android:installLocation="auto">
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />

diff --git a/assets/about_page.html b/assets/about_page.html
@@ -20,11 +20,13 @@ <h1>Engine Driver Throttle for Android</h1>
     <li>Fix for Gamepad functions F10 and above</li>
     <li>monochrome icon for the notification bar</li>
     <li>handle MRC sending multiple VN messages</li>
-    <li>Prevent crashes reported to Play Store</li>
     <li>highlight loco number when the select button is disabled</li>
     <li>German translation by Daniel Sieber</li>
     <li>ESU MC2 Stop button now registers long-press via a timer rather than on release</li>
     <li>ESU MC2 Control Knob now reacts to external speed changes</li>
+    <li>add support for "HmXXXXX" info messages returned from server</li>
+    <li>reduce 'Q'uit delay to avoid early socket close which doesn't clear WiThrottle list</li>
+    <li>Prevent crashes reported to Play Store</li>
 </ul>
 <p><em><a
         href="https://raw.githubusercontent.com/JMRI/EngineDriver/master/changelog-and-todo-list.txt"

diff --git a/changelog-and-todo-list.txt b/changelog-and-todo-list.txt
@@ -3,7 +3,7 @@
  * monochrome icon for the notification bar
  * handle MRC sending multiple VN messages
  * add support for "HmXXXXX" info messages returned from server
- * reduce 'Q'uit delay to avoid early socket close
+ * reduce 'Q'uit delay to avoid early socket close which doesn't clear WiThrottle list
  * prevent crashes reported to Play Store
  * ESU MC2 Stop button long-press behaviour modified to act on timeout rather than release
  * ESU MC2 control knob now responds to external speed changes - fixes issue #292