char * / flashstring conflict

DCC-EX · May 25, 2023 · 8292924 · 8292924
1 parent db0e0cb
commit 8292924
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/GITHUB_SHA.h b/GITHUB_SHA.h
@@ -1 +1 @@
-#define GITHUB_SHA "devel-202305250828Z"
+#define GITHUB_SHA "devel-202305251144Z"
diff --git a/WiThrottle.cpp b/WiThrottle.cpp
@@ -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;

diff --git a/version.h b/version.h
@@ -4,7 +4,7 @@
 #include "StringFormatter.h"
 
 
-#define VERSION "4.2.54pre3"
+#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