Merge pull request #1022 from mstevetodd/master

fixed regression with LnWi states
JMRI · Apr 2, 2023 · b235a07 · b235a07
2 parents 208a619 + 66ca2c1
commit b235a07
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 4 deletions.
diff --git a/EngineDriver/src/main/AndroidManifest.xml b/EngineDriver/src/main/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="168"
-    android:versionName="2.35.168" android:installLocation="auto">
+    android:versionCode="169"
+    android:versionName="2.35.169" android:installLocation="auto">
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" tools:ignore="ScopedStorage" />

diff --git a/EngineDriver/src/main/java/jmri/enginedriver/turnouts.java b/EngineDriver/src/main/java/jmri/enginedriver/turnouts.java
@@ -993,7 +993,7 @@ private void loadRecentTurnoutsList() {
                 }
             }
 
-            //replace recent list with from temp list, suppressing where requested
+            //replace recent list from temp list, suppressing where requested
             recentTurnoutsList.clear();
             for (HashMap<String, String> rthm : tempRecentTurnoutsList) {
                 String sn = rthm.get("turnout");

diff --git a/EngineDriver/src/main/java/jmri/enginedriver/util/comm_thread.java b/EngineDriver/src/main/java/jmri/enginedriver/util/comm_thread.java
@@ -622,7 +622,7 @@ protected void sendTurnout(String cmd) {
         if (!mainapp.isDCCEX) { // not DCC-EX
             //special "toggle" handling for LnWi
             if (mainapp.getServerType().equals("Digitrax") && action == '2') {
-                action = cs.equals("4")?'T':'C';
+                action = cs.equals("C")?'T':'C'; //LnWi states are C/T (not 2/4)
             }
             wifiSend("PTA" + action + systemName);
 

diff --git a/changelog-and-todo-list.txt b/changelog-and-todo-list.txt
@@ -1,4 +1,5 @@
 **Version 2.35.168
+ * fixed regression with LnWi states
 **Version 2.35.164
  * New 'Tablet Vertical Left (1-6)' throttle screen layout
  * Fix for when deleting servers from the recent list