dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-12-25 05:31:24 +01:00
Code Releases Activity

Merge branch 'master' of https://github.com/DCC-EX/CommandStation-EX

Browse Source
This commit is contained in:
Neil McKechnie 2021-11-24 13:00:31 +00:00
commit a2f8a8ec91
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
GITHUB_SHA.h
View File

@ -1 +1 @@
#define GITHUB_SHA "197228c" #define GITHUB_SHA "88fa5ad"

6
RMFT2.cpp
View File

@ -720,10 +720,10 @@ void RMFT2::kill(const FSH * reason, int operand) {
byte opcode=GET_OPCODE; byte opcode=GET_OPCODE;
if (opcode==OPCODE_ENDEXRAIL) return; if (opcode==OPCODE_ENDEXRAIL) return;
if (opcode!=OPCODE_SIGNAL) continue; if (opcode!=OPCODE_SIGNAL) continue;
byte redpin=GET_OPERAND(0); VPIN redpin=GET_OPERAND(0);
if (redpin!=id)continue; if (redpin!=id)continue;
byte amberpin=GET_OPERAND(1); VPIN amberpin=GET_OPERAND(1);
byte greenpin=GET_OPERAND(2); VPIN greenpin=GET_OPERAND(2);
// If amberpin is zero, synthesise amber from red+green // If amberpin is zero, synthesise amber from red+green
IODevice::write(redpin,red || (amber && (amberpin==0))); IODevice::write(redpin,red || (amber && (amberpin==0)));
if (amberpin) IODevice::write(amberpin,amber); if (amberpin) IODevice::write(amberpin,amber);