From 8f5310ffd35dd7ea9b48af188ef5e95b1e0dc2fb Mon Sep 17 00:00:00 2001 From: rejoe2 Date: Tue, 23 Jan 2024 12:41:41 +0100 Subject: [PATCH] reduce serial output --- src/hm/Communication.h | 12 +++++++----- src/hm/hmRadio.h | 12 +++++++----- src/hm/radio.h | 4 ++-- 3 files changed, 16 insertions(+), 12 deletions(-) diff --git a/src/hm/Communication.h b/src/hm/Communication.h index 60e87918..b02c03b7 100644 --- a/src/hm/Communication.h +++ b/src/hm/Communication.h @@ -134,14 +134,16 @@ class Communication : public CommQueue<> { DPRINT_IVID(DBG_INFO, q->iv->id); DBGPRINT(F("request timeout: ")); DBGPRINT(String(q->iv->radio->mRadioWaitTime.getRunTime())); - DBGPRINT(F("ms")); - if(INV_RADIO_TYPE_NRF == q->iv->ivRadioType) { + DBGPRINTLN(F("ms")); + /*if(INV_RADIO_TYPE_NRF == q->iv->ivRadioType) { + DBGPRINT(F(", retries ")); + DBGPRINTLN(String(q->iv->radio->mTxRetriesNext)); DBGPRINT(F(", ARC ")); DBGPRINT(String(q->iv->radio->getARC())); DBGPRINT(F(", PLOS ")); DBGPRINTLN(String(q->iv->radio->getPLOS())); } else - DBGPRINTLN(""); + DBGPRINTLN("");*/ } if(!q->iv->mGotFragment) { if(INV_RADIO_TYPE_CMT == q->iv->ivRadioType) { @@ -295,10 +297,10 @@ class Communication : public CommQueue<> { DBGPRINT(String(p->millis)); DBGPRINT(F("ms | ")); DBGPRINT(String(p->len)); - DBGPRINT(F(", ARC ")); + /*DBGPRINT(F(", ARC ")); DBGPRINT(String(p->arc)); DBGPRINT(F(", PLOS ")); - DBGPRINT(String(p->plos)); + DBGPRINT(String(p->plos));*/ DBGPRINT(F(" |")); if(INV_RADIO_TYPE_NRF == q->iv->ivRadioType) { DBGPRINT(F(" CH")); diff --git a/src/hm/hmRadio.h b/src/hm/hmRadio.h index d41dc36a..9915a9a8 100644 --- a/src/hm/hmRadio.h +++ b/src/hm/hmRadio.h @@ -293,13 +293,13 @@ class HmRadio : public Radio { return mNrf24->isPVariant(); } - uint8_t getARC(void) { + /*uint8_t getARC(void) { return mNrf24->getARC(); } uint8_t getPLOS(void) { return mNrf24->getPLOS(); - } + }*/ private: inline bool getReceived(void) { @@ -315,8 +315,8 @@ class HmRadio : public Radio { p.len = (len > MAX_RF_PAYLOAD_SIZE) ? MAX_RF_PAYLOAD_SIZE : len; p.rssi = mNrf24->testRPD() ? -64 : -75; p.millis = millis() - mMillis; - p.arc = mNrf24->getARC(); - p.plos = mNrf24->getPLOS(); + //p.arc = mNrf24->getARC(); + //p.plos = mNrf24->getPLOS(); mNrf24->read(p.packet, p.len); if (p.packet[0] != 0x00) { @@ -370,7 +370,9 @@ class HmRadio : public Radio { DBGPRINT(String(len)); DBGPRINT(" CH"); DBGPRINT(String(mRfChLst[mTxChIdx])); - DBGPRINT(F(" | ")); + DBGPRINT(F(", ")); + DBGPRINT(String(mTxRetriesNext)); + DBGPRINT(F(" retries | ")); if(*mPrintWholeTrace) { if(*mPrivacyMode) ah::dumpBuf(mTxBuf, len, 1, 4); diff --git a/src/hm/radio.h b/src/hm/radio.h index e11d8682..e6baf792 100644 --- a/src/hm/radio.h +++ b/src/hm/radio.h @@ -29,8 +29,8 @@ class Radio { virtual bool switchFrequencyCh(Inverter<> *iv, uint8_t fromCh, uint8_t toCh) { return true; } virtual bool isChipConnected(void) { return false; } virtual bool loop(void) = 0; - virtual uint8_t getARC(void) { return 0xff; } - virtual uint8_t getPLOS(void) { return 0xff; } + //virtual uint8_t getARC(void) { return 0xff; } + //virtual uint8_t getPLOS(void) { return 0xff; } void handleIntr(void) { mIrqRcvd = true;