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

DCCAccessoryDecoder class tidy. RCN-213 option.

Browse Source 
Rationalise address calculation into three macros.  Ensure device is added to device chain.
Allow inversion of the DCC packet to match definition of packet D bit in RCN-213, D=0 for 'throw' (rather than the DCC++ usage of D=1 for 'throw').
This commit is contained in:
Neil McKechnie 2021-08-27 21:47:13 +01:00
parent fb6ab85c4a
commit 7dea284ba8
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
IO_DCCAccessory.cpp
View File

@ -20,25 +20,30 @@
#include "DCC.h" #include "DCC.h"
#include "IODevice.h" #include "IODevice.h"
#include "DIAG.h" #include "DIAG.h"
#include "defines.h"
// Note: For DCC Accessory Decoders, a particular output can be specified by // Note: For DCC Accessory Decoders, a particular output can be specified by
// a linear address, or by an address/subaddress pair, where the subaddress is // a linear address, or by an address/subaddress pair, where the subaddress is
// in the range 0 to 3 and specifies an output within a group of 4. // in the range 0 to 3 and specifies an output within a group of 4.
// NMRA and DCC++EX accepts addresses in the range 0-511. Linear addresses // NMRA and DCC++EX accepts addresses in the range 0-511. Linear addresses
// are not specified by the NMRA and so different manufacturers may calculate them // are not specified by the NMRA and so different manufacturers may calculate them
// in different ways. DCC+EX uses a range of 1-2044 which excludes decoder address 0. // in different ways. DCC++EX uses a range of 1-2044 which excludes decoder address 0.
// Therefore, I've avoided using linear addresses here because of the ambiguities // Linear address 1 corresponds to address 1 subaddress 0.
// involved. Instead I've used the term 'packedAddress'.
#define LINEARADDRESS(addr, subaddr) (((addr-1) << 2) + subaddr + 1)
#define ADDRESS(linearaddr) (((linearaddr-1) >> 2) + 1)
#define SUBADDRESS(linearaddr) ((linearaddr-1) % 4)
void DCCAccessoryDecoder::create(VPIN vpin, int nPins, int DCCAddress, int DCCSubaddress) { void DCCAccessoryDecoder::create(VPIN vpin, int nPins, int DCCAddress, int DCCSubaddress) {
new DCCAccessoryDecoder(vpin, nPins, DCCAddress, DCCSubaddress); new DCCAccessoryDecoder(vpin, nPins, DCCAddress, DCCSubaddress);
} }
// Constructor // Constructors
DCCAccessoryDecoder::DCCAccessoryDecoder(VPIN vpin, int nPins, int DCCAddress, int DCCSubaddress) { DCCAccessoryDecoder::DCCAccessoryDecoder(VPIN vpin, int nPins, int DCCAddress, int DCCSubaddress) {
_firstVpin = vpin; _firstVpin = vpin;
_nPins = nPins; _nPins = nPins;
_packedAddress = (DCCAddress << 2) + DCCSubaddress; _packedAddress = LINEARADDRESS(DCCAddress, DCCSubaddress);
addDevice(this);
} }
void DCCAccessoryDecoder::_begin() { void DCCAccessoryDecoder::_begin() {
@ -47,19 +52,22 @@ void DCCAccessoryDecoder::_begin() {
#endif #endif
} }
// Device-specific write function. // Device-specific write function. State 1=closed, 0=thrown. Adjust for RCN-213 compliance
void DCCAccessoryDecoder::_write(VPIN id, int state) { void DCCAccessoryDecoder::_write(VPIN id, int state) {
int packedAddress = _packedAddress + id - _firstVpin; int packedAddress = _packedAddress + id - _firstVpin;
#ifdef DIAG_IO #ifdef DIAG_IO
DIAG(F("DCC Write Linear Address:%d State:%d"), packedAddress, state); DIAG(F("DCC Write Linear Address:%d State:%d"), packedAddress, state);
#endif #endif
DCC::setAccessory(packedAddress >> 2, packedAddress % 4, state); #if !defined(DCC_ACCESSORY_RCN_213)
state = !state;
#endif
DCC::setAccessory(ADDRESS(packedAddress), SUBADDRESS(packedAddress), state);
} }
void DCCAccessoryDecoder::_display() { void DCCAccessoryDecoder::_display() {
int endAddress = _packedAddress + _nPins - 1; int endAddress = _packedAddress + _nPins - 1;
DIAG(F("DCCAccessoryDecoder Configured on Vpins:%d-%d Linear Address:%d-%d (%d/%d-%d/%d)"), _firstVpin, _firstVpin+_nPins-1, DIAG(F("DCCAccessoryDecoder Configured on Vpins:%d-%d Linear Address:%d-%d (%d/%d-%d/%d)"), _firstVpin, _firstVpin+_nPins-1,
_packedAddress, _packedAddress+_nPins-1, _packedAddress, _packedAddress+_nPins-1,
_packedAddress >> 2, _packedAddress % 4, endAddress >> 2, endAddress % 4); ADDRESS(_packedAddress), SUBADDRESS(_packedAddress), ADDRESS(endAddress), SUBADDRESS(endAddress));
} }