Browse Source

0.8.106

* possible fix of #1553
pull/1584/head
lumapu 10 months ago
parent
commit
00fce38db9
  1. 1
      src/CHANGES.md
  2. 2
      src/app.h
  3. 2
      src/defines.h
  4. 0
      src/hms/CmtRadio.h
  5. 4
      src/hms/cmt2300a.h

1
src/CHANGES.md

@ -2,6 +2,7 @@
## 0.8.106 - 2024-04-05 ## 0.8.106 - 2024-04-05
* fix bootloop with CMT and NRF on ESP32 #1566 #1562 * fix bootloop with CMT and NRF on ESP32 #1566 #1562
* possible fix of #1553
## 0.8.105 - 2024-04-05 ## 0.8.105 - 2024-04-05
* cleanup of `defines.h` * cleanup of `defines.h`

2
src/app.h

@ -19,7 +19,7 @@
#include "hm/hmSystem.h" #include "hm/hmSystem.h"
#include "hm/NrfRadio.h" #include "hm/NrfRadio.h"
#if defined(ESP32) #if defined(ESP32)
#include "hms/hmsRadio.h" #include "hms/CmtRadio.h"
#endif #endif
#if defined(ENABLE_MQTT) #if defined(ENABLE_MQTT)
#include "publisher/pubMqtt.h" #include "publisher/pubMqtt.h"

2
src/defines.h

@ -13,7 +13,7 @@
//------------------------------------- //-------------------------------------
#define VERSION_MAJOR 0 #define VERSION_MAJOR 0
#define VERSION_MINOR 8 #define VERSION_MINOR 8
#define VERSION_PATCH 105 #define VERSION_PATCH 106
//------------------------------------- //-------------------------------------
typedef struct { typedef struct {
uint8_t ch; uint8_t ch;

0
src/hms/hmsRadio.h → src/hms/CmtRadio.h

4
src/hms/cmt2300a.h

@ -248,14 +248,12 @@ class Cmt2300a {
} }
CmtStatus tx(uint8_t buf[], uint8_t len) { CmtStatus tx(uint8_t buf[], uint8_t len) {
if(mTxPending)
return CmtStatus::ERR_TX_PENDING;
if(mInRxMode) { if(mInRxMode) {
mInRxMode = false; mInRxMode = false;
if(!cmtSwitchStatus(CMT2300A_GO_STBY, CMT2300A_STA_STBY)) if(!cmtSwitchStatus(CMT2300A_GO_STBY, CMT2300A_STA_STBY))
return CmtStatus::ERR_SWITCH_STATE; return CmtStatus::ERR_SWITCH_STATE;
} }
mTxPending = false; // safety
mSpi.writeReg(CMT2300A_CUS_INT1_CTL, CMT2300A_INT_SEL_TX_DONE); mSpi.writeReg(CMT2300A_CUS_INT1_CTL, CMT2300A_INT_SEL_TX_DONE);

Loading…
Cancel
Save