mirrors
/
Tasmota
mirror of https://github.com/arendst/Tasmota.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #13540 from Jason2866/Test 

Epdiy Waveform update Lilly Go 4.7
This commit is contained in:
Jason2866 2021-11-01 15:57:20 +01:00 committed by GitHub
parent 53a2dfee87 f286f5e5d6
commit fefba19342
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 93 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/libesp32_epdiy/src/epd_driver/builtin_waveforms.c
View File

@ -1,6 +1,6 @@
#include "epd_driver.h"
#include "waveforms/ED047TC2.h"
#include "waveforms/epdiy_ED047TC1.h"
#include "waveforms/epdiy_ED060SC4.h"
#include "waveforms/epdiy_ED060XC3.h"

7
lib/libesp32_epdiy/src/epd_driver/include/epd_internals.h
View File

@ -86,7 +86,7 @@ typedef struct {
extern const EpdWaveform ed047tc2;
extern const EpdWaveform epdiy_ED060SC4;
extern const EpdWaveform epdiy_ED097OC4;
extern const EpdWaveform epdiy_ED047TC1;
@ -96,7 +96,8 @@ extern const EpdWaveform epdiy_ED060SCT;
extern const EpdWaveform epdiy_ED133UT2;
#if defined(CONFIG_EPD_DISPLAY_TYPE_ED047TC1)
#define EPD_BUILTIN_WAVEFORM &epdiy_ED047TC1
//#define EPD_BUILTIN_WAVEFORM &epdiy_ED047TC1
#define EPD_BUILTIN_WAVEFORM &ed047tc2
#elif defined(CONFIG_EPD_DISPLAY_TYPE_ED060SC4)
#define EPD_BUILTIN_WAVEFORM &epdiy_ED060SC4
#elif defined(CONFIG_EPD_DISPLAY_TYPE_ED060XC3)
@ -143,5 +144,3 @@ typedef struct {
#endif // EPD_INTERNALS_H

52
lib/libesp32_epdiy/src/epd_driver/waveforms/ED047TC2.h Normal file
View File

File diff suppressed because one or more lines are too long

37
platformio_tasmota_cenv_sample.ini
View File

@ -13,24 +13,6 @@ build_flags = ${env.build_flags}
-D USE_WIFI_RANGE_EXTENDER
-D USE_WIFI_RANGE_EXTENDER_NAPT
; *** Beta Tasmota version for ESP32 IDF4.4.
[env:tasmota32idf4]
extends = env:tasmota32_base
platform = https://github.com/platformio/platform-espressif32.git#feature/arduino-idf-master
platform_packages = ${core32.platform_packages}
framework-arduinoespressif32 @ https://github.com/tasmota/arduino-esp32/releases/download/2.0.1rc1/framework-arduinoespressif32-release_IDF4.4.tar.gz
build_unflags = ${env:tasmota32_base.build_unflags}
-Wswitch-unreachable
-Wstringop-overflow
-Wincompatible-pointer-types
build_flags = ${env:tasmota32_base.build_flags}
-Wno-switch-unreachable
-Wno-stringop-overflow
; ***Uncomment next two lines to enable BLE
;-DUSE_BLE_ESP32
;-DUSE_MI_ESP32
;-DESP32_STAGE=true
[env:tasmota32-rangeextender]
extends = env:tasmota32idf4
build_flags = ${env:tasmota32idf4.build_flags}
@ -39,30 +21,17 @@ build_flags = ${env:tasmota32idf4.build_flags}
-D USE_WIFI_RANGE_EXTENDER_NAPT
;*** Beta Tasmota version for ESP32-S2
;*** Example how to override the standard core with [tasmota32-dev] core
[env:tasmota32s2]
extends = env:tasmota32_base
extends = env:tasmota32-dev
platform_packages = ${env:tasmota32-dev.platform_packages}
board = esp32s2
platform = https://github.com/platformio/platform-espressif32.git#feature/arduino-idf-master
platform_packages = ${core32.platform_packages}
framework-arduinoespressif32 @ https://github.com/tasmota/arduino-esp32/releases/download/2.0.1rc1/framework-arduinoespressif32-release_IDF4.4.tar.gz
build_unflags = ${env:tasmota32_base.build_unflags}
-Wswitch-unreachable
-Wstringop-overflow
-Wincompatible-pointer-types
build_flags = ${env:tasmota32_base.build_flags}
-Wno-switch-unreachable
-Wno-stringop-overflow
lib_extra_dirs = lib/libesp32
lib/libesp32_lvgl
lib/lib_basic
lib/lib_i2c
lib/lib_ssl
lib/lib_display
lib_ignore =
NimBLE-Arduino
TTGO TWatch Library
ESP32-HomeKit
Micro-RTSP
; *** Debug version used for PlatformIO Home Project Inspection
[env:tasmota-debug]

62
platformio_tasmota_env32.ini
View File

@ -33,6 +33,18 @@ lib_ignore =
; Disable next if you want to use ArduinoOTA in Tasmota32 (default disabled)
ArduinoOTA
[env:tasmota32idf4]
extends = env:tasmota32_base
platform = https://github.com/platformio/platform-espressif32.git#feature/arduino-idf-master
platform_packages = ${core32.platform_packages}
framework-arduinoespressif32 @ https://github.com/tasmota/arduino-esp32/releases/download/2.0.1rc1/framework-arduinoespressif32-release_IDF4.4.tar.gz
build_unflags = ${env:tasmota32_base.build_unflags}
-Wswitch-unreachable
-Wstringop-overflow
-Wincompatible-pointer-types
build_flags = ${env:tasmota32_base.build_flags}
-Wno-switch-unreachable
-Wno-stringop-overflow
[env:tasmota32]
extends = env:tasmota32_base
@ -94,35 +106,29 @@ build_flags = ${env:tasmota32_base.build_flags} -DUSE_IR_REMOTE_FULL
lib_extra_dirs = lib/libesp32, lib/lib_basic
[env:tasmota32c3]
extends = env:tasmota32_base
board = esp32c3
platform = https://github.com/platformio/platform-espressif32.git#feature/arduino-idf-master
platform_packages = ${core32.platform_packages}
framework-arduinoespressif32 @ https://github.com/tasmota/arduino-esp32/releases/download/2.0.1rc1/framework-arduinoespressif32-release_IDF4.4.tar.gz
build_unflags = ${env:tasmota32_base.build_unflags}
-Wswitch-unreachable
-Wstringop-overflow
-Wincompatible-pointer-types
-mtarget-align
-DNDEBUG
build_flags = ${env:tasmota32_base.build_flags}
-Wno-switch-unreachable
-Wno-stringop-overflow
extends = env:tasmota32idf4
board = esp32c3
platform = ${env:tasmota32idf4.platform}
platform_packages = ${env:tasmota32idf4.platform_packages}
build_unflags = ${env:tasmota32idf4.build_unflags}
-mtarget-align
-DNDEBUG
build_flags = ${env:tasmota32idf4.build_flags}
; *** Comment next two lines to disable BLE
; -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
lib_ignore =
TTGO TWatch Library
ESP32-HomeKit
Micro-RTSP
; -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
lib_ignore =
TTGO TWatch Library
ESP32-HomeKit
Micro-RTSP
[env:tasmota32-AF]
extends = env:tasmota32_base