1
0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-11-25 00:56:13 +01:00

Compare commits

...

2 Commits

Author SHA1 Message Date
Harald Barth
50313ebbd2 cast to big enough type 2023-05-24 22:58:21 +02:00
Harald Barth
72bfc6abc7 INT16_MAX missing again 2023-05-24 22:57:43 +02:00
3 changed files with 4 additions and 4 deletions

View File

@ -168,7 +168,7 @@ void CommandDistributor::broadcastClockTime(int16_t time, int8_t rate) {
// be safe for both types. // be safe for both types.
broadcastReply(COMMAND_TYPE, F("<jC %d %d>\n"),time, rate); broadcastReply(COMMAND_TYPE, F("<jC %d %d>\n"),time, rate);
#ifdef CD_HANDLE_RING #ifdef CD_HANDLE_RING
broadcastReply(WITHROTTLE_TYPE, F("PFT%d<;>%d\n"), time*60, rate); broadcastReply(WITHROTTLE_TYPE, F("PFT%l<;>%d\n"), (int32_t)time*60, rate);
#endif #endif
} }

View File

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

View File

@ -551,14 +551,14 @@ void WiThrottle::sendRoutes(Print* stream) {
// first pass automations // first pass automations
for (int ix=0;;ix+=2) { for (int ix=0;;ix+=2) {
int16_t id =GETHIGHFLASHW(RMFT2::automationIdList,ix); int16_t id =GETHIGHFLASHW(RMFT2::automationIdList,ix);
if (id==0) break; if (id==INT16_MAX) break;
const FSH * desc=RMFT2::getRouteDescription(id); const FSH * desc=RMFT2::getRouteDescription(id);
StringFormatter::send(stream,F("]\\[A%d}|{%S}|{4"),id,desc); StringFormatter::send(stream,F("]\\[A%d}|{%S}|{4"),id,desc);
} }
// second pass routes. // second pass routes.
for (int ix=0;;ix+=2) { for (int ix=0;;ix+=2) {
int16_t id=GETHIGHFLASHW(RMFT2::routeIdList,ix); int16_t id=GETHIGHFLASHW(RMFT2::routeIdList,ix);
if (id==0) break; if (id==INT16_MAX) break;
const FSH * desc=RMFT2::getRouteDescription(id); const FSH * desc=RMFT2::getRouteDescription(id);
StringFormatter::send(stream,F("]\\[R%d}|{%S}|{2"),id,desc); StringFormatter::send(stream,F("]\\[R%d}|{%S}|{2"),id,desc);
} }