diff --git a/src/CHANGES.md b/src/CHANGES.md index 10a15c01..e3da20b2 100644 --- a/src/CHANGES.md +++ b/src/CHANGES.md @@ -1,5 +1,9 @@ # Development Changes +## 0.7.52 - 2023-09-16 +* fix CMT configureable pins #1150, #1159 +* update MqTT lib to version `1.4.5` + ## 0.7.51 - 2023-09-16 * fix CMT configureable pins #1150 * fix default CMT pins for opendtufusion diff --git a/src/config/settings.h b/src/config/settings.h index ec774352..c7ca1062 100644 --- a/src/config/settings.h +++ b/src/config/settings.h @@ -542,12 +542,20 @@ class settings { obj[F("csb")] = mCfg.cmt.pinCsb; obj[F("fcsb")] = mCfg.cmt.pinFcsb; obj[F("irq")] = mCfg.cmt.pinIrq; + obj[F("dio")] = mCfg.cmt.pinSdio; + obj[F("clk")] = mCfg.cmt.pinSclk; obj[F("en")] = (bool) mCfg.cmt.enabled; } else { mCfg.cmt.pinCsb = obj[F("csb")]; mCfg.cmt.pinFcsb = obj[F("fcsb")]; mCfg.cmt.pinIrq = obj[F("irq")]; + mCfg.cmt.pinSdio = obj[F("dio")]; + mCfg.cmt.pinSclk = obj[F("clk")]; mCfg.cmt.enabled = (bool) obj[F("en")]; + if(0 == mCfg.cmt.pinSclk) + mCfg.cmt.pinSclk = DEF_CMT_SCLK; + if(0 == mCfg.cmt.pinSdio) + mCfg.cmt.pinSdio = DEF_CMT_SDIO; } } diff --git a/src/defines.h b/src/defines.h index e32a7bc8..6e6fb6d2 100644 --- a/src/defines.h +++ b/src/defines.h @@ -13,7 +13,7 @@ //------------------------------------- #define VERSION_MAJOR 0 #define VERSION_MINOR 7 -#define VERSION_PATCH 51 +#define VERSION_PATCH 52 //------------------------------------- typedef struct { diff --git a/src/platformio.ini b/src/platformio.ini index c46b1305..11638512 100644 --- a/src/platformio.ini +++ b/src/platformio.ini @@ -27,7 +27,7 @@ lib_deps = https://github.com/yubox-node-org/ESPAsyncWebServer nrf24/RF24 @ 1.4.7 paulstoffregen/Time @ ^1.6.1 - https://github.com/bertmelis/espMqttClient#v1.4.4 + https://github.com/bertmelis/espMqttClient#v1.4.5 bblanchon/ArduinoJson @ ^6.21.3 https://github.com/JChristensen/Timezone @ ^1.2.4 olikraus/U8g2 @ ^2.34.17