fix(tpro): auto-switch for function switches

Fixes #1488
EdgeTX · Oct 10, 2022 · cda53c8 · cda53c8
1 parent 69d328f
commit cda53c8
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/radio/src/switches.cpp b/radio/src/switches.cpp
@@ -668,8 +668,8 @@ swsrc_t getMovedSwitch()
       auto prev = (uint8_t )(bfSingleBitGet(fsswitches_states, i) >> (i));
       uint8_t next = getFSLogicalState(i);
       if (prev != next) {
-        switches_states ^= (-next ^ switches_states) & (1 << i);
-        result = 2 + (3 * (i + NUM_REGULAR_SWITCHES)) + next;
+        fsswitches_states = (fsswitches_states & ~(1 << i)) | (next << i);
+        result = SWSRC_FIRST_FUNCTION_SWITCH + i*3 + (next ? 2 : 0);
       }
     }
   }