1
0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-12-23 12:51:24 +01:00

merge issue with prog split

This commit is contained in:
Asbelos 2022-04-12 23:28:21 +01:00
parent 1b0d700009
commit 8522e05b13

6
DCC.h
View File

@ -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);