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

INT16_MAX was missing at more places

Browse Source
This commit is contained in:
Harald Barth 2023-05-23 18:59:03 +02:00
parent 951a6637f0
commit c22d789513
4 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
EXRAIL2.cpp
View File

@ -266,12 +266,12 @@ void RMFT2::setTurnoutHiddenState(Turnout * t) {
char RMFT2::getRouteType(int16_t id) { char RMFT2::getRouteType(int16_t id) {
for (int16_t i=0;;i+=2) { for (int16_t i=0;;i+=2) {
int16_t rid= GETHIGHFLASHW(routeIdList,i); int16_t rid= GETHIGHFLASHW(routeIdList,i);
if (rid==0) break; if (rid==INT16_MAX) break;
if (rid==id) return 'R'; if (rid==id) return 'R';
} }
for (int16_t i=0;;i+=2) { for (int16_t i=0;;i+=2) {
int16_t rid= GETHIGHFLASHW(automationIdList,i); int16_t rid= GETHIGHFLASHW(automationIdList,i);
if (rid==0) break; if (rid==INT16_MAX) break;
if (rid==id) return 'A'; if (rid==id) return 'A';
} }
return 'X'; return 'X';

2
EXRAILMacros.h
View File

@ -190,7 +190,7 @@ const FSH * RMFT2::getTurnoutDescription(int16_t turnoutid) {
// Pass 6: Roster IDs (count) // Pass 6: Roster IDs (count)
#include "EXRAIL2MacroReset.h" #include "EXRAIL2MacroReset.h"
#undef ROSTER #undef ROSTER
#define ROSTER(cabid,name,funcmap...) +(cabid == 0 ? 0 : 1) #define ROSTER(cabid,name,funcmap...) +(cabid <= 0 ? 0 : 1)
const byte RMFT2::rosterNameCount=0 const byte RMFT2::rosterNameCount=0
#include "myAutomation.h" #include "myAutomation.h"
; ;

2
GITHUB_SHA.h
View File

@ -1 +1 @@
#define GITHUB_SHA "devel-202305222043Z" #define GITHUB_SHA "devel-202305231659Z"

4
WiThrottle.cpp
View File

@ -531,11 +531,13 @@ void WiThrottle::sendRoster(Print* stream) {
rosterSent=true; rosterSent=true;
#ifdef EXRAIL_ACTIVE #ifdef EXRAIL_ACTIVE
StringFormatter::send(stream,F("RL%d"), RMFT2::rosterNameCount); StringFormatter::send(stream,F("RL%d"), RMFT2::rosterNameCount);
for (int16_t r=0;r<RMFT2::rosterNameCount;r++) { for (int16_t r=0;;r++) {
int16_t cabid=GETHIGHFLASHW(RMFT2::rosterIdList,r*2); int16_t cabid=GETHIGHFLASHW(RMFT2::rosterIdList,r*2);
if (cabid > 0) if (cabid > 0)
StringFormatter::send(stream,F("]\\[%S}|{%d}|{%c"), StringFormatter::send(stream,F("]\\[%S}|{%d}|{%c"),
RMFT2::getRosterName(cabid),cabid,cabid<128?'S':'L'); RMFT2::getRosterName(cabid),cabid,cabid<128?'S':'L');
else if (cabid == INT16_MAX)
break;
} }
StringFormatter::send(stream,F("\n")); StringFormatter::send(stream,F("\n"));
#else #else