topaLE
/
ahoy
mirror of https://github.com/lumapu/ahoy.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

.2505 

just remember last rx channel index per inverter
Might need review in all the details...
pull/1284/head
rejoe2 2 years ago
committed by GitHub
parent
fab804309e
commit
9850a298e4
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 25 additions and 17 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      src/defines.h
  2. 1
      src/hm/Communication.h
  3. 2
      src/hm/hmInverter.h
  4. 37
      src/hm/hmRadio.h

2
src/defines.h
View File

@ -13,7 +13,7 @@
//------------------------------------- //-------------------------------------
#define VERSION_MAJOR 0 #define VERSION_MAJOR 0
#define VERSION_MINOR 8 #define VERSION_MINOR 8
#define VERSION_PATCH 2701 #define VERSION_PATCH 2705
//------------------------------------- //-------------------------------------
typedef struct { typedef struct {

1
src/hm/Communication.h
View File

@ -175,6 +175,7 @@ class Communication : public CommQueue<> {
if(validateIvSerial(&p->packet[1], q->iv)) { if(validateIvSerial(&p->packet[1], q->iv)) {
q->iv->radioStatistics.frmCnt++; q->iv->radioStatistics.frmCnt++;
//q->iv->mRxChanIdx = mRxChanIdx;
if (p->packet[0] == (TX_REQ_INFO + ALL_FRAMES)) { // response from get information command if (p->packet[0] == (TX_REQ_INFO + ALL_FRAMES)) { // response from get information command
if(parseFrame(p)) if(parseFrame(p))

2
src/hm/hmInverter.h
View File

@ -134,6 +134,7 @@ class Inverter {
uint8_t curFrmCnt; // count received frames in current loop uint8_t curFrmCnt; // count received frames in current loop
bool mGotLastMsg; // shows if inverter has already finished transmission cycle bool mGotLastMsg; // shows if inverter has already finished transmission cycle
uint8_t mCmd; // holds the command to send uint8_t mCmd; // holds the command to send
uint8_t mRxChanIdx; // holds the index of the last used rx channel
bool mIsSingleframeReq; // indicates this is a missing single frame request bool mIsSingleframeReq; // indicates this is a missing single frame request
Radio *radio; // pointer to associated radio class Radio *radio; // pointer to associated radio class
statistics_t radioStatistics; // information about transmitted, failed, ... packets statistics_t radioStatistics; // information about transmitted, failed, ... packets
@ -162,6 +163,7 @@ class Inverter {
miMultiParts = 0; miMultiParts = 0;
mGotLastMsg = false; mGotLastMsg = false;
mCmd = InitDataState; mCmd = InitDataState;
mRxChanIdx = 1;
mIsSingleframeReq = false; mIsSingleframeReq = false;
radio = NULL; radio = NULL;
commEnabled = true; commEnabled = true;

37
src/hm/hmRadio.h
View File

@ -121,7 +121,9 @@ class HmRadio : public Radio {
uint32_t startMicros = micros(); uint32_t startMicros = micros();
uint32_t loopMillis = millis(); uint32_t loopMillis = millis();
mRxChIdx = mRxChannels - 2; // ensure, we start receiving with first relative channel.... //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)
//mRxChannels - 1; // //mRxChannels - 1; //
//(mTxChIdx + mRxChannels) % RF_MAX_CHANNEL_ID; // start with a fixed offset //(mTxChIdx + mRxChannels) % RF_MAX_CHANNEL_ID; // start with a fixed offset
while ((millis() - loopMillis) < mRxTmoOuterLoop) { while ((millis() - loopMillis) < mRxTmoOuterLoop) {
@ -130,28 +132,31 @@ class HmRadio : public Radio {
mIrqRcvd = false; mIrqRcvd = false;
if (getReceived()) { // everything received if (getReceived()) { // everything received
mLastIv->mRxChanIdx = mRxChIdx;
return; return;
} }
} }
yield(); yield();
} }
// switch to next RX channel // switch to next RX channel
/*if(++mRxChIdx >= RF_CHANNELS) if(++mRxChIdx >= RF_CHANNELS)
mRxChIdx = 0;*/ mRxChIdx = 0;
//if(++mRxChIdx >= mLastIv->mRxChannels) //if(++mRxChIdx >= mLastIv->mRxChannels)
if(++mRxChIdx >= mRxChannels) /*if(++mRxChIdx >= mRxChannels)
mRxChIdx = 0; mRxChIdx = 0;*/
uint8_t nextRxCh = (mRxChIdx + mTxChIdx + 4) % RF_MAX_CHANNEL_ID; // let 3 channels in shifting out; might cause problems for tx channel 75, see Oberfritze remark to his array //uint8_t nextRxCh = (mRxChIdx + mTxChIdx + mRxChannels-1) % RF_MAX_CHANNEL_ID; // shift rx channel relative to tx channel; might cause problems for tx channel 75, see Oberfritze remark to his array
//mNrf24->setChannel(mRfChLst[mRxChIdx]); mNrf24->setChannel(mRfChLst[mRxChIdx]);
mNrf24->setChannel(mRfChLst[nextRxCh]); //mNrf24->setChannel(mRfChLst[nextRxCh]);
startMicros = micros(); startMicros = micros();
} }
// not finished but time is over // not finished but time is over
//if(++mRxChIdx >= RF_CHANNELS) //if(++mRxChIdx >= RF_CHANNELS)
// mRxChIdx = 0; // mRxChIdx = 0;
if(!mLastIv->mGotFragment)
mLastIv->mRxChanIdx = mRxChIdx;
return; return;
} }
@ -249,33 +254,33 @@ class HmRadio : public Radio {
void prepareReceive(Inverter<> *iv) { void prepareReceive(Inverter<> *iv) {
if (iv->mIsSingleframeReq) { if (iv->mIsSingleframeReq) {
mRxTmoOuterLoop = 60; // SINGLEFR_TIMEOUT mRxTmoOuterLoop = 100; // SINGLEFR_TIMEOUT
return; return;
} }
if (iv->ivGen != IV_MI) { if (iv->ivGen != IV_MI) {
if (iv->mCmd == RealTimeRunData_Debug) { if (iv->mCmd == RealTimeRunData_Debug) {
if (iv->type == INV_TYPE_4CH) { if (iv->type == INV_TYPE_4CH) {
mRxChannels = 3; mRxChannels = 2;
mRxTmoOuterLoop = 300; mRxTmoOuterLoop = 300;
mRxTmoInnerLoop = 5110; //10220; //4088; // 6132; // // mRxTmoInnerLoop = 5110; //10220; //4088; // 6132; // //
} else if (iv->type == INV_TYPE_2CH) { } else if (iv->type == INV_TYPE_2CH) {
mRxChannels = 2; mRxChannels = 2;
mRxTmoOuterLoop = 240; mRxTmoOuterLoop = 250;
mRxTmoInnerLoop = 10220; mRxTmoInnerLoop = 5110; //10220;
} else { // INV_TYPE_1CH } else { // INV_TYPE_1CH
mRxChannels = 2; mRxChannels = 2;
mRxTmoOuterLoop = 180; mRxTmoOuterLoop = 200;
mRxTmoInnerLoop = 5110; mRxTmoInnerLoop = 5110;
} }
} else { //3rd gen defaults } else { //3rd gen defaults
mRxChannels = 3; mRxChannels = 3;
mRxTmoOuterLoop = iv->mCmd == AlarmData ? 600 : 420; mRxTmoOuterLoop = iv->mCmd == AlarmData ? 600 : 400;
mRxTmoInnerLoop = 5110; mRxTmoInnerLoop = 5110;
} }
} else { // 2nd gen defaults } else { // 2nd gen defaults
mRxChannels = 3; mRxChannels = 3;
mRxTmoOuterLoop = 240; mRxTmoOuterLoop = 250;
mRxTmoInnerLoop = 5110; mRxTmoInnerLoop = 5110;
} }
} }
@ -389,7 +394,7 @@ class HmRadio : public Radio {
uint8_t mRfChLst[RF_CHANNELS] = {03, 23, 40, 61, 75}; // channel List:2403, 2423, 2440, 2461, 2475MHz uint8_t mRfChLst[RF_CHANNELS] = {03, 23, 40, 61, 75}; // channel List:2403, 2423, 2440, 2461, 2475MHz
uint8_t mTxChIdx = 0; uint8_t mTxChIdx = 0;
uint8_t mRxChIdx = 0; uint8_t mRxChIdx = 0;
uint8_t mRxChannels = 3; // number of rx channels to listen to, defaults to 3; uint8_t mRxChannels = 5; // number of rx channels to listen to, defaults to 3;
uint32_t mRxTmoOuterLoop = 400; // timeout for entire listening loop after sending, defaults to 400 (ms); uint32_t mRxTmoOuterLoop = 400; // timeout for entire listening loop after sending, defaults to 400 (ms);
uint32_t mRxTmoInnerLoop = 5110; // timeout for each listening channel, defaults to 5110 (us) uint32_t mRxTmoInnerLoop = 5110; // timeout for each listening channel, defaults to 5110 (us)
uint8_t lastCmd = 0xFF; // holds the last sent command, defaults to 0xFF uint8_t lastCmd = 0xFF; // holds the last sent command, defaults to 0xFF

Write Preview
Loading…
Cancel
Save