dani/CommandStation-EX
1
0
Fork 0
mirror of https://github.com/DCC-EX/CommandStation-EX.git synced 2024-11-26 17:46:14 +01:00
Code Releases Activity

Transmit DCC packet to loco

Browse Source
This commit is contained in:
Harald Barth 2021-11-15 22:28:30 +01:00
parent 10209ed6f3
commit 005ddef665
5 changed files with 78 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

75
DCCRMT.cpp
View File

@ -55,7 +55,7 @@ void setEOT(rmt_item32_t* item) {
void IRAM_ATTR interrupt(rmt_channel_t channel, void *t) {
RMTPin *tt = (RMTPin *)t;
tt->RMTinterrupt(channel);
tt->RMTinterrupt();
}
RMTPin::RMTPin(byte pin, byte ch, byte plen) {
@ -65,7 +65,7 @@ RMTPin::RMTPin(byte pin, byte ch, byte plen) {
preamble = (rmt_item32_t*)malloc(preambleLen*sizeof(rmt_item32_t));
for (byte n=0; n<plen; n++)
setDCCBit1(preamble + n); // preamble bits
setDCCBit0Last(preamble + plen); // start of packet 0 bit
setDCCBit0(preamble + plen); // start of packet 0 bit
setEOT(preamble + plen + 1); // EOT marker
// idle
@ -81,6 +81,10 @@ RMTPin::RMTPin(byte pin, byte ch, byte plen) {
setDCCBit0Last(idle + 27); // finish always with 0
setEOT(idle + 28); // EOT marker
// data: max packet size today is 5 + checksum
dataLen = (5+1)*9+2; // Each byte has one bit extra and one 0 bit and one EOF marker
data = (rmt_item32_t*)malloc(dataLen*sizeof(rmt_item32_t));
rmt_config_t config;
// Configure the RMT channel for TX
bzero(&config, sizeof(rmt_config_t));
@ -88,9 +92,10 @@ RMTPin::RMTPin(byte pin, byte ch, byte plen) {
config.channel = channel = (rmt_channel_t)ch;
config.clk_div = 1; // use 80Mhz clock directly
config.gpio_num = (gpio_num_t)pin;
config.mem_block_num = 1; // With MAX_PACKET_SIZE = 5 and number of bits needed
// MAX_PACKET_SIZE+1 * 8 + MAX_PACKET_SIZE = 54 one
// mem block of 64 RMT items (=DCC bits) should be enough
config.mem_block_num = 2; // With longest DCC packet 11 inc checksum (future expansion)
// number of bits needed is 22preamble + start +
// 11*9 + extrazero + EOT = 124
// 2 mem block of 64 RMT items should be enough
// this was not our problem https://esp32.com/viewtopic.php?t=5252
//periph_module_disable(PERIPH_RMT_MODULE);
@ -114,24 +119,54 @@ RMTPin::RMTPin(byte pin, byte ch, byte plen) {
// send one bit to kickstart the signal, remaining data will come from the
// packet queue. We intentionally do not wait for the RMT TX complete here.
rmt_write_items(channel, preamble, preambleLen, false);
preambleNext = false;
dataNext = false;
//rmt_write_items(channel, preamble, preambleLen, false);
RMTprefill();
preambleNext = true;
dataReady = false;
RMTinterrupt();
}
void IRAM_ATTR RMTPin::RMTinterrupt(rmt_channel_t channel) {
void RMTPin::RMTprefill() {
rmt_fill_tx_items(channel, preamble, preambleLen, 0);
rmt_fill_tx_items(channel, idle, idleLen, preambleLen-1);
}
if (preambleNext) {
rmt_fill_tx_items(channel, preamble, preambleLen, 0);
preambleNext = false;
} else {
if (dataNext) {
rmt_fill_tx_items(channel, packetBits, packetLen, 0);
} else {
// here we should not get as now we need to send idle packet
rmt_fill_tx_items(channel, idle, idleLen, 0);
const byte transmitMask[] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01};
bool RMTPin::fillData(const byte buffer[], byte byteCount, byte repeatCount=1) {
if (dataReady == true || dataRepeat > 0) // we have still old work to do
return false;
byte bitcounter = 0;
for(byte n=0; n<byteCount; n++) {
for(byte bit=0; bit<8; bit++) {
if (buffer[n] & transmitMask[bit])
setDCCBit1(data + bitcounter++);
else
setDCCBit0(data + bitcounter++);
}
preambleNext = true;
setDCCBit0(data + bitcounter++); // zero at end of each byte
}
rmt_tx_start(channel,true);
setDCCBit1(data + bitcounter-1); // overwrite previous zero bit with one bit
setDCCBit0Last(data + bitcounter++); // extra 0 bit after end bit
setEOT(data + bitcounter++); // EOT marker
dataLen = bitcounter;
dataReady = true;
dataRepeat = repeatCount;
return true;
}
void IRAM_ATTR RMTPin::RMTinterrupt() {
rmt_tx_start(channel,true);
/* byte foo[3];
foo[0] = 0xF0;
foo[1] = 0x0F;
foo[2] = 0xAA;
fillData(foo, 3);*/
if (dataReady) {
rmt_fill_tx_items(channel, data, dataLen, preambleLen-1);
dataReady = false;
}
if (dataRepeat > 0)
dataRepeat--;
return;
}

11
DCCRMT.h
View File

@ -29,7 +29,9 @@
class RMTPin {
public:
RMTPin(byte pin, byte ch, byte plen);
void IRAM_ATTR RMTinterrupt(rmt_channel_t);
void IRAM_ATTR RMTinterrupt();
void RMTprefill();
bool fillData(const byte buffer[], byte byteCount, byte repeatCount);
static RMTPin mainRMTPin;
static RMTPin progRMTPin;
@ -43,9 +45,10 @@ class RMTPin {
byte idleLen;
rmt_item32_t *preamble;
byte preambleLen;
rmt_item32_t packetBits[64];
byte packetLen;
rmt_item32_t *data;
byte dataLen;
// flags
volatile bool preambleNext = true; // alternate between preamble and content
volatile bool dataNext = false; // do we have real data available or send idle
volatile bool dataReady = false; // do we have real data available or send idle
volatile byte dataRepeat = 0;
};

14
DCCWaveform.cpp
View File

@ -25,7 +25,6 @@
#include "DCCTimer.h"
#include "DIAG.h"
#include "freeMemory.h"
#include "DCCRMT.h"
DCCWaveform DCCWaveform::mainTrack(PREAMBLE_BITS_MAIN, true);
DCCWaveform DCCWaveform::progTrack(PREAMBLE_BITS_PROG, false);
@ -39,7 +38,7 @@ uint8_t DCCWaveform::trailingEdgeCounter=0;
void DCCWaveform::begin(MotorDriver * mainDriver, MotorDriver * progDriver) {
RMTPin *p = new RMTPin(21, 0, PREAMBLE_BITS_MAIN);
mainTrack.rmtPin = new RMTPin(21, 0, PREAMBLE_BITS_MAIN);
mainTrack.motorDriver=mainDriver;
progTrack.motorDriver=progDriver;
@ -64,6 +63,13 @@ volatile bool ackflag = 0;
#endif
void IRAM_ATTR DCCWaveform::loop(bool ackManagerActive) {
if (mainTrack.packetPendingRMT) {
mainTrack.rmtPin->fillData(mainTrack.pendingPacket, mainTrack.pendingLength, mainTrack.pendingRepeats);
mainTrack.packetPendingRMT=false;
// sentResetsSincePacket = 0 // later when progtrack
}
#ifdef SLOW_ANALOG_READ
if (ackflag) {
progTrack.checkAck();
@ -122,6 +128,7 @@ const byte bitMask[] = {0x00, 0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01};
DCCWaveform::DCCWaveform( byte preambleBits, bool isMain) {
isMainTrack = isMain;
packetPending = false;
packetPendingRMT = false;
memcpy(transmitPacket, idlePacket, sizeof(idlePacket));
state = WAVE_START;
// The +1 below is to allow the preamble generator to create the stop bit
@ -290,7 +297,7 @@ void IRAM_ATTR DCCWaveform::interrupt2() {
// Wait until there is no packet pending, then make this pending
void DCCWaveform::schedulePacket(const byte buffer[], byte byteCount, byte repeats) {
if (byteCount > MAX_PACKET_SIZE) return; // allow for chksum
while (packetPending);
while (packetPending||packetPendingRMT);
portENTER_CRITICAL(&timerMux);
byte checksum = 0;
for (byte b = 0; b < byteCount; b++) {
@ -302,6 +309,7 @@ void DCCWaveform::schedulePacket(const byte buffer[], byte byteCount, byte repea
pendingLength = byteCount + 1;
pendingRepeats = repeats;
packetPending = true;
packetPendingRMT = true;
sentResetsSincePacket=0;
portEXIT_CRITICAL(&timerMux);
}

3
DCCWaveform.h
View File

@ -20,6 +20,7 @@
#ifndef DCCWaveform_h
#define DCCWaveform_h
#include "DCCRMT.h"
#include "MotorDriver.h"
// Wait times for power management. Unit: milliseconds
@ -82,6 +83,7 @@ class DCCWaveform {
}
void schedulePacket(const byte buffer[], byte byteCount, byte repeats);
volatile bool packetPending;
volatile bool packetPendingRMT;
volatile byte sentResetsSincePacket;
volatile bool autoPowerOff=false;
void setAckBaseline(); //prog track only
@ -122,6 +124,7 @@ class DCCWaveform {
bool isMainTrack;
MotorDriver* motorDriver;
RMTPin* rmtPin;
// Transmission controller
byte transmitPacket[MAX_PACKET_SIZE+1]; // +1 for checksum
byte transmitLength;

2
GITHUB_SHA.h
View File

@ -1 +1 @@
#define GITHUB_SHA "ESP32-2021114-15:35"
#define GITHUB_SHA "ESP32-2021115-22:27"