patrick/OpenDTU
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Fix: Endless loop when CMT module was configured but not connected

Browse Source
This commit is contained in:
Thomas Basler 2023-04-17 18:58:23 +02:00
parent 481bc00f28
commit 1416efc6f9
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Hoymiles/src/HoymilesRadio_CMT.cpp
View File

@ -63,11 +63,11 @@ void HoymilesRadio_CMT::init(int8_t pin_sdio, int8_t pin_clk, int8_t pin_cs, int
cmtSwitchDtuFreq(_inverterTargetFrequency); // start dtu at work freqency, for fast Rx if inverter is already on and frequency switched cmtSwitchDtuFreq(_inverterTargetFrequency); // start dtu at work freqency, for fast Rx if inverter is already on and frequency switched
if (_radio->isChipConnected()) { if (!_radio->isChipConnected()) {
Hoymiles.getMessageOutput()->println("Connection successful"); Hoymiles.getMessageOutput()->println("CMT: Connection error!!");
} else { return;
Hoymiles.getMessageOutput()->println("Connection error!!");
} }
Hoymiles.getMessageOutput()->println("CMT: Connection successful");
if (pin_gpio2 >= 0) { if (pin_gpio2 >= 0) {
attachInterrupt(digitalPinToInterrupt(pin_gpio2), std::bind(&HoymilesRadio_CMT::handleInt1, this), RISING); attachInterrupt(digitalPinToInterrupt(pin_gpio2), std::bind(&HoymilesRadio_CMT::handleInt1, this), RISING);
@ -109,7 +109,7 @@ void HoymilesRadio_CMT::loop()
_radio->read(f.fragment, f.len); _radio->read(f.fragment, f.len);
_rxBuffer.push(f); _rxBuffer.push(f);
} else { } else {
Hoymiles.getMessageOutput()->println("Buffer full"); Hoymiles.getMessageOutput()->println("CMT: Buffer full");
_radio->flush_rx(); _radio->flush_rx();
} }
} }

10
lib/Hoymiles/src/HoymilesRadio_NRF.cpp
View File

@ -23,11 +23,11 @@ void HoymilesRadio_NRF::init(SPIClass* initialisedSpiBus, uint8_t pinCE, uint8_t
_radio->setAddressWidth(5); _radio->setAddressWidth(5);
_radio->setRetries(0, 0); _radio->setRetries(0, 0);
_radio->maskIRQ(true, true, false); // enable only receiving interrupts _radio->maskIRQ(true, true, false); // enable only receiving interrupts
if (_radio->isChipConnected()) { if (!_radio->isChipConnected()) {
Hoymiles.getMessageOutput()->println("Connection successful"); Hoymiles.getMessageOutput()->println("NRF: Connection error!!");
} else { return;
Hoymiles.getMessageOutput()->println("Connection error!!");
} }
Hoymiles.getMessageOutput()->println("NRF: Connection successful");
attachInterrupt(digitalPinToInterrupt(pinIRQ), std::bind(&HoymilesRadio_NRF::handleIntr, this), FALLING); attachInterrupt(digitalPinToInterrupt(pinIRQ), std::bind(&HoymilesRadio_NRF::handleIntr, this), FALLING);
@ -60,7 +60,7 @@ void HoymilesRadio_NRF::loop()
_radio->read(f.fragment, f.len); _radio->read(f.fragment, f.len);
_rxBuffer.push(f); _rxBuffer.push(f);
} else { } else {
Hoymiles.getMessageOutput()->println("Buffer full"); Hoymiles.getMessageOutput()->println("NRF: Buffer full");
_radio->flush_rx(); _radio->flush_rx();
} }
} }