char * / flashstring conflict

This commit is contained in:
Harald Barth 2023-05-25 14:02:28 +02:00
parent db0e0cbf8b
commit 82929245ed
3 changed files with 3 additions and 3 deletions

View File

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

View File

@ -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;

View File

@ -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