Browse Source

0.8.64

add ARC to timeout
pull/1394/head
lumapu 1 year ago
parent
commit
8c2b37ed9e
  1. 9
      src/hm/Communication.h
  2. 4
      src/hm/hmRadio.h
  3. 1
      src/hm/radio.h

9
src/hm/Communication.h

@ -134,10 +134,15 @@ class Communication : public CommQueue<> {
DPRINT_IVID(DBG_INFO, q->iv->id); DPRINT_IVID(DBG_INFO, q->iv->id);
DBGPRINT(F("request timeout: ")); DBGPRINT(F("request timeout: "));
DBGPRINT(String(q->iv->radio->mRadioWaitTime.getRunTime())); DBGPRINT(String(q->iv->radio->mRadioWaitTime.getRunTime()));
DBGPRINTLN(F("ms")); DBGPRINT(F("ms"));
if(INV_RADIO_TYPE_NRF == q->iv->ivRadioType) {
DBGPRINT(F(", ARC "));
DBGPRINTLN(String(q->iv->radio->getARC()));
} else
DBGPRINTLN("");
} }
if(!q->iv->mGotFragment) { if(!q->iv->mGotFragment) {
if(q->iv->ivRadioType == INV_RADIO_TYPE_CMT) { if(INV_RADIO_TYPE_CMT == q->iv->ivRadioType) {
q->iv->radio->switchFrequency(q->iv, HOY_BOOT_FREQ_KHZ, (q->iv->config->frequency*FREQ_STEP_KHZ + HOY_BASE_FREQ_KHZ)); q->iv->radio->switchFrequency(q->iv, HOY_BOOT_FREQ_KHZ, (q->iv->config->frequency*FREQ_STEP_KHZ + HOY_BASE_FREQ_KHZ));
mWaitTime.startTimeMonitor(1000); mWaitTime.startTimeMonitor(1000);
} else { } else {

4
src/hm/hmRadio.h

@ -293,6 +293,10 @@ class HmRadio : public Radio {
return mNrf24->isPVariant(); return mNrf24->isPVariant();
} }
uint8_t getARC(void) {
return mNrf24->getARC();
}
private: private:
inline bool getReceived(void) { inline bool getReceived(void) {
bool isLastPackage = false; bool isLastPackage = false;

1
src/hm/radio.h

@ -29,6 +29,7 @@ class Radio {
virtual bool switchFrequencyCh(Inverter<> *iv, uint8_t fromCh, uint8_t toCh) { return true; } virtual bool switchFrequencyCh(Inverter<> *iv, uint8_t fromCh, uint8_t toCh) { return true; }
virtual bool isChipConnected(void) { return false; } virtual bool isChipConnected(void) { return false; }
virtual bool loop(void) = 0; virtual bool loop(void) = 0;
virtual uint8_t getARC(void) { return 0xff; }
void handleIntr(void) { void handleIntr(void) {
mIrqRcvd = true; mIrqRcvd = true;

Loading…
Cancel
Save