dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-11-26 09:36:13 +01:00
Code Releases Activity

char * / flashstring conflict

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GITHUB_SHA.h
View File

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

2
WiThrottle.cpp
View File

@ -595,7 +595,7 @@ void WiThrottle::sendFunctions(Print* stream, byte loco) {
fkeys=0; fkeys=0;
bool firstchar=true; bool firstchar=true;
for (int fx=0;;fx++) { for (int fx=0;;fx++) {
char c=GETFLASH(functionNames+fx); char c=GETFLASH((char *)functionNames+fx);
if (c=='\0') { if (c=='\0') {
fkeys++; fkeys++;
break; break;

2
version.h
View File

@ -4,7 +4,7 @@
#include "StringFormatter.h" #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.54 - Fix: Pin handling supports pins up to 254
// 4.2.53 - Fix: Fault pin handling made more straight forward // 4.2.53 - Fix: Fault pin handling made more straight forward
// 4.2.52 - Experimental support for sabertooth motor controller on ESP32 // 4.2.52 - Experimental support for sabertooth motor controller on ESP32