rev v3.1.0

vortigont · Sep 1, 2022 · 3b6630b · 3b6630b
1 parent 35bd422
commit 3b6630b
Show file tree

Hide file tree

Showing 6 changed files with 20 additions and 21 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,8 +1,12 @@
 # Change Log
 
+## v3.1.0 (2022-09-01)
+* deprecate esp32 platform v3.5 and older
 * compressed OTA updates via [esp32-flashz](https://github.com/vortigont/esp32-flashz) lib
-* web application manifest added, ESPEM webpage could be added as a shortcut on mobile chrome
+* web application manifest added, ESPEM webpage UI could be added as a shortcut on mobile chrome
 * adopted building with Arduino core >2.0.0
++ debug version dumps polled data readings to console 
++ http://espem/fw provides more details about mem/psram usage 
 * UI now can detect if PZEM is disconnected or unreachable and show "err" values
 + energy offset feature
 

diff --git a/docs/BUILD.md b/docs/BUILD.md
@@ -59,15 +59,16 @@ platformio run -e espem_debug -t uploadfs
 
 
 
-That's it. Controller should reboot and enable WiFi. Look for the open Access point names like EmbUI-xxxx, connect to it and open WebUI http://192.168.4.1/, proceed with settings via WebUI. Check [USGE](USAGE.md) page for more details.
+That's it. Controller should reboot and enable WiFi. Look for the open Access point names like EmbUI-xxxx, connect to it and open WebUI http://192.168.4.1/, proceed with settings via WebUI. Check [USAGE](USAGE.md) page for more details.
 
 
-### Copressed OTA updates
+### Compressed OTA updates
 Uploading updated firmware could be done either via WebUI or curl CLI tool. It is possible to compress images with zlib to reduce upload size, decompression is handled via [esp32-flashz](https://github.com/vortigont/esp32-flashz) lib.
 
-OTA could be intergated to Platformio's scritping, check supplied platformio.ini for OTA template. it need two options:
- - OTA_url - upload url to access espem
- - OTA_compress - use zlib compression on upload
+OTA could be intergated to Platformio's scritping, check supplied `platformio.ini` for OTA template. It needs following options:
+ - `upload_protocol = custom` - enable custom fw uploader
+ - `upload_port` - upload url to access espem
+ - `upload_flags = compress` - use zlib compression on upload
 
 
 uploading fw with curl CLI

diff --git a/espem/espem.cpp b/espem/espem.cpp
@@ -1,8 +1,8 @@
 /*  ESPEM - ESP Energy monitor
- *  A code for ESP8266/ESP32 based boards to interface with PeaceFair PZEM PowerMeters
+ *  A code for ESP32 based boards to interface with PeaceFair PZEM PowerMeters
  *  It can poll/collect PowerMeter data and provide it for futher processing in text/json format
  *
- *  (c) Emil Muratov 2018-2021  https://github.com/vortigont/espem
+ *  (c) Emil Muratov 2018-2022  https://github.com/vortigont/espem
  *
  */
 

diff --git a/espem/espem.h b/espem/espem.h
@@ -1,8 +1,8 @@
 /*  ESPEM - ESP Energy monitor
- *  A code for ESP8266/ESP32 based boards to interface with PeaceFair PZEM PowerMeters
+ *  A code for ESP32 based boards to interface with PeaceFair PZEM PowerMeters
  *  It can poll/collect PowerMeter data and provide it for futher processing in text/json format
  *
- *  (c) Emil Muratov 2018-2021  https://github.com/vortigont/espem
+ *  (c) Emil Muratov 2018-2022  https://github.com/vortigont/espem
  *
  */
 

diff --git a/espem/main.cpp b/espem/main.cpp
@@ -1,8 +1,8 @@
 /*  ESPEM - ESP Energy monitor
- *  A code for ESP8266 based boards to interface with PeaceFair PZEM PowerMeters
+ *  A code for ESP32 based boards to interface with PeaceFair PZEM PowerMeters
  *  It can poll/collect PowerMeter data and provide it for futher processing in text/json format
  *
- *  (c) Emil Muratov 2017-2021
+ *  (c) Emil Muratov 2017-2022
  *
  */
 

diff --git a/espem/main.h b/espem/main.h
@@ -1,8 +1,8 @@
 /*  ESPEM - ESP Energy monitor
- *  A code for ESP8266 based boards to interface with PeaceFair PZEM PowerMeters
+ *  A code for ESP32 based boards to interface with PeaceFair PZEM PowerMeters
  *  It can poll/collect PowerMeter data and provide it for futher processing in text/json format
  *
- *  (c) Emil Muratov 2018 - 2021
+ *  (c) Emil Muratov 2018 - 2022
  *
  */
 
@@ -11,7 +11,7 @@
 #define FW_NAME "espem"
 
 #define FW_VERSION_MAJOR     3
-#define FW_VERSION_MINOR     0
+#define FW_VERSION_MINOR     1
 #define FW_VERSION_REVISION  0
 
 /* make version as integer*/
@@ -33,12 +33,6 @@
 #include "uistrings.h"  // non-localized text-strings
 #include <ESPAsyncWebServer.h>
 
-#ifdef ESP8266
-extern "C" {
-#include "user_interface.h"
-}
-#endif
-
 // EMBUI
 void create_parameters();       // декларируем для переопределения weak метода из фреймворка для WebUI
 void sync_parameters();