dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-11-22 23:56:13 +01:00
Code Releases Activity

<r> response and timing issue.

Browse Source
This commit is contained in:
Asbelos 2024-10-24 09:43:52 +01:00
parent 44869a549d
commit 158cb47474
4 changed files with 26 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
DCCEXParser.cpp
View File

@ -78,8 +78,8 @@ Once a new OPCODE is decided upon, update this list.
P, Write DCC packet P, Write DCC packet
q, Sensor deactivated q, Sensor deactivated
Q, Sensor activated Q, Sensor activated
r, Broadcast address read on programming track r, Read cv on main (Railcom)
R, Read CVs R, Read CVs response r
s, Display status s, Display status
S, Sensor configuration S, Sensor configuration
t, Cab/loco update command t, Cab/loco update command
@ -1427,7 +1427,7 @@ void DCCEXParser::callback_R(int16_t result)
void DCCEXParser::callback_r(int16_t result) void DCCEXParser::callback_r(int16_t result)
{ {
StringFormatter::send(getAsyncReplyStream(), F("<r MAIN %d %d %d >\n"), stashP[0], stashP[1], result); StringFormatter::send(getAsyncReplyStream(), F("<r %d %d %d >\n"), stashP[0], stashP[1], result);
commitAsyncReplyStream(); commitAsyncReplyStream();
} }

11
DCCWaveform.cpp
View File

@ -168,6 +168,10 @@ void DCCWaveform::interrupt2() {
// cutout has ended so its now possible to poll the railcom detectors // cutout has ended so its now possible to poll the railcom detectors
// requiredPreambles is one higher that preamble length so // requiredPreambles is one higher that preamble length so
// if preamble length is 16 then this evaluates to 5 // if preamble length is 16 then this evaluates to 5
// Remember address bytes of last sent packet so that Railcom can
// work out where the channel2 data came from.
railcomLastAddressHigh=transmitPacket[0];
railcomLastAddressLow =transmitPacket[1];
railcomSampleWindow=true; railcomSampleWindow=true;
} else if (remainingPreambles==(requiredPreambles-3)) { } else if (remainingPreambles==(requiredPreambles-3)) {
// cutout can be ended when read // cutout can be ended when read
@ -233,13 +237,6 @@ void DCCWaveform::promotePendingPacket() {
transmitRepeats--; transmitRepeats--;
return; return;
} }
if (isMainTrack) {
// Remember address bytes of last sent packet so that Railcom can
// work out where the channel2 data came from.
railcomLastAddressHigh=transmitPacket[0];
railcomLastAddressLow =transmitPacket[1];
}
if (packetPending) { if (packetPending) {
// Copy pending packet to transmit packet // Copy pending packet to transmit packet

4
Railcom.cpp
View File

@ -20,7 +20,9 @@
*/ */
/** Sections of this code (the decode table constants) /** Sections of this code (the decode table constants)
* are taken from openmrn under the following copyright. * are taken from openmrn
* https://github.com/bakerstu/openmrn/blob/master/src/dcc/RailCom.cxx
* under the following copyright.
* *
* Copyright (c) 2014, Balazs Racz * Copyright (c) 2014, Balazs Racz
* All rights reserved. * All rights reserved.

16
Release_Notes/Railcom.md
View File

@ -48,4 +48,20 @@ Making use of Railcom data
EITHER - The leaving loco enters another railcom block EITHER - The leaving loco enters another railcom block
OR - only ONE loco remains in the block just left. OR - only ONE loco remains in the block just left.
To further support block management in railcom, two additional serial commands are available
`<K block loco >` to simulate a loco entering a block, and trigger any ONBLOCKENTER
`<k block loco >` to simulate a loco leaving a block, and trigger and ONBLOCKEXIT
Reading CV values on MAIN.
Railcom allows for the facility to read loco cv values while on the main track. This is considerably faster than PROG track access but depends on the loco being in a Railcom monitored block.
To read from prog Track we use `<R cv>` response is `<r value>`
To read from main track use `<r loco cv>`
response is `<r loco cv value>`