mirror of
https://github.com/DCC-EX/CommandStation-EX.git
synced 2024-11-24 08:36:14 +01:00
Compare commits
3 Commits
b9a7adb305
...
72a9078172
Author | SHA1 | Date | |
---|---|---|---|
|
72a9078172 | ||
|
763c9d8ae6 | ||
|
04f0f56348 |
|
@ -1177,7 +1177,7 @@ bool DCCEXParser::parseD(Print *stream, int16_t params, int16_t p[])
|
||||||
IODevice::DumpAll();
|
IODevice::DumpAll();
|
||||||
else if (p[1] == HASH_KEYWORD_RESET)
|
else if (p[1] == HASH_KEYWORD_RESET)
|
||||||
IODevice::reset();
|
IODevice::reset();
|
||||||
break;
|
return true;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
case HASH_KEYWORD_TT: // <D TT vpin steps activity>
|
case HASH_KEYWORD_TT: // <D TT vpin steps activity>
|
||||||
|
|
|
@ -156,6 +156,7 @@
|
||||||
#undef SPEED
|
#undef SPEED
|
||||||
#undef START
|
#undef START
|
||||||
#undef STASH
|
#undef STASH
|
||||||
|
#undef STEALTH
|
||||||
#undef STOP
|
#undef STOP
|
||||||
#undef THROW
|
#undef THROW
|
||||||
#undef TT_ADDPOSITION
|
#undef TT_ADDPOSITION
|
||||||
|
@ -306,6 +307,7 @@
|
||||||
#define SPEED(speed)
|
#define SPEED(speed)
|
||||||
#define START(route)
|
#define START(route)
|
||||||
#define STASH(id)
|
#define STASH(id)
|
||||||
|
#define STEALTH(code...)
|
||||||
#define STOP
|
#define STOP
|
||||||
#define THROW(id)
|
#define THROW(id)
|
||||||
#define TT_ADDPOSITION(turntable_id,position,value,angle,description...)
|
#define TT_ADDPOSITION(turntable_id,position,value,angle,description...)
|
||||||
|
|
|
@ -210,6 +210,8 @@ case (__COUNTER__ - StringMacroTracker1) : {\
|
||||||
lcdid=id;\
|
lcdid=id;\
|
||||||
break;\
|
break;\
|
||||||
}
|
}
|
||||||
|
#undef STEALTH
|
||||||
|
#define STEALTH(code...) case (__COUNTER__ - StringMacroTracker1) : {code} return;
|
||||||
#undef WITHROTTLE
|
#undef WITHROTTLE
|
||||||
#define WITHROTTLE(msg) THRUNGE(msg,thrunge_withrottle)
|
#define WITHROTTLE(msg) THRUNGE(msg,thrunge_withrottle)
|
||||||
|
|
||||||
|
@ -422,6 +424,7 @@ int RMFT2::onLCCLookup[RMFT2::countLCCLookup];
|
||||||
OPCODE_PAD,V((((uint64_t)sender)>>0)&0xFFFF),
|
OPCODE_PAD,V((((uint64_t)sender)>>0)&0xFFFF),
|
||||||
#define LCD(id,msg) PRINT(msg)
|
#define LCD(id,msg) PRINT(msg)
|
||||||
#define SCREEN(display,id,msg) PRINT(msg)
|
#define SCREEN(display,id,msg) PRINT(msg)
|
||||||
|
#define STEALTH(code...) PRINT(dummy)
|
||||||
#define LCN(msg) PRINT(msg)
|
#define LCN(msg) PRINT(msg)
|
||||||
#define MOVETT(id,steps,activity) OPCODE_SERVO,V(id),OPCODE_PAD,V(steps),OPCODE_PAD,V(EXTurntable::activity),OPCODE_PAD,V(0),
|
#define MOVETT(id,steps,activity) OPCODE_SERVO,V(id),OPCODE_PAD,V(steps),OPCODE_PAD,V(EXTurntable::activity),OPCODE_PAD,V(0),
|
||||||
#define ONACTIVATE(addr,subaddr) OPCODE_ONACTIVATE,V(addr<<2|subaddr),
|
#define ONACTIVATE(addr,subaddr) OPCODE_ONACTIVATE,V(addr<<2|subaddr),
|
||||||
|
|
|
@ -3,7 +3,8 @@
|
||||||
|
|
||||||
#include "StringFormatter.h"
|
#include "StringFormatter.h"
|
||||||
|
|
||||||
#define VERSION "5.2.12"
|
#define VERSION "5.2.13"
|
||||||
|
// 5.2.13 - EXRAIL STEALTH
|
||||||
// 5.2.12 - ESP32 add AP mode LCD messages with SSID/PW for
|
// 5.2.12 - ESP32 add AP mode LCD messages with SSID/PW for
|
||||||
// - STM32 change to UID_BASE constants in DCCTimerSTM32 rather than raw hex addresses for UID registers
|
// - STM32 change to UID_BASE constants in DCCTimerSTM32 rather than raw hex addresses for UID registers
|
||||||
// - STM32 extra UART/USARTs for larger Nucleo models
|
// - STM32 extra UART/USARTs for larger Nucleo models
|
||||||
|
|
Loading…
Reference in New Issue
Block a user