From 84bc098157c3c542e08a7fb54f5f655a7cdd16d9 Mon Sep 17 00:00:00 2001
From: Harald Barth <haba@kth.se>
Date: Sat, 21 Dec 2024 16:08:57 +0100
Subject: [PATCH] seperate out the templates that make it possible to use
 bitwise operations on enums

---
 IODevice.h         |  1 +
 MotorDriver.h      |  5 +----
 TemplateForEnums.h | 26 ++++++++++++++++++++++++++
 3 files changed, 28 insertions(+), 4 deletions(-)
 create mode 100644 TemplateForEnums.h

diff --git a/IODevice.h b/IODevice.h
index 7be84fd..08b7370 100644
--- a/IODevice.h
+++ b/IODevice.h
@@ -38,6 +38,7 @@
 #include "FSH.h"
 #include "I2CManager.h"
 #include "inttypes.h"
+#include "TemplateForEnums.h"
 
 typedef uint16_t VPIN;
 // Limit VPIN number to max 32767.  Above this number, printing often gives negative values.
diff --git a/MotorDriver.h b/MotorDriver.h
index 269fee7..f1d52f7 100644
--- a/MotorDriver.h
+++ b/MotorDriver.h
@@ -28,12 +28,9 @@
 #include "DCCTimer.h"
 #include <wiring_private.h>
 
+#include "TemplateForEnums.h"
 // use powers of two so we can do logical and/or on the track modes in if clauses.
 // For example TRACK_MODE_DC_INV is (TRACK_MODE_DC|TRACK_MODIFIER_INV)
-template<class T> inline T operator~ (T a) { return (T)~(int)a; }
-template<class T> inline T operator| (T a, T b) { return (T)((int)a | (int)b); }
-template<class T> inline T operator& (T a, T b) { return (T)((int)a & (int)b); }
-template<class T> inline T operator^ (T a, T b) { return (T)((int)a ^ (int)b); }
 enum TRACK_MODE : byte {
   // main modes
   TRACK_MODE_NONE = 1, TRACK_MODE_MAIN = 2, TRACK_MODE_PROG = 4,
diff --git a/TemplateForEnums.h b/TemplateForEnums.h
new file mode 100644
index 0000000..459568d
--- /dev/null
+++ b/TemplateForEnums.h
@@ -0,0 +1,26 @@
+/*
+ *  © 2024, Harald Barth. All rights reserved.
+ *  
+ *  This file is part of DCC-EX
+ *
+ *  This is free software: you can redistribute it and/or modify
+ *  it under the terms of the GNU General Public License as published by
+ *  the Free Software Foundation, either version 3 of the License, or
+ *  (at your option) any later version.
+ *
+ *  It is distributed in the hope that it will be useful,
+ *  but WITHOUT ANY WARRANTY; without even the implied warranty of
+ *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ *  GNU General Public License for more details.
+ *
+ *  You should have received a copy of the GNU General Public License
+ *  along with CommandStation.  If not, see <https://www.gnu.org/licenses/>.
+ */
+#ifndef TemplateForEnums
+#define TemplateForEnums
+template<class T> inline T operator~ (T a) { return (T)~(int)a; }
+template<class T> inline T operator| (T a, T b) { return (T)((int)a | (int)b); }
+template<class T> inline T operator& (T a, T b) { return (T)((int)a & (int)b); }
+template<class T> inline T operator^ (T a, T b) { return (T)((int)a ^ (int)b); }
+#endif
+