diff --git a/DCCRMT.cpp b/DCCRMT.cpp index ac97d0d..4c5fe4e 100644 --- a/DCCRMT.cpp +++ b/DCCRMT.cpp @@ -138,14 +138,14 @@ RMTChannel::RMTChannel(pinpair pins, bool isMain) { // 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)); - DIAG(F("Register interrupt on core %d"), xPortGetCoreID()); + // DIAG(F("Register interrupt on core %d"), xPortGetCoreID()); ESP_ERROR_CHECK(rmt_set_tx_loop_mode(channel, true)); channelHandle[channel] = this; // used by interrupt rmt_register_tx_end_callback(interrupt, 0); rmt_set_tx_intr_en(channel, true); - DIAG(F("Starting channel %d signal generator for %s"), config.channel, isMain ? "MAIN" : "PROG"); + DIAG(F("Channel %d DCC signal for %s start"), config.channel, isMain ? "MAIN" : "PROG"); // 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. diff --git a/DCCWaveform.cpp b/DCCWaveform.cpp index ea3a970..2883579 100644 --- a/DCCWaveform.cpp +++ b/DCCWaveform.cpp @@ -213,10 +213,10 @@ void DCCWaveform::begin() { for(const auto& md: TrackManager::getMainDrivers()) { pinpair p = md->getSignalPin(); if(rmtMainChannel) { - DIAG(F("added pins %d %d to MAIN channel"), p.pin, p.invpin); + // DIAG(F("added pins %d %d to MAIN channel"), p.pin, p.invpin); rmtMainChannel->addPin(p); // add pin to existing main channel } else { - DIAG(F("new MAIN channel with pins %d %d"), p.pin, p.invpin); + // DIAG(F("new MAIN channel with pins %d %d"), p.pin, p.invpin); rmtMainChannel = new RMTChannel(p, true); /* create new main channel */ } } @@ -224,10 +224,10 @@ void DCCWaveform::begin() { if (md) { pinpair p = md->getSignalPin(); if (rmtProgChannel) { - DIAG(F("added pins %d %d to PROG channel"), p.pin, p.invpin); + // DIAG(F("added pins %d %d to PROG channel"), p.pin, p.invpin); rmtProgChannel->addPin(p); // add pin to existing prog channel } else { - DIAG(F("new PROGchannel with pins %d %d"), p.pin, p.invpin); + // DIAG(F("new PROGchannel with pins %d %d"), p.pin, p.invpin); rmtProgChannel = new RMTChannel(p, false); } } diff --git a/GITHUB_SHA.h b/GITHUB_SHA.h index e7183e3..56000ec 100644 --- a/GITHUB_SHA.h +++ b/GITHUB_SHA.h @@ -1 +1 @@ -#define GITHUB_SHA "PORTX-HAL-20220809" +#define GITHUB_SHA "PORTX-HAL-20220813" diff --git a/TrackManager.cpp b/TrackManager.cpp index c082c95..23a833d 100644 --- a/TrackManager.cpp +++ b/TrackManager.cpp @@ -141,7 +141,7 @@ bool TrackManager::setTrackMode(byte trackToSet, TRACK_MODE mode, int16_t dcAddr #ifdef ARDUINO_ARCH_ESP32 // remove pin from MUX matrix and turn it off pinpair p = track[trackToSet]->getSignalPin(); - DIAG(F("Track=%c remove pin %d"),trackToSet+'A', p.pin); + // DIAG(F("Track=%c remove pin %d"),trackToSet+'A', p.pin); gpio_reset_pin((gpio_num_t)p.pin); pinMode(p.pin, OUTPUT); // gpio_reset_pin may reset to input if (p.invpin != UNUSED_PIN) {