dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2025-03-29 16:50:12 +01:00
Code Releases Activity

Merge branch 'devel' of https://github.com/DCC-EX/CommandStation-EX into devel

Browse Source
This commit is contained in:
Asbelos 2023-11-21 21:18:11 +00:00
commit a236a205fe
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
EXRAILMacros.h
View File

@ -128,7 +128,7 @@ const int16_t HIGHFLASH RMFT2::routeIdList[]= {
#include "EXRAIL2MacroReset.h" #include "EXRAIL2MacroReset.h"
#undef AUTOMATION #undef AUTOMATION
#define AUTOMATION(id, description) id, #define AUTOMATION(id, description) id,
const int16_t HIGHFLASH RMFT2::automationIdList[]= { const int16_t HIGHFLASH RMFT2::automationIdList[]= {
#include "myAutomation.h" #include "myAutomation.h"
INT16_MAX}; INT16_MAX};
@ -150,7 +150,7 @@ const FSH * RMFT2::getRouteDescription(int16_t id) {
const int StringMacroTracker1=__COUNTER__; const int StringMacroTracker1=__COUNTER__;
#define THRUNGE(msg,mode) \ #define THRUNGE(msg,mode) \
case (__COUNTER__ - StringMacroTracker1) : {\ case (__COUNTER__ - StringMacroTracker1) : {\
static const char HIGHFLASH thrunge[]=msg;\ static const char HIGHFLASH thrunge[]=msg;\
strfar=(uint32_t)GETFARPTR(thrunge);\ strfar=(uint32_t)GETFARPTR(thrunge);\
tmode=mode;\ tmode=mode;\
break;\ break;\
@ -186,7 +186,7 @@ case (__COUNTER__ - StringMacroTracker1) : {\
#undef LCD #undef LCD
#define LCD(id,msg) \ #define LCD(id,msg) \
case (__COUNTER__ - StringMacroTracker1) : {\ case (__COUNTER__ - StringMacroTracker1) : {\
static const char HIGHFLASH thrunge[]=msg;\ static const char HIGHFLASH thrunge[]=msg;\
strfar=(uint32_t)GETFARPTR(thrunge);\ strfar=(uint32_t)GETFARPTR(thrunge);\
tmode=thrunge_lcd; \ tmode=thrunge_lcd; \
lcdid=id;\ lcdid=id;\

2
GITHUB_SHA.h
View File

@ -1 +1 @@
#define GITHUB_SHA "devel-202311211437Z" #define GITHUB_SHA "devel-202311212016Z"