EXRAIL2.h

@@ -203,7 +203,7 @@ private:
     uint16_t getOperand(byte n); 
     
    static bool diag;
-   static const  HIGHFLASH3  byte RouteCode[];
+   static const  HIGHFLASH  byte RouteCode[];
    static const  HIGHFLASH  int16_t SignalDefinitions[];
    static byte flags[MAX_FLAGS];
    static Print * LCCSerial;

EXRAILMacros.h

@@ -121,14 +121,14 @@ const byte RMFT2::compileFeatures = 0
 #include "EXRAIL2MacroReset.h"
 #undef ROUTE
 #define ROUTE(id, description) id,
-const int16_t HIGHFLASH  RMFT2::routeIdList[]= {
+const int16_t HIGHFLASH const RMFT2::routeIdList[]= {
     #include "myAutomation.h"
     INT16_MAX};
 // Pass 2a create throttle automation list 
 #include "EXRAIL2MacroReset.h"
 #undef AUTOMATION
 #define AUTOMATION(id, description) id,
-const int16_t HIGHFLASH RMFT2::automationIdList[]= {
+const int16_t HIGHFLASH const 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 const 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 const thrunge[]=msg;\
          strfar=(uint32_t)GETFARPTR(thrunge);\
          tmode=thrunge_lcd; \
          lcdid=id;\
@@ -195,7 +195,7 @@ case (__COUNTER__ - StringMacroTracker1) : {\
 #undef SCREEN
 #define SCREEN(display,id,msg)  \
      case (__COUNTER__ - StringMacroTracker1) : {\
-         static const char HIGHFLASH thrunge[]=msg;\
+         static const char HIGHFLASH const thrunge[]=msg;\
          strfar=(uint32_t)GETFARPTR(thrunge);\
          tmode=(thrunger)(thrunge_lcd+display); \
          lcdid=id;\
@@ -274,7 +274,7 @@ const byte RMFT2::rosterNameCount=0
 #include "EXRAIL2MacroReset.h"
 #undef ROSTER
 #define ROSTER(cabid,name,funcmap...) cabid,
-const int16_t HIGHFLASH  RMFT2::rosterIdList[]={
+const int16_t HIGHFLASH  const RMFT2::rosterIdList[]={
    #include "myAutomation.h"
    INT16_MAX};
 
@@ -314,7 +314,7 @@ const FSH * RMFT2::getRosterFunctions(int16_t id) {
 #undef VIRTUAL_SIGNAL
 #define VIRTUAL_SIGNAL(id) id,0,0,0,
 
-const  HIGHFLASH  int16_t RMFT2::SignalDefinitions[] = {
+const  HIGHFLASH  int16_t const RMFT2::SignalDefinitions[] = {
     #include "myAutomation.h"
     0,0,0,0 };
 
@@ -503,7 +503,7 @@ int RMFT2::onLCCLookup[RMFT2::countLCCLookup];
 
 // Build RouteCode
 const int StringMacroTracker2=__COUNTER__;
-const  HIGHFLASH3  byte RMFT2::RouteCode[] = {
+const  HIGHFLASH  byte const RMFT2::RouteCode[] = {
     #include "myAutomation.h"
     OPCODE_ENDTASK,0,0,OPCODE_ENDEXRAIL,0,0 };
 

FSH.h

@@ -56,7 +56,6 @@ typedef __FlashStringHelper FSH;
 #if defined(ARDUINO_AVR_MEGA) || defined(ARDUINO_AVR_MEGA2560)
 // AVR_MEGA memory deliberately placed at end of link may need _far functions
 #define HIGHFLASH __attribute__((section(".fini2")))
-#define HIGHFLASH3 __attribute__((section(".fini3")))
 #define GETFARPTR(data) pgm_get_far_address(data)
 #define GETHIGHFLASH(data,offset) pgm_read_byte_far(GETFARPTR(data)+offset)
 #define GETHIGHFLASHW(data,offset) pgm_read_word_far(GETFARPTR(data)+offset)
@@ -64,7 +63,6 @@ typedef __FlashStringHelper FSH;
 // AVR_UNO/NANO runtime does not support _far functions so just use _near equivalent
 // as there is no progmem above 32kb anyway.
 #define HIGHFLASH PROGMEM
-#define HIGHFLASH3 PROGMEM
 #define GETFARPTR(data) ((uint32_t)(data))
 #define GETHIGHFLASH(data,offset) pgm_read_byte_near(GETFARPTR(data)+(offset))
 #define GETHIGHFLASHW(data,offset) pgm_read_word_near(GETFARPTR(data)+(offset))
@@ -82,7 +80,6 @@ typedef __FlashStringHelper FSH;
 typedef char FSH; 
 #define FLASH
 #define HIGHFLASH
-#define HIGHFLASH3
 #define GETFARPTR(data) ((uint32_t)(data))
 #define GETFLASH(addr) (*(const byte *)(addr))
 #define GETHIGHFLASH(data,offset)  (*(const byte *)(GETFARPTR(data)+offset))

GITHUB_SHA.h

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

MotorDriver.h

@@ -156,10 +156,8 @@ class MotorDriver {
     // from outside interrupt
     void setBrake( bool on, bool interruptContext=false);
     __attribute__((always_inline)) inline void setSignal( bool high) {
-#ifndef ARDUINO_ARCH_ESP32
       if (invertPhase)
 	high = !high;
-#endif
       if (trackPWM) {
 	DCCTimer::setPWM(signalPin,high);
       }

version.h

@@ -3,10 +3,7 @@
 
 #include "StringFormatter.h"
 
-#define VERSION "5.2.7"
+#define VERSION "5.2.6"
-// 5.2.7  - Bugfix: EXRAIL ling segment
-//        - Bugfix: Back out wrongly added const
-//        - Bugfix ESP32: Do not inverse DCX direction signal twice
 // 5.2.6  - Trackmanager broadcast power state on track mode change
 // 5.2.5  - Trackmanager: Do not treat TRACK_MODE_ALL as TRACK_MODE_DC
 // 5.2.4  - LCD macro will not do diag if that duplicates @ to same target.