jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-29 05:36:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'development' into prerelease-13.4

Browse Source
This commit is contained in:
Theo Arends 2024-02-14 10:33:54 +01:00
commit 99e44a10af
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/lib_display/Xlatb_RA8876-gemu-1.0/RA8876.h
View File

@ -156,8 +156,8 @@ typedef uint8_t FontFlags;
// 1MHz. TODO: Figure out actual speed to use // 1MHz. TODO: Figure out actual speed to use
// Data sheet section 5.2 says maximum SPI clock is 50MHz. // Data sheet section 5.2 says maximum SPI clock is 50MHz.
//#define RA8876_SPI_SPEED 10000000 //#define RA8876_SPI_SPEED 10000000
//#define RA8876_SPI_SPEED 25000000 #define RA8876_SPI_SPEED 25000000
#define RA8876_SPI_SPEED 40000000 //#define RA8876_SPI_SPEED 40000000
#endif #endif
// With SPI, the RA8876 expects an initial byte where the top two bits are meaningful. Bit 7 // With SPI, the RA8876 expects an initial byte where the top two bits are meaningful. Bit 7

2
tasmota/tasmota_xdrv_driver/xdrv_87_esp32_sonoff_tm1621.ino
View File

@ -437,6 +437,7 @@ void TM1621Show(void) {
return; return;
} }
#ifdef USE_ENERGY_SENSOR
if (TM1621_POWR316D == Tm1621.device) { if (TM1621_POWR316D == Tm1621.device) {
if (0 == Tm1621.display_rotate) { if (0 == Tm1621.display_rotate) {
ext_snprintf_P(Tm1621.row[0], sizeof(Tm1621.row[0]), PSTR("%1_f"), &Energy->voltage[0]); ext_snprintf_P(Tm1621.row[0], sizeof(Tm1621.row[0]), PSTR("%1_f"), &Energy->voltage[0]);
@ -452,6 +453,7 @@ void TM1621Show(void) {
TM1621SendRows(); TM1621SendRows();
return; return;
} }
#endif // USE_ENERGY_SENSOR
if (TM1621_THR316D == Tm1621.device) { if (TM1621_THR316D == Tm1621.device) {
if (!isnan(TasmotaGlobal.temperature_celsius)) { if (!isnan(TasmotaGlobal.temperature_celsius)) {