From 1b07d0a5c60766f828f4663478c039da06ff6e6e Mon Sep 17 00:00:00 2001
From: Asbelos <asbelos@btinternet.com>
Date: Thu, 16 Dec 2021 10:28:41 +0000
Subject: [PATCH] Simplify Withrottle function changes

---
 DCC.cpp        | 38 +++++++-------------------------------
 DCC.h          |  2 +-
 WiThrottle.cpp | 10 ++++++----
 WiThrottle.h   |  4 ++--
 4 files changed, 16 insertions(+), 38 deletions(-)

diff --git a/DCC.cpp b/DCC.cpp
index 67bf676..4469aa1 100644
--- a/DCC.cpp
+++ b/DCC.cpp
@@ -192,39 +192,15 @@ void DCC::setFn( int cab, int16_t functionNumber, bool on) {
   }
 }
 
-// Change function according to how button was pressed,
-// typically in WiThrottle.
-// Returns new state or -1 if nothing was changed.
-int DCC::changeFn( int cab, int16_t functionNumber, bool pressed) {
-  int funcstate = -1;
-  if (cab<=0 || functionNumber>28) return funcstate;
+// Flip function state
+void DCC::changeFn( int cab, int16_t functionNumber) {
+  if (cab<=0 || functionNumber>28) return;
   int reg = lookupSpeedTable(cab);
-  if (reg<0) return funcstate;  
-  uint32_t oldFunctionMap=speedTable[reg].functions;
-
-  // Take care of functions:
-  // Imitate how many command stations do it: Button press is
-  // toggle but for F2 where it is momentary
+  if (reg<0) return;  
   unsigned long funcmask = (1UL<<functionNumber);
-  if (functionNumber == 2) {
-      // turn on F2 on press and off again at release of button
-      if (pressed) {
-	  speedTable[reg].functions |= funcmask;
-	  funcstate = 1;
-      } else {
-	  speedTable[reg].functions &= ~funcmask;
-	  funcstate = 0;
-      }
-  } else {
-      // toggle function on press, ignore release
-      if (pressed) {
-        speedTable[reg].functions ^= funcmask;
-      }
-      funcstate = (speedTable[reg].functions & funcmask)? 1 : 0;
-  }
-  updateGroupflags(speedTable[reg].groupFlags, functionNumber);
-  if (oldFunctionMap!=speedTable[reg].functions) CommandDistributor::broadcastLoco(reg);
-  return funcstate;
+  speedTable[reg].functions ^= funcmask;
+	updateGroupflags(speedTable[reg].groupFlags, functionNumber);
+  CommandDistributor::broadcastLoco(reg);
 }
 
 int DCC::getFn( int cab, int16_t functionNumber) {
diff --git a/DCC.h b/DCC.h
index 0b02b5b..c45a658 100644
--- a/DCC.h
+++ b/DCC.h
@@ -99,7 +99,7 @@ public:
   static void writeCVBitMain(int cab, int cv, byte bNum, bool bValue);
   static void setFunction(int cab, byte fByte, byte eByte);
   static void setFn(int cab, int16_t functionNumber, bool on);
-  static int changeFn(int cab, int16_t functionNumber, bool pressed);
+  static void changeFn(int cab, int16_t functionNumber);
   static int  getFn(int cab, int16_t functionNumber);
   static uint32_t getFunctionMap(int cab);
   static void updateGroupflags(byte &flags, int16_t functionNumber);
diff --git a/WiThrottle.cpp b/WiThrottle.cpp
index 8e63b12..b3cc0a8 100644
--- a/WiThrottle.cpp
+++ b/WiThrottle.cpp
@@ -316,12 +316,14 @@ void WiThrottle::locoAction(RingStream * stream, byte* aval, char throttleChar,
                 }
              } 
             break;
-           case 'F': //F onOff function
-              {
-		            bool pressed=aval[1]=='1';
+           case 'F': // Function key pressed/released
+              {  
+                bool pressed=aval[1]=='1';
                 int fKey = getInt(aval+2);
+                if (fKey!=2 && !pressed) break; // ignore releases except key 2 
                 LOOPLOCOS(throttleChar, cab) {
-		              DCC::changeFn(myLocos[loco].cab, fKey, pressed);
+                  if (fKey==2) DCC::setFn(myLocos[loco].cab,fKey, pressed);
+                  else  DCC::changeFn(myLocos[loco].cab, fKey);
                 }
                 break;  
               }
diff --git a/WiThrottle.h b/WiThrottle.h
index 0e1f525..5e2faeb 100644
--- a/WiThrottle.h
+++ b/WiThrottle.h
@@ -40,8 +40,8 @@ class WiThrottle {
     ~WiThrottle();
    
       static const int MAX_MY_LOCO=10;      // maximum number of locos assigned to a single client
-      static const int HEARTBEAT_SECONDS=4; // heartbeat at 4secs to provide messaging transport
-      static const int ESTOP_SECONDS=8;     // eStop if no incoming messages for more than 8secs
+      static const int HEARTBEAT_SECONDS=10; // heartbeat at 4secs to provide messaging transport
+      static const int ESTOP_SECONDS=20;     // eStop if no incoming messages for more than 8secs
       static WiThrottle* firstThrottle;
       static int getInt(byte * cmd);
       static int getLocoId(byte * cmd);