Skip to content

Commit

Permalink
merge duplication error
Browse files Browse the repository at this point in the history
  • Loading branch information
Asbelos committed Aug 6, 2024
1 parent 6cbbdf1 commit e811a65
Showing 1 changed file with 0 additions and 5 deletions.
5 changes: 0 additions & 5 deletions DCC.h
Original file line number Diff line number Diff line change
Expand Up @@ -60,11 +60,9 @@ class DCC
// Public DCC API functions
static void setThrottle(uint16_t cab, uint8_t tSpeed, bool tDirection);
static void estopAll();
static void estopAll();
static int8_t getThrottleSpeed(int cab);
static uint8_t getThrottleSpeedByte(int cab);
static uint8_t getLocoSpeedByte(int cab); // may lag throttle
static uint8_t getLocoSpeedByte(int cab); // may lag throttle
static uint8_t getThrottleFrequency(int cab);
static bool getThrottleDirection(int cab);
static void writeCVByteMain(int cab, int cv, byte bValue);
Expand Down Expand Up @@ -117,7 +115,6 @@ class DCC

static LOCO speedTable[MAX_LOCOS];
static LOCO * lookupSpeedTable(int locoId, bool autoCreate=true);
static LOCO * lookupSpeedTable(int locoId, bool autoCreate=true);
static byte cv1(byte opcode, int cv);
static byte cv2(int cv);
static bool setMomentum(int locoId,int16_t accelerating, int16_t decelerating);
Expand All @@ -130,8 +127,6 @@ class DCC
static void setFunctionInternal(int cab, byte fByte, byte eByte, byte count);
static bool issueReminder(LOCO * slot);
static LOCO* nextLocoReminder;
static bool issueReminder(LOCO * slot);
static LOCO* nextLocoReminder;
static FSH *shieldName;
static byte globalSpeedsteps;

Expand Down

0 comments on commit e811a65

Please sign in to comment.