dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2025-03-14 18:13:09 +01:00
Code Releases Activity

clean up getThrottleSpeed functions

Browse Source
This commit is contained in:
Harald Barth 2022-06-05 23:07:03 +02:00
parent 06e7ad5c53
commit 016bc37b53
5 changed files with 25 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
DCC.cpp
View File

@ -137,12 +137,25 @@ void DCC::setFunctionInternal(int cab, byte byte1, byte byte2) {
DCCWaveform::mainTrack.schedulePacket(b, nB, 0); DCCWaveform::mainTrack.schedulePacket(b, nB, 0);
} }
uint8_t DCC::getThrottleSpeed(int cab) { // returns speed steps 0 to 127 (1 == emergency stop)
// or -1 on "loco not found"
int8_t DCC::getThrottleSpeed(int cab) {
int reg=lookupSpeedTable(cab); int reg=lookupSpeedTable(cab);
if (reg<0) return -1; if (reg<0) return -1;
return speedTable[reg].speedCode & 0x7F; return speedTable[reg].speedCode & 0x7F;
} }
// returns speed code byte
// or 128 (speed 0, dir forward) on "loco not found".
uint8_t DCC::getThrottleSpeedByte(int cab) {
int reg=lookupSpeedTable(cab);
if (reg<0)
return 128;
return speedTable[reg].speedCode;
}
// returns direction on loco
// or true/forward on "loco not found"
bool DCC::getThrottleDirection(int cab) { bool DCC::getThrottleDirection(int cab) {
int reg=lookupSpeedTable(cab); int reg=lookupSpeedTable(cab);
if (reg<0) return true; if (reg<0) return true;

3
DCC.h
View File

@ -56,7 +56,8 @@ public:
// Public DCC API functions // Public DCC API functions
static void setThrottle(uint16_t cab, uint8_t tSpeed, bool tDirection); static void setThrottle(uint16_t cab, uint8_t tSpeed, bool tDirection);
static uint8_t getThrottleSpeed(int cab); static int8_t getThrottleSpeed(int cab);
static uint8_t getThrottleSpeedByte(int cab);
static bool getThrottleDirection(int cab); static bool getThrottleDirection(int cab);
static void writeCVByteMain(int cab, int cv, byte bValue); static void writeCVByteMain(int cab, int cv, byte bValue);
static void writeCVBitMain(int cab, int cv, byte bNum, bool bValue); static void writeCVBitMain(int cab, int cv, byte bNum, bool bValue);

2
GITHUB_SHA.h
View File

@ -1 +1 @@
#define GITHUB_SHA "TM-PORTX-20220525" #define GITHUB_SHA "TM-PORTX-20220605"

15
TrackManager.cpp
View File

@ -209,17 +209,10 @@ bool TrackManager::setTrackMode(byte trackToSet, TRACK_MODE mode, int16_t dcAddr
} }
void TrackManager::applyDCSpeed(byte t) { void TrackManager::applyDCSpeed(byte t) {
uint8_t speedByte=DCC::getThrottleSpeedByte(trackDCAddr[t]);
int16_t speed1=DCC::getThrottleSpeed(trackDCAddr[t]); if (trackMode[t]==TRACK_MODE_DCX)
byte speedByte; speedByte = (speedByte & 0xF7) | ~(speedByte & 0x80); // Reverse highest bit
if (speed1<0) speedByte=0; track[t]->setDCSignal(speedByte);
else {
speedByte=speed1;
bool direction=DCC::getThrottleDirection(trackDCAddr[t]);
if (trackMode[t]==TRACK_MODE_DCX) direction=!direction;
if (direction) speedByte|=0x80;
}
track[t]->setDCSignal(speedByte);
} }
bool TrackManager::parseJ(Print *stream, int16_t params, int16_t p[]) bool TrackManager::parseJ(Print *stream, int16_t params, int16_t p[])

5
WiThrottle.cpp
View File

@ -421,7 +421,10 @@ void WiThrottle::locoAction(RingStream * stream, byte* aval, char throttleChar,
bool forward=aval[1]!='0'; bool forward=aval[1]!='0';
LOOPLOCOS(throttleChar, cab) { LOOPLOCOS(throttleChar, cab) {
mostRecentCab=myLocos[loco].cab; mostRecentCab=myLocos[loco].cab;
DCC::setThrottle(myLocos[loco].cab, DCC::getThrottleSpeed(myLocos[loco].cab), forward); int8_t speed = DCC::getThrottleSpeed(myLocos[loco].cab);
if (speed < 0) //can not find any speed for this cab
speed = 0;
DCC::setThrottle(myLocos[loco].cab, speed, forward);
// setThrottle will cause a broadcast so notification will be sent // setThrottle will cause a broadcast so notification will be sent
} }
} }