From caa84dc9c62950a769f09d6d132f3792d780591f Mon Sep 17 00:00:00 2001 From: lumapu Date: Thu, 11 Aug 2022 09:16:02 +0200 Subject: [PATCH 1/4] * fix: compile possible for non repository versions (if project was download as zip) --- tools/esp8266/scripts/auto_firmware_version.py | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/tools/esp8266/scripts/auto_firmware_version.py b/tools/esp8266/scripts/auto_firmware_version.py index 7992f9df..a4781fbf 100644 --- a/tools/esp8266/scripts/auto_firmware_version.py +++ b/tools/esp8266/scripts/auto_firmware_version.py @@ -16,7 +16,11 @@ if missing_pkgs: from dulwich import porcelain def get_firmware_specifier_build_flag(): - build_version = porcelain.describe('../../') # refers to the repository root dir + try: + build_version = porcelain.describe('../../') # refers to the repository root dir + except: + build_version = "g0000000" + build_flag = "-D AUTO_GIT_HASH=\\\"" + build_version + "\\\"" print ("Firmware Revision: " + build_version) return (build_flag) From d8d1b932b388a56fe2eff94a2ecc27b301604f46 Mon Sep 17 00:00:00 2001 From: DanielR92 Date: Thu, 11 Aug 2022 09:49:13 +0200 Subject: [PATCH 2/4] Update README.md Update line 69 (`RF24` 1.4.2 -> 1.4.5) --- tools/esp8266/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/esp8266/README.md b/tools/esp8266/README.md index b6b300e6..e8c8be5f 100644 --- a/tools/esp8266/README.md +++ b/tools/esp8266/README.md @@ -66,7 +66,7 @@ For now the following inverters should work out of the box: - `Ticker` 1.0 - `ESP8266HTTPUpdateServer` 1.0 - `Time` 1.6.1 -- `RF24` 1.4.2 +- `RF24` 1.4.5 - `PubSubClient` 2.8 - `ArduinoJson` 6.19.4 From e5be85cb2705fde41f837c83fa01eaf094bd3024 Mon Sep 17 00:00:00 2001 From: lumapu Date: Thu, 11 Aug 2022 13:42:26 +0200 Subject: [PATCH 3/4] Update hmRadio.h changes requested by @aschiffler regarding hmRadio.h --- tools/esp8266/hmRadio.h | 17 +++++++++-------- 1 file changed, 9 insertions(+), 8 deletions(-) diff --git a/tools/esp8266/hmRadio.h b/tools/esp8266/hmRadio.h index 23573dfd..a5c6f863 100644 --- a/tools/esp8266/hmRadio.h +++ b/tools/esp8266/hmRadio.h @@ -172,16 +172,17 @@ class HmRadio { // 4 bytes control data // Power Limit fix point 10 eg. 30 W --> 0d300 = 0x012c // -1 = 0xffff --> no limit - if (data[0] == 0xffff){ - data[0] &= 0xffff; // ToDo: unlimit value is needed and is inverter specific! --> get it via RF from inverter or via user interface + uint16_t powerLimit = data[0]; + uint16_t powerLimitSetting = data[1]; + if (powerLimit == 0xffff){ + powerLimit &= 0xffff; // ToDo: unlimit value is needed and is inverter specific! --> get it via RF from inverter or via user interface } else { - data[0] *= 10; // will overwrite the data bc it is a pointer + powerLimit *= 10; // will overwrite the data bc it is a pointer } - mTxBuf[10 + (++cnt)] = (data[0] >> 8) & 0xff; // power limit - mTxBuf[10 + (++cnt)] = (data[0] ) & 0xff; // power limit - mTxBuf[10 + (++cnt)] = (data[1] >> 8) & 0xff; // setting for persistens handling - mTxBuf[10 + (++cnt)] = (data[1] ) & 0xff; // setting for persistens handling - data[0] /= 10; // UGLY! + mTxBuf[10 + (++cnt)] = (powerLimit >> 8) & 0xff; // power limit + mTxBuf[10 + (++cnt)] = (powerLimit ) & 0xff; // power limit + mTxBuf[10 + (++cnt)] = (powerLimitSetting >> 8) & 0xff; // setting for persistens handling + mTxBuf[10 + (++cnt)] = (powerLimitSetting ) & 0xff; // setting for persistens handling } // crc control data uint16_t crc = crc16(&mTxBuf[10], cnt+1); From adf3de510f035c9baa8df8cf5d3a4b42770fe73e Mon Sep 17 00:00:00 2001 From: lumapu Date: Thu, 11 Aug 2022 13:43:22 +0200 Subject: [PATCH 4/4] Update defines.h update version to 0.5.6 --- tools/esp8266/defines.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/esp8266/defines.h b/tools/esp8266/defines.h index eade9a22..b5813f93 100644 --- a/tools/esp8266/defines.h +++ b/tools/esp8266/defines.h @@ -21,7 +21,7 @@ //------------------------------------- #define VERSION_MAJOR 0 #define VERSION_MINOR 5 -#define VERSION_PATCH 5 +#define VERSION_PATCH 6 //-------------------------------------