char * / flashstring conflict

DCCEXParser.cpp

@@ -652,8 +652,12 @@ void DCCEXParser::parseOne(Print *stream, byte *com, RingStream * ringStream)
                 if (params==1) {
                     SENDFLASHLIST(stream,RMFT2::rosterIdList)
                 }
-                else StringFormatter::send(stream,F(" %d \"%S\" \"%S\""), 
+                else {
-                    id, RMFT2::getRosterName(id), RMFT2::getRosterFunctions(id));
+		  const FSH * functionNames= RMFT2::getRosterFunctions(id);
+		  StringFormatter::send(stream,F(" %d \"%S\" \"%S\""), 
+					id, RMFT2::getRosterName(id),
+					functionNames == NULL ? RMFT2::getRosterFunctions(0) : functionNames);
+		}
 #endif          
                 StringFormatter::send(stream, F(">\n"));      
                 return; 

EXRAILMacros.h

@@ -223,7 +223,7 @@ const FSH * RMFT2::getRosterFunctions(int16_t id) {
       #include "myAutomation.h"
    default: break; 
    }   
-   return F("");
+   return NULL;
 } 
 
 // Pass 8 Signal definitions

GITHUB_SHA.h

@@ -1 +1 @@
-#define GITHUB_SHA "devel-202305242057Z"
+#define GITHUB_SHA "devel-202305251144Z"

WiThrottle.cpp

@@ -533,11 +533,11 @@ void WiThrottle::sendRoster(Print* stream) {
   StringFormatter::send(stream,F("RL%d"), RMFT2::rosterNameCount);
   for (int16_t r=0;;r++) {
       int16_t cabid=GETHIGHFLASHW(RMFT2::rosterIdList,r*2);
+      if (cabid == INT16_MAX)
+	break;
       if (cabid > 0)
 	StringFormatter::send(stream,F("]\\[%S}|{%d}|{%c"),
 			      RMFT2::getRosterName(cabid),cabid,cabid<128?'S':'L');
-      else if (cabid == INT16_MAX)
-	break;
   }
   StringFormatter::send(stream,F("\n"));       
 #else
@@ -574,12 +574,12 @@ void WiThrottle::sendFunctions(Print* stream, byte loco) {
 	myLocos[loco].functionToggles=1<<2; // F2 (HORN)  is a non-toggle
         
 #ifdef EXRAIL_ACTIVE
-	const char * functionNames=(char *) RMFT2::getRosterFunctions(locoid);
+	const FSH * functionNames= RMFT2::getRosterFunctions(locoid);
-	if (!functionNames) {
+	if (functionNames == NULL) {
 	  // no roster entry for locoid, try to find default entry
-	  functionNames=(char *) RMFT2::getRosterFunctions(0);
+	  functionNames= RMFT2::getRosterFunctions(0);
 	}
-	if (!functionNames) {
+	if (functionNames == NULL) {
 	  // no default roster entry either, use non-exrail presets as above 
 	}
 	else if (GETFLASH(functionNames)=='\0') {
@@ -595,7 +595,7 @@ void WiThrottle::sendFunctions(Print* stream, byte loco) {
 	  fkeys=0;
 	  bool firstchar=true;
 	  for (int fx=0;;fx++) {
-	    char c=GETFLASH(functionNames+fx);
+	    char c=GETFLASH((char *)functionNames+fx);
 	    if (c=='\0') {
 	      fkeys++;
 	      break;

version.h

@@ -4,7 +4,7 @@
 #include "StringFormatter.h"
 
 
-#define VERSION "4.2.54pre1"
+#define VERSION "4.2.54pre4"
 // 4.2.54 - Fix: Pin handling supports pins up to 254
 // 4.2.53 - Fix: Fault pin handling made more straight forward
 // 4.2.52 - Experimental support for sabertooth motor controller on ESP32