3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-07-20 17:57:11 +02:00
Code Issues Projects Releases Packages Wiki Activity

re-flexibilisize rx-channels

Browse source 
also for HM 2ch devices
This commit is contained in:
rejoe2 2024-01-30 15:37:40 +01:00 • committed by GitHub
parent bba82d8b3a
commit fddd03af6b
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/hm/hmDefines.h
View file

@ -90,8 +90,8 @@ const uint8_t duration_reserve[2] = {65,115};
#define LIMIT_VERYFAST_IV 70 // time limit to qualify an inverter as very fast answering inverter #define LIMIT_VERYFAST_IV 70 // time limit to qualify an inverter as very fast answering inverter
#define LIMIT_FAST_IV_MI 35 // time limit to qualify a MI type inverter as fast answering inverter #define LIMIT_FAST_IV_MI 35 // time limit to qualify a MI type inverter as fast answering inverter
#define LIMIT_VERYFAST_IV_MI 22 // time limit to qualify a MI type inverter as very fast answering inverter #define LIMIT_VERYFAST_IV_MI 22 // time limit to qualify a MI type inverter as very fast answering inverter
#define RETRIES_FAST_IV 11 // how often shall a message be automatically retransmitted by the nRF (fast answering inverter) #define RETRIES_FAST_IV 12 // how often shall a message be automatically retransmitted by the nRF (fast answering inverter)
#define RETRIES_VERYFAST_IV 7 // how often shall a message be automatically retransmitted by the nRF (very fast answering inverter) #define RETRIES_VERYFAST_IV 9 // how often shall a message be automatically retransmitted by the nRF (very fast answering inverter)
typedef struct { typedef struct {

5
src/hm/hmRadio.h
View file

@ -122,7 +122,6 @@ class HmRadio : public Radio {
mNRFloopChannels = true; mNRFloopChannels = true;
mRxPendular = !mRxPendular; mRxPendular = !mRxPendular;
//innerLoopTimeout = (rxPendular ? 1 : 2)*DURATION_LISTEN_MIN;
innerLoopTimeout = DURATION_LISTEN_MIN; innerLoopTimeout = DURATION_LISTEN_MIN;
if(mNRFloopChannels) if(mNRFloopChannels)
@ -167,7 +166,8 @@ class HmRadio : public Radio {
//innerLoopTimeout = mLastIv->ivGen != IV_MI ? DURATION_TXFRAME : DURATION_ONEFRAME; //innerLoopTimeout = mLastIv->ivGen != IV_MI ? DURATION_TXFRAME : DURATION_ONEFRAME;
//innerLoopTimeout = mLastIv->ivGen != IV_MI ? DURATION_LISTEN_MIN : 4; //innerLoopTimeout = mLastIv->ivGen != IV_MI ? DURATION_LISTEN_MIN : 4;
innerLoopTimeout = (mLastIv->mIsSingleframeReq || mLastIv->ivGen == IV_MI) ? DURATION_LISTEN_MIN : DURATION_TXFRAME; //innerLoopTimeout = (mLastIv->mIsSingleframeReq || mLastIv->ivGen == IV_MI) ? DURATION_LISTEN_MIN : DURATION_TXFRAME;
innerLoopTimeout = DURATION_LISTEN_MIN;
} }
if(rx_ready) { if(rx_ready) {
@ -180,7 +180,6 @@ class HmRadio : public Radio {
innerLoopTimeout = DURATION_LISTEN_MIN; innerLoopTimeout = DURATION_LISTEN_MIN;
mTimeslotStart = millis(); mTimeslotStart = millis();
if (!mNRFloopChannels) { if (!mNRFloopChannels) {
//mRxPendular = true; // stay longer on the next rx channel
if (isRxInit) { if (isRxInit) {
isRxInit = false; isRxInit = false;
tempRxChIdx = (mRxChIdx + 4) % RF_CHANNELS; tempRxChIdx = (mRxChIdx + 4) % RF_CHANNELS;

3
src/hm/hmSystem.h
View file

@ -98,7 +98,8 @@ class HmSystem {
#ifdef DYNAMIC_OFFSET #ifdef DYNAMIC_OFFSET
iv->rxOffset = iv->ivGen == IV_HM ? 13 : 12; // effective 3 (or 2), but can easily be recognized as default setting iv->rxOffset = iv->ivGen == IV_HM ? 13 : 12; // effective 3 (or 2), but can easily be recognized as default setting
#else #else
iv->rxOffset = (iv->ivGen == IV_HM && iv->type == INV_TYPE_4CH) ? 3 : 2; // effective 3 (or 2), but can easily be recognized as default setting iv->rxOffset = (iv->ivGen == IV_HM && iv->type == INV_TYPE_4CH) ? 3 : 2;
iv->rxOffset = iv->ivGen == IV_HM ? 3 : 2;
#endif #endif
cb(iv); cb(iv);