diff --git a/src/CHANGES.md b/src/CHANGES.md index 7f544e69..651d068d 100644 --- a/src/CHANGES.md +++ b/src/CHANGES.md @@ -1,5 +1,9 @@ # Development Changes +## 0.8.67 - 2024-01-29 +* fix HMS frequency +* fix display of inverter id in serial log (was displayed twice) + ## 0.8.66 - 2024-01-28 * added support for other regions - untested #1271 * fix generation of DTU-ID; was computed twice without reset if two radios are enabled @@ -169,7 +173,7 @@ ## 0.8.37 - 2023-12-30 * added grid profiles -* format version of grid profile +* format version of grid profile # RELEASE 0.8.36 - 2023-12-30 diff --git a/src/defines.h b/src/defines.h index 786908d0..4ff2fc1e 100644 --- a/src/defines.h +++ b/src/defines.h @@ -13,7 +13,7 @@ //------------------------------------- #define VERSION_MAJOR 0 #define VERSION_MINOR 8 -#define VERSION_PATCH 66 +#define VERSION_PATCH 67 //------------------------------------- typedef struct { diff --git a/src/hm/Communication.h b/src/hm/Communication.h index 132faeb8..396a98a5 100644 --- a/src/hm/Communication.h +++ b/src/hm/Communication.h @@ -502,7 +502,6 @@ class Communication : public CommQueue<> { int8_t rssi = -127; uint8_t len = 0; - DPRINT_IVID(DBG_INFO, q->iv->id); for(uint8_t i = 0; i < mMaxFrameId; i++) { if(mLocalBuf[i].len + len > MAX_BUFFER) { DPRINTLN(DBG_ERROR, F("payload buffer to small!")); diff --git a/src/hms/cmt2300a.h b/src/hms/cmt2300a.h index 524472f0..3cdc2660 100644 --- a/src/hms/cmt2300a.h +++ b/src/hms/cmt2300a.h @@ -360,7 +360,7 @@ class Cmt2300a { if((freqKhz < range.first) || (freqKhz > range.second)) return 0xff; // error - return (freqKhz - getBaseFreqMhz()) / FREQ_STEP_KHZ; + return (freqKhz - getBaseFreqMhz() * 1000) / FREQ_STEP_KHZ; } inline void switchChannel(uint8_t ch) { @@ -369,9 +369,9 @@ class Cmt2300a { inline uint32_t getFreqKhz(void) { if(0xff != mRqstCh) - return getBaseFreqMhz() + (mRqstCh * FREQ_STEP_KHZ); + return getBaseFreqMhz() * 1000 + (mRqstCh * FREQ_STEP_KHZ); else - return getBaseFreqMhz() + (mCurCh * FREQ_STEP_KHZ); + return getBaseFreqMhz() * 1000 + (mCurCh * FREQ_STEP_KHZ); } uint8_t getCurrentChannel(void) {