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

0.7.63

Browse source 
* fix NRF24 communication #1200
This commit is contained in:
lumapu 2023-10-01 16:44:20 +02:00
parent 169eea73e6
commit ebb79d1d09
5 changed files with 11 additions and 6 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
## 0.7.63 - 2023-10-01
* fix NRF24 communication #1200
## 0.7.62 - 2023-10-01
* fix communication to inverters #1198
* add timeout before payload is tried to process (necessary for HMS/HMT)

4
src/app.cpp
View file

@ -143,9 +143,9 @@ void app::loop(void) {
mPayload.add(iv, p);
}
mNrfRadio.mBufCtrl.pop();
processPayload = true;
yield();
}
processPayload = true;
mMiPayload.process(true);
}
#if defined(ESP32)
@ -168,9 +168,9 @@ void app::loop(void) {
mPayload.add(iv, p);
}
mCmtRadio.mBufCtrl.pop();
processPayload = true;
yield();
}
processPayload = true;
}
#endif

2
src/defines.h
View file

@ -13,7 +13,7 @@
//-------------------------------------
#define VERSION_MAJOR 0
#define VERSION_MINOR 7
#define VERSION_PATCH 62
#define VERSION_PATCH 63
//-------------------------------------
typedef struct {

2
src/hm/hmPayload.h
View file

@ -249,7 +249,7 @@ class HmPayload {
}
if((IV_HMS == iv->ivGen) || (IV_HMT == iv->ivGen)) {
if((mPayload[iv->id].sendMillis + 500) > millis())
if((mPayload[iv->id].sendMillis + 400) > millis())
return; // to fast, wait until packets are received!
}

6
src/hm/hmRadio.h
View file

@ -57,6 +57,7 @@ class HmRadio : public Radio {
pinMode(irq, INPUT_PULLUP);
generateDtuSn();
DTU_RADIO_ID = ((uint64_t)(((mDtuSn >> 24) & 0xFF) | ((mDtuSn >> 8) & 0xFF00) | ((mDtuSn << 8) & 0xFF0000) | ((mDtuSn << 24) & 0xFF000000)) << 8) | 0x01;
#ifdef ESP32
#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S2 || CONFIG_IDF_TARGET_ESP32S3
@ -81,7 +82,7 @@ class HmRadio : public Radio {
mNrf24.enableDynamicPayloads();
mNrf24.setCRCLength(RF24_CRC_16);
mNrf24.setAddressWidth(5);
mNrf24.openReadingPipe(1, reinterpret_cast<uint8_t*>(&mDtuSn));
mNrf24.openReadingPipe(1, reinterpret_cast<uint8_t*>(&DTU_RADIO_ID));
// enable all receiving interrupts
mNrf24.maskIRQ(false, false, false);
@ -202,7 +203,7 @@ class HmRadio : public Radio {
std::queue<packet_t> mBufCtrl;
private:
bool getReceived(void) {
inline bool getReceived(void) {
bool tx_ok, tx_fail, rx_ready;
mNrf24.whatHappened(tx_ok, tx_fail, rx_ready); // resets the IRQ pin to HIGH
@ -262,6 +263,7 @@ class HmRadio : public Radio {
return iv->radioId.u64;
}
uint64_t DTU_RADIO_ID;
uint8_t mRfChLst[RF_CHANNELS];
uint8_t mTxChIdx;
uint8_t mRxChIdx;