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

Fix Sonoff SPM relay GUI display 

Fix Sonoff SPM relay GUI display (#13447)
This commit is contained in:
Theo Arends 2021-12-29 17:46:52 +01:00
parent 4fa17ebde1
commit 0bfa5af3ad
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
tasmota/xdrv_86_esp32_sonoff_spm.ino
View File

@ -69,9 +69,9 @@
* GPIO03 - Serial console RX * GPIO03 - Serial console RX
* GPIO04 - ARM processor TX (115200bps8N1) * GPIO04 - ARM processor TX (115200bps8N1)
* GPIO05 - ETH POWER * GPIO05 - ETH POWER
* GPIO12 - SPI MOSI ARM output (pin36 - PB15) - ESP input * GPIO12 - SPI MISO to MOSI ARM output (pin36 - PB15)
* GPIO13 - SPI MISO ESP output - ARM input (pin35 - PB14) * GPIO13 - SPI MOSI to MISO ARM input (pin35 - PB14)
* GPIO14 - SPI CLK ESP input (ARM pin34 - PB13) * GPIO14 - SPI SCLK to ARM input (ARM pin34 - PB13)
* GPIO15 - ARM reset (output) - 18ms low active 125ms after restart esp32 * GPIO15 - ARM reset (output) - 18ms low active 125ms after restart esp32
* GPIO16 - ARM processor RX * GPIO16 - ARM processor RX
* GPIO17 - EMAC_CLK_OUT_180 * GPIO17 - EMAC_CLK_OUT_180
@ -1204,6 +1204,7 @@ void SSPMEnergyShow(bool json) {
if (index) { if (index) {
uint32_t offset = 0; uint32_t offset = 0;
/*
if (index > 4) { if (index > 4) {
Sspm->rotate++; Sspm->rotate++;
if (Sspm->rotate >= ((index -1) >> 2) << 3) { if (Sspm->rotate >= ((index -1) >> 2) << 3) {
@ -1211,6 +1212,15 @@ void SSPMEnergyShow(bool json) {
} }
offset = (Sspm->rotate >> 2) * 4; offset = (Sspm->rotate >> 2) * 4;
} }
*/
if (index > 4) {
Sspm->rotate++;
if (Sspm->rotate >= (index | 0x3)) {
Sspm->rotate = 0;
}
offset = (Sspm->rotate >> 2) * 4;
}
uint32_t count = index - offset; uint32_t count = index - offset;
if (count > 4) { count = 4; } if (count > 4) { count = 4; }
WSContentSend_P(PSTR("</table>{t}{s}")); // First column is empty ({t} = <table style='width:100%'>, {s} = <tr><th>) WSContentSend_P(PSTR("</table>{t}{s}")); // First column is empty ({t} = <table style='width:100%'>, {s} = <tr><th>)