From 8522e05b1370e9ae512db520a3d30c1f3b0c3906 Mon Sep 17 00:00:00 2001
From: Asbelos <asbelos@btinternet.com>
Date: Tue, 12 Apr 2022 23:28:21 +0100
Subject: [PATCH] merge issue with prog split

---
 DCC.h | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/DCC.h b/DCC.h
index 9333e17..0e4dce1 100644
--- a/DCC.h
+++ b/DCC.h
@@ -98,7 +98,9 @@ public:
   };
  static LOCO speedTable[MAX_LOCOS];
  static int lookupSpeedTable(int locoId, bool autoCreate=true);
-  
+ static byte cv1(byte opcode, int cv);
+ static byte cv2(int cv);
+ 
 private:
   static byte loopStatus;
   static void setThrottle2(uint16_t cab, uint8_t speedCode);
@@ -109,8 +111,6 @@ private:
   static FSH *shieldName;
   static byte globalSpeedsteps;
 
-  static byte cv1(byte opcode, int cv);
-  static byte cv2(int cv);
   static void issueReminders();
   static void callback(int value);