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

…nto devel
DCC-EX · Nov 21, 2023 · a236a20 · a236a20
2 parents 478e966 + 2c1b3e0
commit a236a20
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/EXRAILMacros.h b/EXRAILMacros.h
@@ -128,7 +128,7 @@ const int16_t HIGHFLASH  RMFT2::routeIdList[]= {
 #include "EXRAIL2MacroReset.h"
 #undef AUTOMATION
 #define AUTOMATION(id, description) id,
-const int16_t HIGHFLASH  RMFT2::automationIdList[]= {
+const int16_t HIGHFLASH RMFT2::automationIdList[]= {
     #include "myAutomation.h"
     INT16_MAX};
 
@@ -150,7 +150,7 @@ const FSH * RMFT2::getRouteDescription(int16_t id) {
 const int StringMacroTracker1=__COUNTER__;
 #define THRUNGE(msg,mode) \
      case (__COUNTER__ - StringMacroTracker1) : {\
-         static const char HIGHFLASH  thrunge[]=msg;\
+         static const char HIGHFLASH thrunge[]=msg;\
          strfar=(uint32_t)GETFARPTR(thrunge);\
          tmode=mode;\
          break;\
@@ -186,7 +186,7 @@ case (__COUNTER__ - StringMacroTracker1) : {\
 #undef LCD
 #define LCD(id,msg)  \
      case (__COUNTER__ - StringMacroTracker1) : {\
-         static const char HIGHFLASH  thrunge[]=msg;\
+         static const char HIGHFLASH thrunge[]=msg;\
          strfar=(uint32_t)GETFARPTR(thrunge);\
          tmode=thrunge_lcd; \
          lcdid=id;\

diff --git a/GITHUB_SHA.h b/GITHUB_SHA.h
@@ -1 +1 @@
-#define GITHUB_SHA "devel-202311211437Z"
+#define GITHUB_SHA "devel-202311212016Z"
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		#define GITHUB_SHA "devel-202311211437Z"
		#define GITHUB_SHA "devel-202311212016Z"