Merge branch 'arendst:development' into New-Venetian-Blind

2021-11-07 15:54:07 +01:00 · 2021-11-07 15:54:07 +01:00 · 2bc784fcbe
parent 5a5a0acbf4 0ecf398a38
commit 2bc784fcbe
53 changed files with 11 additions and 15 deletions
--- a/lib/libesp32_eink/epdiy/.gitignore
+++ b/lib/libesp32_eink/epdiy/.gitignore
--- a/lib/libesp32_eink/epdiy/.gitmodules
+++ b/lib/libesp32_eink/epdiy/.gitmodules
--- a/lib/libesp32_eink/epdiy/.readthedocs.yml
+++ b/lib/libesp32_eink/epdiy/.readthedocs.yml
--- a/lib/libesp32_eink/epdiy/Makefile
+++ b/lib/libesp32_eink/epdiy/Makefile
--- a/lib/libesp32_eink/epdiy/README.md
+++ b/lib/libesp32_eink/epdiy/README.md
--- a/lib/libesp32_eink/epdiy/boards.local.txt
+++ b/lib/libesp32_eink/epdiy/boards.local.txt
--- a/lib/libesp32_eink/epdiy/library.properties
+++ b/lib/libesp32_eink/epdiy/library.properties
--- a/lib/libesp32_eink/epdiy/scripts/LICENSE
+++ b/lib/libesp32_eink/epdiy/scripts/LICENSE
--- a/lib/libesp32_eink/epdiy/scripts/epdiy_waveform_gen.py
+++ b/lib/libesp32_eink/epdiy/scripts/epdiy_waveform_gen.py
--- a/lib/libesp32_eink/epdiy/scripts/fontconvert.py
+++ b/lib/libesp32_eink/epdiy/scripts/fontconvert.py
--- a/lib/libesp32_eink/epdiy/scripts/imgconvert.py
+++ b/lib/libesp32_eink/epdiy/scripts/imgconvert.py
--- a/lib/libesp32_eink/epdiy/scripts/modenames.py
+++ b/lib/libesp32_eink/epdiy/scripts/modenames.py
--- a/lib/libesp32_eink/epdiy/scripts/waveform_hdrgen.py
+++ b/lib/libesp32_eink/epdiy/scripts/waveform_hdrgen.py
--- a/lib/libesp32_eink/epdiy/src/epd4in7.cpp
+++ b/lib/libesp32_eink/epdiy/src/epd4in7.cpp
--- a/lib/libesp32_eink/epdiy/src/epd4in7.h
+++ b/lib/libesp32_eink/epdiy/src/epd4in7.h
--- a/lib/libesp32_eink/epdiy/src/epd_driver.h
+++ b/lib/libesp32_eink/epdiy/src/epd_driver.h
--- a/lib/libesp32_eink/epdiy/src/epd_driver/CMakeLists.txt
+++ b/lib/libesp32_eink/epdiy/src/epd_driver/CMakeLists.txt
--- a/lib/libesp32_eink/epdiy/src/epd_driver/Kconfig
+++ b/lib/libesp32_eink/epdiy/src/epd_driver/Kconfig
--- a/lib/libesp32_eink/epdiy/src/epd_driver/LICENSE
+++ b/lib/libesp32_eink/epdiy/src/epd_driver/LICENSE
--- a/lib/libesp32_eink/epdiy/src/epd_driver/Makefile
+++ b/lib/libesp32_eink/epdiy/src/epd_driver/Makefile
--- a/lib/libesp32_eink/epdiy/src/epd_driver/builtin_waveforms.c
+++ b/lib/libesp32_eink/epdiy/src/epd_driver/builtin_waveforms.c
--- a/lib/libesp32_eink/epdiy/src/epd_driver/config_reg_v2.h
+++ b/lib/libesp32_eink/epdiy/src/epd_driver/config_reg_v2.h
--- a/lib/libesp32_eink/epdiy/src/epd_driver/config_reg_v4.h
+++ b/lib/libesp32_eink/epdiy/src/epd_driver/config_reg_v4.h
--- a/lib/libesp32_eink/epdiy/src/epd_driver/display_ops.c
+++ b/lib/libesp32_eink/epdiy/src/epd_driver/display_ops.c
--- a/lib/libesp32_eink/epdiy/src/epd_driver/display_ops.h
+++ b/lib/libesp32_eink/epdiy/src/epd_driver/display_ops.h
--- a/lib/libesp32_eink/epdiy/src/epd_driver/epd_driver.c
+++ b/lib/libesp32_eink/epdiy/src/epd_driver/epd_driver.c
--- a/lib/libesp32_eink/epdiy/src/epd_driver/epd_temperature.c
+++ b/lib/libesp32_eink/epdiy/src/epd_driver/epd_temperature.c
--- a/lib/libesp32_eink/epdiy/src/epd_driver/epd_temperature.h
+++ b/lib/libesp32_eink/epdiy/src/epd_driver/epd_temperature.h
--- a/lib/libesp32_eink/epdiy/src/epd_driver/font.c
+++ b/lib/libesp32_eink/epdiy/src/epd_driver/font.c
--- a/lib/libesp32_eink/epdiy/src/epd_driver/hacks.cmake
+++ b/lib/libesp32_eink/epdiy/src/epd_driver/hacks.cmake
--- a/lib/libesp32_eink/epdiy/src/epd_driver/highlevel.c
+++ b/lib/libesp32_eink/epdiy/src/epd_driver/highlevel.c
--- a/lib/libesp32_eink/epdiy/src/epd_driver/i2s_data_bus.c
+++ b/lib/libesp32_eink/epdiy/src/epd_driver/i2s_data_bus.c
--- a/lib/libesp32_eink/epdiy/src/epd_driver/i2s_data_bus.h
+++ b/lib/libesp32_eink/epdiy/src/epd_driver/i2s_data_bus.h
--- a/lib/libesp32_eink/epdiy/src/epd_driver/include/epd_driver.h
+++ b/lib/libesp32_eink/epdiy/src/epd_driver/include/epd_driver.h
--- a/lib/libesp32_eink/epdiy/src/epd_driver/include/epd_highlevel.h
+++ b/lib/libesp32_eink/epdiy/src/epd_driver/include/epd_highlevel.h
--- a/lib/libesp32_eink/epdiy/src/epd_driver/include/epd_internals.h
+++ b/lib/libesp32_eink/epdiy/src/epd_driver/include/epd_internals.h
--- a/lib/libesp32_eink/epdiy/src/epd_driver/lut.c
+++ b/lib/libesp32_eink/epdiy/src/epd_driver/lut.c
--- a/lib/libesp32_eink/epdiy/src/epd_driver/lut.h
+++ b/lib/libesp32_eink/epdiy/src/epd_driver/lut.h
--- a/lib/libesp32_eink/epdiy/src/epd_driver/render.c
+++ b/lib/libesp32_eink/epdiy/src/epd_driver/render.c
--- a/lib/libesp32_eink/epdiy/src/epd_driver/rmt_pulse.c
+++ b/lib/libesp32_eink/epdiy/src/epd_driver/rmt_pulse.c
--- a/lib/libesp32_eink/epdiy/src/epd_driver/rmt_pulse.h
+++ b/lib/libesp32_eink/epdiy/src/epd_driver/rmt_pulse.h
--- a/lib/libesp32_eink/epdiy/src/epd_driver/waveforms/ED047TC2.h
+++ b/lib/libesp32_eink/epdiy/src/epd_driver/waveforms/ED047TC2.h
--- a/lib/libesp32_eink/epdiy/src/epd_driver/waveforms/epdiy_ED047TC1.h
+++ b/lib/libesp32_eink/epdiy/src/epd_driver/waveforms/epdiy_ED047TC1.h
--- a/lib/libesp32_eink/epdiy/src/epd_driver/waveforms/epdiy_ED060SC4.h
+++ b/lib/libesp32_eink/epdiy/src/epd_driver/waveforms/epdiy_ED060SC4.h
--- a/lib/libesp32_eink/epdiy/src/epd_driver/waveforms/epdiy_ED060SCT.h
+++ b/lib/libesp32_eink/epdiy/src/epd_driver/waveforms/epdiy_ED060SCT.h
--- a/lib/libesp32_eink/epdiy/src/epd_driver/waveforms/epdiy_ED060XC3.h
+++ b/lib/libesp32_eink/epdiy/src/epd_driver/waveforms/epdiy_ED060XC3.h
--- a/lib/libesp32_eink/epdiy/src/epd_driver/waveforms/epdiy_ED097OC4.h
+++ b/lib/libesp32_eink/epdiy/src/epd_driver/waveforms/epdiy_ED097OC4.h
--- a/lib/libesp32_eink/epdiy/src/epd_driver/waveforms/epdiy_ED097TC2.h
+++ b/lib/libesp32_eink/epdiy/src/epd_driver/waveforms/epdiy_ED097TC2.h
--- a/lib/libesp32_eink/epdiy/src/epd_driver/waveforms/epdiy_ED133UT2.h
+++ b/lib/libesp32_eink/epdiy/src/epd_driver/waveforms/epdiy_ED133UT2.h
--- a/lib/libesp32_eink/epdiy/src/epd_highlevel.h
+++ b/lib/libesp32_eink/epdiy/src/epd_highlevel.h
--- a/platformio_override_sample.ini
+++ b/platformio_override_sample.ini
@ -134,7 +134,7 @@ lib_extra_dirs           = ${library.lib_extra_dirs}
 ; *** uncomment the following line if you use Bluetooth or Apple Homekit in a Tasmota32 build. Reduces compile time
 ;                          lib/libesp32_div
 ; *** uncomment the following line if you use Epaper driver epidy in your Tasmota32 build. Reduces compile time 
-;                          lib/libesp32_epdiy
+;                          lib/libesp32_eink


 [library]
--- a/platformio_tasmota_cenv_sample.ini
+++ b/platformio_tasmota_cenv_sample.ini
@ -14,12 +14,11 @@ extends                     = env:tasmota32-dev
 platform_packages           = ${env:tasmota32-dev.platform_packages}
 board                       = esp32s2
 build_flags                 = ${env:tasmota32idf4.build_flags}
-lib_extra_dirs              = lib/libesp32
-                              lib/libesp32_lvgl
-                              lib/lib_basic
-                              lib/lib_i2c
-                              lib/lib_ssl
-                              lib/lib_display
+                             -D FIRMWARE_TASMOTA32
+lib_ignore                  =
+                              ESP8266Audio
+                              ESP8266SAM
+                              TTGO TWatch Library

 [env:tasmota-rangeextender]
 build_flags                 = ${env.build_flags}
--- a/platformio_tasmota_env32.ini
+++ b/platformio_tasmota_env32.ini
@ -17,7 +17,7 @@ lib_extra_dirs              = ${common.lib_extra_dirs}
                              lib/libesp32
                              lib/libesp32_lvgl
                              lib/libesp32_div
-                              lib/libesp32_epdiy
+                              lib/libesp32_eink
 lib_ignore                  =
                              ESP RainMaker
                              WiFiProv
@ -121,17 +121,14 @@ build_flags             = ${env:tasmota32idf4.build_flags}
 ;                          -DUSE_BLE_ESP32
 ;                          -DUSE_MI_ESP32
                           ;-DESP32_STAGE=true
-lib_extra_dirs          = lib/libesp32
-                          lib/libesp32_div
-                          lib/libesp32_lvgl
-                          lib/lib_basic
-                          lib/lib_i2c
-                          lib/lib_ssl
-                          lib/lib_display
+                           -DFIRMWARE_TASMOTA32
 lib_ignore              =
+                          ESP8266Audio
+                          ESP8266SAM
                          TTGO TWatch Library
                          ESP32-HomeKit
                          Micro-RTSP
+                          epdiy

 [env:tasmota32-AF]
 extends                 = env:tasmota32_base