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

hmRadio.h - change rx/tx channel hopping logic (#7) 

* hmRadio.h - change rx/tx channel hopping logic

- patch originally provided by beegee3
- timings look very good for 3rd gen., and ok for MI in my environment over several restarts
- runs stable on ESP32 
- not sure wheather this also has any (negative or positive) impact to reboot problem with ESP8266
pull/846/head
rejoe2 2 years ago
committed by GitHub
parent
26ec95d61e
commit
1e6a06b580
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 45 additions and 53 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. 80
      src/hm/hmRadio.h
  2. 10
      src/hm/miPayload.h

80
src/hm/hmRadio.h
View File

@ -101,19 +101,20 @@ class HmRadio {
// change the byte order of the DTU serial number and append the required 0x01 at the end // change the byte order of the DTU serial number and append the required 0x01 at the end
DTU_RADIO_ID = ((uint64_t)(((dtuSn >> 24) & 0xFF) | ((dtuSn >> 8) & 0xFF00) | ((dtuSn << 8) & 0xFF0000) | ((dtuSn << 24) & 0xFF000000)) << 8) | 0x01; DTU_RADIO_ID = ((uint64_t)(((dtuSn >> 24) & 0xFF) | ((dtuSn >> 8) & 0xFF00) | ((dtuSn << 8) & 0xFF0000) | ((dtuSn << 24) & 0xFF000000)) << 8) | 0x01;
SPIClass* spi;
#ifdef ESP32 #ifdef ESP32
#if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S3 #if CONFIG_IDF_TARGET_ESP32C3 || CONFIG_IDF_TARGET_ESP32S3
mSpi = new SPIClass(FSPI); spi = new SPIClass(FSPI);
#else #else
mSpi = new SPIClass(VSPI); spi = new SPIClass(VSPI);
#endif #endif
mSpi->begin(sclk, miso, mosi, cs); spi->begin(sclk, miso, mosi, cs);
#else #else
//the old ESP82xx cannot freely place their SPI pins //the old ESP82xx cannot freely place their SPI pins
mSpi = new SPIClass(); spi = new SPIClass();
mSpi->begin(); spi->begin();
#endif #endif
mNrf24.begin(mSpi, ce, cs); mNrf24.begin(spi, ce, cs);
mNrf24.setRetries(3, 15); // 3*250us + 250us and 15 loops -> 15ms mNrf24.setRetries(3, 15); // 3*250us + 250us and 15 loops -> 15ms
mNrf24.setChannel(mRfChLst[mRxChIdx]); mNrf24.setChannel(mRfChLst[mRxChIdx]);
@ -123,7 +124,7 @@ class HmRadio {
mNrf24.enableDynamicPayloads(); mNrf24.enableDynamicPayloads();
mNrf24.setCRCLength(RF24_CRC_16); mNrf24.setCRCLength(RF24_CRC_16);
mNrf24.setAddressWidth(5); mNrf24.setAddressWidth(5);
mNrf24.openReadingPipe(1, DTU_RADIO_ID); mNrf24.openReadingPipe(1, reinterpret_cast<uint8_t*>(&DTU_RADIO_ID));
// enable all receiving interrupts // enable all receiving interrupts
mNrf24.maskIRQ(false, false, false); mNrf24.maskIRQ(false, false, false);
@ -147,32 +148,32 @@ class HmRadio {
bool tx_ok, tx_fail, rx_ready; bool tx_ok, tx_fail, rx_ready;
mNrf24.whatHappened(tx_ok, tx_fail, rx_ready); // resets the IRQ pin to HIGH mNrf24.whatHappened(tx_ok, tx_fail, rx_ready); // resets the IRQ pin to HIGH
mNrf24.flush_tx(); // empty TX FIFO mNrf24.flush_tx(); // empty TX FIFO
//DBGPRINTLN("TX whatHappened Ch" + String(mRfChLst[mTxChIdx]) + " " + String(tx_ok) + String(tx_fail) + String(rx_ready));
// start listening on the default RX channel // start listening
mRxChIdx = 0;
mNrf24.setChannel(mRfChLst[mRxChIdx]); mNrf24.setChannel(mRfChLst[mRxChIdx]);
mNrf24.startListening(); mNrf24.startListening();
//uint32_t debug_ms = millis(); uint32_t startMicros = micros();
uint16_t cnt = 300; // that is 60 times 5 channels uint32_t loopMillis = millis();
while (0 < cnt--) { while (millis()-loopMillis < 400) {
uint32_t startMillis = millis(); while (micros()-startMicros < 5110) { // listen (4088us or?) 5110us to each channel
while (millis()-startMillis < 4) { // listen 4ms to each channel
if (mIrqRcvd) { if (mIrqRcvd) {
mIrqRcvd = false; mIrqRcvd = false;
if (getReceived()) { // everything received if (getReceived()) { // everything received
//DBGPRINTLN("RX finished Cnt: " + String(300-cnt) + " time used: " + String(millis()-debug_ms)+ " ms");
return true; return true;
} }
} }
yield(); //yield();
} }
switchRxCh(); // switch to next RX channel // switch to next RX channel
yield(); startMicros = micros();
if(++mRxChIdx >= RF_CHANNELS)
mRxChIdx = 0;
mNrf24.setChannel(mRfChLst[mRxChIdx]);
//yield();
} }
yield();
// not finished but time is over // not finished but time is over
//DBGPRINTLN("RX not finished: 300 time used: " + String(millis()-debug_ms)+ " ms");
return true; return true;
} }
@ -205,7 +206,6 @@ class HmRadio {
} else { //MI 2nd gen. specific } else { //MI 2nd gen. specific
switch (cmd) { switch (cmd) {
case TurnOn: case TurnOn:
//mTxBuf[0] = 0x50;
mTxBuf[9] = 0x55; mTxBuf[9] = 0x55;
mTxBuf[10] = 0xaa; mTxBuf[10] = 0xaa;
break; break;
@ -241,9 +241,9 @@ class HmRadio {
sendPacket(invId, 24, isRetransmit, true); sendPacket(invId, 24, isRetransmit, true);
} }
void sendCmdPacket(uint64_t invId, uint8_t mid, uint8_t pid, bool isRetransmit, bool isMI=false) { void sendCmdPacket(uint64_t invId, uint8_t mid, uint8_t pid, bool isRetransmit, bool appendCrc16=true) {
initPacket(invId, mid, pid); initPacket(invId, mid, pid);
sendPacket(invId, 10, isRetransmit, isMI); sendPacket(invId, 10, isRetransmit, appendCrc16);
} }
void dumpBuf(uint8_t buf[], uint8_t len) { void dumpBuf(uint8_t buf[], uint8_t len) {
@ -276,7 +276,6 @@ class HmRadio {
bool getReceived(void) { bool getReceived(void) {
bool tx_ok, tx_fail, rx_ready; bool tx_ok, tx_fail, rx_ready;
mNrf24.whatHappened(tx_ok, tx_fail, rx_ready); // resets the IRQ pin to HIGH mNrf24.whatHappened(tx_ok, tx_fail, rx_ready); // resets the IRQ pin to HIGH
//DBGPRINTLN("RX whatHappened Ch" + String(mRfChLst[mRxChIdx]) + " " + String(tx_ok) + String(tx_fail) + String(rx_ready));
bool isLastPackage = false; bool isLastPackage = false;
while(mNrf24.available()) { while(mNrf24.available()) {
@ -287,27 +286,19 @@ class HmRadio {
p.ch = mRfChLst[mRxChIdx]; p.ch = mRfChLst[mRxChIdx];
p.len = len; p.len = len;
mNrf24.read(p.packet, len); mNrf24.read(p.packet, len);
if (p.packet[0] != 0x00) {
mBufCtrl.push(p); mBufCtrl.push(p);
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
isLastPackage = (p.packet[9] > 0x81); // > 0x81 indicates last packet received isLastPackage = (p.packet[9] > ALL_FRAMES); // > ALL_FRAMES indicates last packet received
else if (p.packet[0] == ( 0x0f + ALL_FRAMES) ) // response from MI get information command else if (p.packet[0] == ( 0x0f + ALL_FRAMES) ) // response from MI get information command
isLastPackage = (p.packet[9] > 0x11); // > 0x11 indicates last packet received isLastPackage = (p.packet[9] > 0x10); // > 0x10 indicates last packet received
else if (p.packet[0] != 0x00 && p.packet[0] != 0x88 && p.packet[0] != 0x92) else if ((p.packet[0] != 0x88) && (p.packet[0] != 0x92)) // ignore fragment number zero and MI status messages //#0 was p.packet[0] != 0x00 &&
// ignore fragment number zero and MI status messages
isLastPackage = true; // response from dev control command isLastPackage = true; // response from dev control command
yield();
} }
} }
return isLastPackage; yield();
} }
return isLastPackage;
void switchRxCh() {
mNrf24.stopListening();
// get next channel index
if(++mRxChIdx >= RF_CHANNELS)
mRxChIdx = 0;
mNrf24.setChannel(mRfChLst[mRxChIdx]);
mNrf24.startListening();
} }
void initPacket(uint64_t invId, uint8_t mid, uint8_t pid) { void initPacket(uint64_t invId, uint8_t mid, uint8_t pid) {
@ -319,12 +310,12 @@ class HmRadio {
mTxBuf[9] = pid; mTxBuf[9] = pid;
} }
void sendPacket(uint64_t invId, uint8_t len, bool isRetransmit, bool appendCrc16=false) { void sendPacket(uint64_t invId, uint8_t len, bool isRetransmit, bool appendCrc16=true) {
//DPRINTLN(DBG_VERBOSE, F("hmRadio.h:sendPacket")); //DPRINTLN(DBG_VERBOSE, F("hmRadio.h:sendPacket"));
//DPRINTLN(DBG_VERBOSE, "sent packet: #" + String(mSendCnt)); //DPRINTLN(DBG_VERBOSE, "sent packet: #" + String(mSendCnt));
// append crc's // append crc's
if (appendCrc16 && len > 10) { if (appendCrc16 && (len > 10)) {
// crc control data // crc control data
uint16_t crc = ah::crc16(&mTxBuf[10], len - 10); uint16_t crc = ah::crc16(&mTxBuf[10], len - 10);
mTxBuf[len++] = (crc >> 8) & 0xff; mTxBuf[len++] = (crc >> 8) & 0xff;
@ -334,6 +325,10 @@ class HmRadio {
mTxBuf[len] = ah::crc8(mTxBuf, len); mTxBuf[len] = ah::crc8(mTxBuf, len);
len++; len++;
// set TX and RX channels
mTxChIdx = (mTxChIdx + 1) % RF_CHANNELS;
mRxChIdx = (mTxChIdx + 2) % RF_CHANNELS;
if(mSerialDebug) { if(mSerialDebug) {
DPRINT(DBG_INFO, F("TX ")); DPRINT(DBG_INFO, F("TX "));
DBGPRINT(String(len)); DBGPRINT(String(len));
@ -348,10 +343,6 @@ class HmRadio {
mNrf24.openWritingPipe(reinterpret_cast<uint8_t*>(&invId)); mNrf24.openWritingPipe(reinterpret_cast<uint8_t*>(&invId));
mNrf24.startWrite(mTxBuf, len, false); // false = request ACK response mNrf24.startWrite(mTxBuf, len, false); // false = request ACK response
// switch TX channel for next packet
if(++mTxChIdx >= RF_CHANNELS)
mTxChIdx = 0;
if(isRetransmit) if(isRetransmit)
mRetransmits++; mRetransmits++;
else else
@ -365,7 +356,6 @@ class HmRadio {
uint8_t mTxChIdx; uint8_t mTxChIdx;
uint8_t mRxChIdx; uint8_t mRxChIdx;
SPIClass* mSpi;
RF24 mNrf24; RF24 mNrf24;
uint8_t mTxBuf[MAX_RF_PAYLOAD_SIZE]; uint8_t mTxBuf[MAX_RF_PAYLOAD_SIZE];
}; };

10
src/hm/miPayload.h
View File

@ -151,7 +151,8 @@ class MiPayload {
cmd2 = cmd == SystemConfigPara ? 0x01 : 0x00; //perhaps we can only try to get second frame? cmd2 = cmd == SystemConfigPara ? 0x01 : 0x00; //perhaps we can only try to get second frame?
mSys->Radio.sendCmdPacket(iv->radioId.u64, cmd, cmd2, false, false); mSys->Radio.sendCmdPacket(iv->radioId.u64, cmd, cmd2, false, false);
} else { } else {
mSys->Radio.prepareDevInformCmd(iv->radioId.u64, cmd2, mPayload[iv->id].ts, iv->alarmMesIndex, false, cmd); //mSys->Radio.prepareDevInformCmd(iv->radioId.u64, cmd2, mPayload[iv->id].ts, iv->alarmMesIndex, false, cmd);
mSys->Radio.sendCmdPacket(iv->radioId.u64, cmd, cmd2, false, false);
}; };
mPayload[iv->id].txCmd = cmd; mPayload[iv->id].txCmd = cmd;
@ -479,8 +480,8 @@ const byteAssign_t InfoAssignment[] = {
} }
DBGPRINT(F(" 0x")); DBGPRINT(F(" 0x"));
DBGHEXLN(cmd); DBGHEXLN(cmd);
//mSys->Radio.sendCmdPacket(iv->radioId.u64, cmd, cmd, true); mSys->Radio.sendCmdPacket(iv->radioId.u64, cmd, cmd, true, false);
mSys->Radio.prepareDevInformCmd(iv->radioId.u64, cmd, mPayload[iv->id].ts, iv->alarmMesIndex, true, cmd); //mSys->Radio.prepareDevInformCmd(iv->radioId.u64, cmd, mPayload[iv->id].ts, iv->alarmMesIndex, true, cmd);
yield(); yield();
} }
} }
@ -496,7 +497,8 @@ const byteAssign_t InfoAssignment[] = {
DBGPRINT(F("prepareDevInformCmd 0x")); DBGPRINT(F("prepareDevInformCmd 0x"));
DBGHEXLN(mPayload[iv->id].txCmd); DBGHEXLN(mPayload[iv->id].txCmd);
mSys->Radio.prepareDevInformCmd(iv->radioId.u64, mPayload[iv->id].txCmd, mPayload[iv->id].ts, iv->alarmMesIndex, true); //mSys->Radio.prepareDevInformCmd(iv->radioId.u64, mPayload[iv->id].txCmd, mPayload[iv->id].ts, iv->alarmMesIndex, true);
mSys->Radio.sendCmdPacket(iv->radioId.u64, mPayload[iv->id].txCmd, mPayload[iv->id].txCmd, false, false);
} }
} }
/*else { // payload complete /*else { // payload complete

Write Preview
Loading…
Cancel
Save