upd (#316)

* Zigbee update ZCL * Berry more automated solidification * windows-2019 as Os for GH runner * Fix ADE7953 apparent and reactive power calibration * Fix support of more touch pins (arendst#16518) * Increase power on wait time for SCD30 Increase power on wait time for SCD30 (arendst#15438) * Add command ``SetOption46 0..255`` Add command ``SetOption46 0..255`` to add 0..255 * 10 milliseconds power on delay before initializing I/O (arendst#15438) Co-authored-by: Stephan Hadinger <stephan.hadinger@gmail.com> Co-authored-by: s-hadinger <49731213+s-hadinger@users.noreply.github.com> Co-authored-by: Theo Arends <11044339+arendst@users.noreply.github.com>
Jason2866 · Sep 15, 2022 · a1117f7 · a1117f7
1 parent e5718c5
commit a1117f7
Show file tree

Hide file tree

Showing 30 changed files with 5,231 additions and 3,116 deletions.
diff --git a/.github/workflows/build_all_the_things.yml b/.github/workflows/build_all_the_things.yml
@@ -18,7 +18,7 @@ on:
 
 jobs:
   os-check-win:
-    runs-on: windows-latest
+    runs-on: windows-2019
     if: github.repository == 'arendst/Tasmota'
     strategy:
       fail-fast: true

diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -8,6 +8,7 @@ All notable changes to this project will be documented in this file.
 - Berry has persistent MQTT subscriptions: auto-subscribe at (re)connection
 - Berry automated solidification of code
 - Support of optional file calib.dat on ADE7953 based energy monitors like Shelly EM (#16486)
+- Command ``SetOption46 0..255`` to add 0..255 * 10 milliseconds power on delay before initializing I/O (#15438)
 
 ### Changed
 - ESP32 Increase number of button GPIOs from 8 to 28 (#16518)

diff --git a/RELEASENOTES.md b/RELEASENOTES.md
@@ -109,6 +109,7 @@ The latter links can be used for OTA upgrades too like ``OtaUrl http://ota.tasmo
 
 ## Changelog v12.1.1.2
 ### Added
+- Command ``SetOption46 0..255`` to add 0..255 * 10 milliseconds power on delay before initializing I/O [#15438](https://github.com/arendst/Tasmota/issues/15438)
 - Command ``SetOption146 1`` to enable display of ESP32 internal temperature
 - Command ``StatusRetain`` [#11109](https://github.com/arendst/Tasmota/issues/11109)
 - Command ``DspSpeed 2..127`` to control message rotation speed on display of POWR3xxD and THR3xxD

diff --git a/lib/libesp32/berry/default/berry_conf.h b/lib/libesp32/berry/default/berry_conf.h
@@ -30,7 +30,11 @@
  * type when the value is 2.
  * Default: 2
  */
+#ifdef TASMOTA
 #define BE_INTGER_TYPE                  1           // use long int = uint32_t
+#else
+#define BE_INTGER_TYPE                  0
+#endif
 
 /* Macro: BE_USE_SINGLE_FLOAT
  * Select floating point precision.

diff --git a/lib/libesp32/berry_tasmota/solidify_all.be b/lib/libesp32/berry_tasmota/solidify_all.be
@@ -14,9 +14,10 @@ import re
 # sys.path().push('src/embedded')   # allow to import from src/embedded
 
 # globals that need to exist to make compilation succeed
-var globs = "path,ctypes_bytes_dyn,tasmota,ccronexpr,gpio,light,webclient,load"
+var globs = "path,ctypes_bytes_dyn,tasmota,ccronexpr,gpio,light,webclient,load,MD5,lv,light_state"
 
-var files = ['tasmota_class.be', 'leds.be', 'animate_module.be', 'autoconf_module.be','driver_class.be']
+var files = ['tasmota_class.be', 'leds.be', 'animate_module.be', 'autoconf_module.be','driver_class.be',
+  'partition_core.be','i2c_driver.be','hue_bridge.be','persist.be','uuid.be']
 
 for g:string.split(globs, ",")
   global.(g) = nil