dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-12-24 05:11:24 +01:00
Code Releases Activity

Merge branch 'devel' into devel-esp32boost2

Browse Source
This commit is contained in:
Harald Barth 2023-11-11 07:19:15 +01:00
commit d8cc0c632a
3 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
EXRAIL2.cpp
View File

@ -332,7 +332,7 @@ void RMFT2::setTurntableHiddenState(Turntable * tto) {
char RMFT2::getRouteType(int16_t id) { char RMFT2::getRouteType(int16_t id) {
int16_t progCounter=routeLookup->find(id); int16_t progCounter=routeLookup->find(id);
if (progCounter>=0) { if (progCounter>=0) {
OPCODE type=GET_OPCODE; byte type=GET_OPCODE;
if (type==OPCODE_ROUTE) return 'R'; if (type==OPCODE_ROUTE) return 'R';
if (type==OPCODE_AUTOMATION) return 'A'; if (type==OPCODE_AUTOMATION) return 'A';
} }

20
EXRAIL2Parser.cpp
View File

@ -122,7 +122,7 @@ void RMFT2::ComandFilter(Print * stream, byte & opcode, byte & paramCount, int16
case 'J': // throttle info commands case 'J': // throttle info commands
// This entire code block is compiled out if FEATURE_ROUTESTATE macros not used // This entire code block is compiled out if FEATURE_ROUTESTATE macros not used
if (paramCount<1 || !(compileFeatures & FEATURE_ROUTESTATE)) return; if (paramCount<1) return;
switch(p[0]) switch(p[0])
case HASH_KEYWORD_A: // <JA> returns automations/routes case HASH_KEYWORD_A: // <JA> returns automations/routes
if (paramCount==1) {// <JA> if (paramCount==1) {// <JA>
@ -136,14 +136,16 @@ void RMFT2::ComandFilter(Print * stream, byte & opcode, byte & paramCount, int16
uint16_t id=p[1]; uint16_t id=p[1];
StringFormatter::send(stream,F("<jA %d %c \"%S\">\n"), StringFormatter::send(stream,F("<jA %d %c \"%S\">\n"),
id, getRouteType(id), getRouteDescription(id)); id, getRouteType(id), getRouteDescription(id));
// Send any non-default button states or captions if (compileFeatures & FEATURE_ROUTESTATE) {
int16_t statePos=routeLookup->findPosition(id); // Send any non-default button states or captions
if (statePos>=0) { int16_t statePos=routeLookup->findPosition(id);
if (routeStateArray[statePos]) if (statePos>=0) {
StringFormatter::send(stream,F("<jB %d %d>\n"), id, routeStateArray[statePos]); if (routeStateArray[statePos])
if (routeCaptionArray[statePos]) StringFormatter::send(stream,F("<jB %d %d>\n"), id, routeStateArray[statePos]);
StringFormatter::send(stream,F("<jB %d \"%S\">\n"), id,routeCaptionArray[statePos]); if (routeCaptionArray[statePos])
StringFormatter::send(stream,F("<jB %d \"%S\">\n"), id,routeCaptionArray[statePos]);
}
} }
opcode=0; opcode=0;
return; return;

2
MotorDriver.cpp
View File

@ -680,8 +680,10 @@ void MotorDriver::checkPowerOverload(bool useProgLimit, byte trackno) {
power_sample_overload_wait *= 2; power_sample_overload_wait *= 2;
if (power_sample_overload_wait > POWER_SAMPLE_RETRY_MAX) if (power_sample_overload_wait > POWER_SAMPLE_RETRY_MAX)
power_sample_overload_wait = POWER_SAMPLE_RETRY_MAX; power_sample_overload_wait = POWER_SAMPLE_RETRY_MAX;
#ifdef EXRAIL_ACTIVE
DIAG(F("Calling EXRAIL")); DIAG(F("Calling EXRAIL"));
RMFT2::powerEvent(trackno, true); // Tell EXRAIL we have an overload RMFT2::powerEvent(trackno, true); // Tell EXRAIL we have an overload
#endif
// power on test // power on test
DIAG(F("TRACK %c POWER RESTORE (after %4M)"), trackno + 'A', mslpc); DIAG(F("TRACK %c POWER RESTORE (after %4M)"), trackno + 'A', mslpc);
setPower(POWERMODE::ALERT); setPower(POWERMODE::ALERT);