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

cleanup comments

Browse Source
This commit is contained in:
Harald Barth 2021-11-15 23:10:23 +01:00
parent 005ddef665
commit 114686d124
4 changed files with 14 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
DCCRMT.cpp
View File

@ -21,9 +21,6 @@
#include "DIAG.h" #include "DIAG.h"
#include "DCCRMT.h" #include "DCCRMT.h"
//#include "soc/periph_defs.h"
//#include "driver/periph_ctrl.h"
#if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(4,2,0) #if ESP_IDF_VERSION < ESP_IDF_VERSION_VAL(4,2,0)
#error wrong IDF version #error wrong IDF version
#endif #endif
@ -82,8 +79,8 @@ RMTPin::RMTPin(byte pin, byte ch, byte plen) {
setEOT(idle + 28); // EOT marker setEOT(idle + 28); // EOT marker
// data: max packet size today is 5 + checksum // 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 maxDataLen = (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)); data = (rmt_item32_t*)malloc(maxDataLen*sizeof(rmt_item32_t));
rmt_config_t config; rmt_config_t config;
// Configure the RMT channel for TX // Configure the RMT channel for TX
@ -97,10 +94,6 @@ RMTPin::RMTPin(byte pin, byte ch, byte plen) {
// 11*9 + extrazero + EOT = 124 // 11*9 + extrazero + EOT = 124
// 2 mem block of 64 RMT items should be enough // 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);
//periph_module_enable(PERIPH_RMT_MODULE);
ESP_ERROR_CHECK(rmt_config(&config)); ESP_ERROR_CHECK(rmt_config(&config));
// NOTE: ESP_INTR_FLAG_IRAM is *NOT* included in this bitmask // NOTE: ESP_INTR_FLAG_IRAM is *NOT* included in this bitmask
ESP_ERROR_CHECK(rmt_driver_install(config.channel, 0, ESP_INTR_FLAG_LOWMED|ESP_INTR_FLAG_SHARED)); ESP_ERROR_CHECK(rmt_driver_install(config.channel, 0, ESP_INTR_FLAG_LOWMED|ESP_INTR_FLAG_SHARED));
@ -110,11 +103,6 @@ RMTPin::RMTPin(byte pin, byte ch, byte plen) {
rmt_register_tx_end_callback(interrupt, this); rmt_register_tx_end_callback(interrupt, this);
rmt_set_tx_intr_en(channel, true); rmt_set_tx_intr_en(channel, true);
// rmt_set_source_clk() // not needed as APB only supported currently
//rmt_register_tx_end_callback()
DIAG(F("Starting channel %d signal generator"), config.channel); DIAG(F("Starting channel %d signal generator"), config.channel);
// send one bit to kickstart the signal, remaining data will come from the // send one bit to kickstart the signal, remaining data will come from the
@ -133,9 +121,13 @@ void RMTPin::RMTprefill() {
const byte transmitMask[] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01}; const byte transmitMask[] = {0x80, 0x40, 0x20, 0x10, 0x08, 0x04, 0x02, 0x01};
bool RMTPin::fillData(const byte buffer[], byte byteCount, byte repeatCount=1) { bool RMTPin::RMTfillData(const byte buffer[], byte byteCount, byte repeatCount=1) {
if (dataReady == true || dataRepeat > 0) // we have still old work to do if (dataReady == true || dataRepeat > 0) // we have still old work to do
return false; return false;
if (byteCount*9+2 > maxDataLen) // this would overun our allocated memory for data
return false; // something very broken, can not convert packet
// convert bytes to RMT stream of "bits"
byte bitcounter = 0; byte bitcounter = 0;
for(byte n=0; n<byteCount; n++) { for(byte n=0; n<byteCount; n++) {
for(byte bit=0; bit<8; bit++) { for(byte bit=0; bit<8; bit++) {
@ -156,17 +148,12 @@ bool RMTPin::fillData(const byte buffer[], byte byteCount, byte repeatCount=1) {
} }
void IRAM_ATTR RMTPin::RMTinterrupt() { void IRAM_ATTR RMTPin::RMTinterrupt() {
rmt_tx_start(channel,true); rmt_tx_start(channel,true); // preamble is always loaded, stat right away
/* byte foo[3]; if (dataReady) { // if we have new data, fill while preamble is running
foo[0] = 0xF0;
foo[1] = 0x0F;
foo[2] = 0xAA;
fillData(foo, 3);*/
if (dataReady) {
rmt_fill_tx_items(channel, data, dataLen, preambleLen-1); rmt_fill_tx_items(channel, data, dataLen, preambleLen-1);
dataReady = false; dataReady = false;
} }
if (dataRepeat > 0) if (dataRepeat > 0) // if a repeat count was specified, work on that
dataRepeat--; dataRepeat--;
return; return;
} }

3
DCCRMT.h
View File

@ -31,7 +31,7 @@ class RMTPin {
RMTPin(byte pin, byte ch, byte plen); RMTPin(byte pin, byte ch, byte plen);
void IRAM_ATTR RMTinterrupt(); void IRAM_ATTR RMTinterrupt();
void RMTprefill(); void RMTprefill();
bool fillData(const byte buffer[], byte byteCount, byte repeatCount); bool RMTfillData(const byte buffer[], byte byteCount, byte repeatCount);
static RMTPin mainRMTPin; static RMTPin mainRMTPin;
static RMTPin progRMTPin; static RMTPin progRMTPin;
@ -47,6 +47,7 @@ class RMTPin {
byte preambleLen; byte preambleLen;
rmt_item32_t *data; rmt_item32_t *data;
byte dataLen; byte dataLen;
byte maxDataLen;
// flags // flags
volatile bool preambleNext = true; // alternate between preamble and content volatile bool preambleNext = true; // alternate between preamble and content
volatile bool dataReady = false; // do we have real data available or send idle volatile bool dataReady = false; // do we have real data available or send idle

2
DCCWaveform.cpp
View File

@ -65,7 +65,7 @@ volatile bool ackflag = 0;
void IRAM_ATTR DCCWaveform::loop(bool ackManagerActive) { void IRAM_ATTR DCCWaveform::loop(bool ackManagerActive) {
if (mainTrack.packetPendingRMT) { if (mainTrack.packetPendingRMT) {
mainTrack.rmtPin->fillData(mainTrack.pendingPacket, mainTrack.pendingLength, mainTrack.pendingRepeats); mainTrack.rmtPin->RMTfillData(mainTrack.pendingPacket, mainTrack.pendingLength, mainTrack.pendingRepeats);
mainTrack.packetPendingRMT=false; mainTrack.packetPendingRMT=false;
// sentResetsSincePacket = 0 // later when progtrack // sentResetsSincePacket = 0 // later when progtrack
} }

2
GITHUB_SHA.h
View File

@ -1 +1 @@
#define GITHUB_SHA "ESP32-2021115-22:27" #define GITHUB_SHA "ESP32-2021115-23:10"