mirror of
https://github.com/DCC-EX/CommandStation-EX.git
synced 2024-11-26 17:46:14 +01:00
Compare commits
2 Commits
7395aa4af8
...
6fa5511670
Author | SHA1 | Date | |
---|---|---|---|
|
6fa5511670 | ||
|
c07ac38ab1 |
|
@ -478,10 +478,15 @@ bool RMFT2::skipIfBlock() {
|
||||||
|
|
||||||
|
|
||||||
/* static */ void RMFT2::readLocoCallback(int16_t cv) {
|
/* static */ void RMFT2::readLocoCallback(int16_t cv) {
|
||||||
|
if (cv <= 0) {
|
||||||
|
DIAG(F("CV read error"));
|
||||||
|
progtrackLocoId = -1;
|
||||||
|
return;
|
||||||
|
}
|
||||||
if (cv & LONG_ADDR_MARKER) { // maker bit indicates long addr
|
if (cv & LONG_ADDR_MARKER) { // maker bit indicates long addr
|
||||||
progtrackLocoId = cv ^ LONG_ADDR_MARKER; // remove marker bit to get real long addr
|
progtrackLocoId = cv ^ LONG_ADDR_MARKER; // remove marker bit to get real long addr
|
||||||
if (progtrackLocoId <= HIGHEST_SHORT_ADDR ) { // out of range for long addr
|
if (progtrackLocoId <= HIGHEST_SHORT_ADDR ) { // out of range for long addr
|
||||||
DIAG(F("Long addr %d <= %d unsupported\n"), progtrackLocoId, HIGHEST_SHORT_ADDR);
|
DIAG(F("Long addr %d <= %d unsupported"), progtrackLocoId, HIGHEST_SHORT_ADDR);
|
||||||
progtrackLocoId = -1;
|
progtrackLocoId = -1;
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
#define GITHUB_SHA "devel-202408291145Z"
|
#define GITHUB_SHA "devel-202409040713Z"
|
||||||
|
|
|
@ -3,7 +3,8 @@
|
||||||
|
|
||||||
#include "StringFormatter.h"
|
#include "StringFormatter.h"
|
||||||
|
|
||||||
#define VERSION "5.2.75"
|
#define VERSION "5.2.76"
|
||||||
|
// 5.2.76 - Bugfix: EXRAIL: Catch CV read errors in the callback
|
||||||
// 5.2.75 - Bugfix: Serial lines 4 to 6 OK
|
// 5.2.75 - Bugfix: Serial lines 4 to 6 OK
|
||||||
// 5.2.74 - Bugfix: ESP32 turn on the joined prog (as main) again after a prog operation
|
// 5.2.74 - Bugfix: ESP32 turn on the joined prog (as main) again after a prog operation
|
||||||
// 5.2.73 - Bugfix: STM32 further fixes to shadowPORT entries in TrackManager.cpp for PORTG and PORTH
|
// 5.2.73 - Bugfix: STM32 further fixes to shadowPORT entries in TrackManager.cpp for PORTG and PORTH
|
||||||
|
|
Loading…
Reference in New Issue
Block a user