mirror of
https://github.com/DCC-EX/CommandStation-EX.git
synced 2024-11-25 09:06:13 +01:00
Compare commits
No commits in common. "50313ebbd2fd8d92ced50289b310ddafa0057e21" and "342d9263d1cfabf45c346081e62579c038d7a3b8" have entirely different histories.
50313ebbd2
...
342d9263d1
|
@ -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%l<;>%d\n"), (int32_t)time*60, rate);
|
broadcastReply(WITHROTTLE_TYPE, F("PFT%d<;>%d\n"), time*60, rate);
|
||||||
#endif
|
#endif
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
#define GITHUB_SHA "devel-202305242057Z"
|
#define GITHUB_SHA "devel-202305241131Z"
|
||||||
|
|
|
@ -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==INT16_MAX) break;
|
if (id==0) 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==INT16_MAX) break;
|
if (id==0) 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);
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user