3pp-mirror/ahoy
1
0
Fork 0
mirror of https://github.com/lumapu/ahoy.git synced 2025-07-13 22:47:15 +02:00
Code Issues Projects Releases Packages Wiki Activity

0.8.33

Browse source 
* improved communication thx @rejoe2
This commit is contained in:
lumapu 2023-12-29 15:48:25 +01:00
parent a8b10eec6c
commit b043f4c2ac
2 changed files with 25 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

3
src/CHANGES.md
View file

@ -1,5 +1,8 @@
# Development Changes # Development Changes
## 0.8.33 - 2023-12-29
* improved communication thx @rejoe2
## 0.8.32 - 2023-12-29 ## 0.8.32 - 2023-12-29
* fix `start` / `stop` / `restart` commands #1287 * fix `start` / `stop` / `restart` commands #1287
* added message, if profile was not read until now #1300 * added message, if profile was not read until now #1300

27
src/hm/hmRadio.h
View file

@ -113,34 +113,51 @@ class HmRadio : public Radio {
mNrf24->flush_tx(); // empty TX FIFO mNrf24->flush_tx(); // empty TX FIFO
// start listening // start listening
uint8_t chOffset = 2;
mRxChIdx = (mTxChIdx + chOffset) % RF_CHANNELS;
mNrf24->setChannel(mRfChLst[mRxChIdx]); mNrf24->setChannel(mRfChLst[mRxChIdx]);
mNrf24->startListening(); mNrf24->startListening();
if(NULL == mLastIv) // prevent reading on NULL object! if(NULL == mLastIv) // prevent reading on NULL object!
return; return;
uint32_t startMicros = micros(); uint32_t innerLoopTimeout = 55000;
uint32_t loopMillis = millis(); uint32_t loopMillis = millis();
uint32_t outerLoopTimeout = (mLastIv->mIsSingleframeReq) ? 100 : ((mLastIv->mCmd != AlarmData) && (mLastIv->mCmd != GridOnProFilePara)) ? 400 : 600; uint32_t outerLoopTimeout = (mLastIv->mIsSingleframeReq) ? 100 : ((mLastIv->mCmd != AlarmData) && (mLastIv->mCmd != GridOnProFilePara)) ? 400 : 600;
bool isRxInit = true;
while ((millis() - loopMillis) < outerLoopTimeout) { while ((millis() - loopMillis) < outerLoopTimeout) {
startMicros = micros(); uint32_t startMicros = micros();
while ((micros() - startMicros) < 5110) { // listen (4088us or?) 5110us to each channel while ((micros() - startMicros) < innerLoopTimeout) { // listen (4088us or?) 5110us to each channel
if (mIrqRcvd) { if (mIrqRcvd) {
mIrqRcvd = false; mIrqRcvd = false;
if (getReceived()) { // everything received if (getReceived()) { // everything received
return; return;
} }
innerLoopTimeout = 4088*5;
if (isRxInit) {
isRxInit = false;
if (micros() - startMicros < 42000) {
innerLoopTimeout = 4088*12;
mRxChIdx = (mRxChIdx + 4) % RF_CHANNELS;
mNrf24->setChannel(mRfChLst[mRxChIdx]);
}
}
startMicros = micros();
} }
yield(); yield();
} }
// switch to next RX channel // switch to next RX channel
mRxChIdx = (mRxChIdx + 1) % RF_CHANNELS; mRxChIdx = (mRxChIdx + 4) % RF_CHANNELS;
mNrf24->setChannel(mRfChLst[mRxChIdx]); mNrf24->setChannel(mRfChLst[mRxChIdx]);
innerLoopTimeout = 4088;
isRxInit = false;
} }
// not finished but time is over // not finished but time is over
mRxChIdx = (mRxChIdx + 1) % RF_CHANNELS;
return; return;
} }