rejoe2
1 year ago
committed by
GitHub
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with
16 additions and
12 deletions
-
src/hm/Communication.h
-
src/hm/hmRadio.h
-
src/hm/radio.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")); |
|
|
|
|
|
@ -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); |
|
|
|
|
|
@ -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; |
|
|
|