From b4cc663455c5277f1fdf8aefcea1281a0748855c Mon Sep 17 00:00:00 2001 From: rejoe2 Date: Wed, 20 Dec 2023 13:13:26 +0100 Subject: [PATCH] 2506 --- src/defines.h | 2 +- src/hm/hmRadio.h | 12 ++++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/src/defines.h b/src/defines.h index 884f7401..045f671c 100644 --- a/src/defines.h +++ b/src/defines.h @@ -13,7 +13,7 @@ //------------------------------------- #define VERSION_MAJOR 0 #define VERSION_MINOR 8 -#define VERSION_PATCH 2705 +#define VERSION_PATCH 2706 //------------------------------------- typedef struct { diff --git a/src/hm/hmRadio.h b/src/hm/hmRadio.h index 89ecbc65..a4c226fb 100644 --- a/src/hm/hmRadio.h +++ b/src/hm/hmRadio.h @@ -122,8 +122,11 @@ class HmRadio : public Radio { uint32_t startMicros = micros(); uint32_t loopMillis = millis(); //mRxChIdx = mRxChannels - 2; // ensure, we start receiving with first relative channel.... - if(!mLastIv->mGotFragment) - mRxChIdx = mLastIv->mRxChanIdx;//(mLastIv->mRxChanIdx + RF_MAX_CHANNEL_ID -1) % RF_MAX_CHANNEL_ID; // make sure, we start with last successfull channel (result will be increased in loop) + //if(mLastIv->mGotFragment) + mRxChIdx = mLastIv->mRxChanIdx - 1; // do not bother if that get's very high, will in this case effectively be 0 before rx chan is set + //else + // mRxChIdx--; + //(mLastIv->mRxChanIdx + RF_MAX_CHANNEL_ID -1) % RF_MAX_CHANNEL_ID; // make sure, we start with last successfull channel (result will be increased in loop) //mRxChannels - 1; // //(mTxChIdx + mRxChannels) % RF_MAX_CHANNEL_ID; // start with a fixed offset while ((millis() - loopMillis) < mRxTmoOuterLoop) { @@ -155,8 +158,9 @@ class HmRadio : public Radio { // not finished but time is over //if(++mRxChIdx >= RF_CHANNELS) // mRxChIdx = 0; - if(!mLastIv->mGotFragment) - mLastIv->mRxChanIdx = mRxChIdx; + //if(!mLastIv->mGotFragment) + mLastIv->mRxChanIdx = mLastIv->mRxChanIdx +1; // + 2; + //mLastIv->mRxChanIdx = ++mRxChIdx; return; }