From 0b6b7bcb0d5137adda993af8656b2044f413614c Mon Sep 17 00:00:00 2001 From: Harald Barth Date: Mon, 30 Sep 2024 13:14:23 +0200 Subject: [PATCH] Make it compile for ESP32 (BUSY is a global symbol :-() --- EXRAIL2Parser.cpp | 1 + Railcom.cpp | 6 +++--- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/EXRAIL2Parser.cpp b/EXRAIL2Parser.cpp index 61cd18b..97c0278 100644 --- a/EXRAIL2Parser.cpp +++ b/EXRAIL2Parser.cpp @@ -210,6 +210,7 @@ void RMFT2::ComandFilter(Print * stream, byte & opcode, byte & paramCount, int16 default: break; } + break; case 'K': // Block enter case 'k': // Block exit diff --git a/Railcom.cpp b/Railcom.cpp index 9b49a1f..dabdced 100644 --- a/Railcom.cpp +++ b/Railcom.cpp @@ -49,7 +49,7 @@ **/ #include "Railcom.h" -#include +#include "FSH.h" /** Table for 8-to-6 decoding of railcom data. This table can be indexed by the * 8-bit value read from the railcom channel, and the return value will be @@ -70,7 +70,7 @@ /// The decoder is busy; send the packet again. This is typically /// returned when a POM CV write is still pending; the caller must /// re-try sending the packet later. - BUSY = 0xfc, + RCBUSY = 0xfc, /// Reserved for future expansion. RESVD1 = 0xfb, @@ -107,7 +107,7 @@ const uint8_t HIGHFLASH decode[256] = INV, 0x2A, 0x2F, INV, 0x31, INV, INV, INV, // c INV, 0x29, 0x2E, INV, 0x2D, INV, INV, INV, // d 0x2C, INV, INV, INV, INV, INV, INV, INV, // d - INV, BUSY, 0x28, INV, 0x27, INV, INV, INV, // e + INV, RCBUSY, 0x28, INV, 0x27, INV, INV, INV, // e 0x26, INV, INV, INV, INV, INV, INV, INV, // e ACK, INV, INV, INV, INV, INV, INV, INV, // f INV, INV, INV, INV, INV, INV, INV, INV, // f