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

Merge pull request #10050 from gemu2015/bugfixes 

Bugfixes
This commit is contained in:
Theo Arends 2020-12-04 09:24:57 +01:00 committed by GitHub
parent 5b36377126 1e72d27178
commit 555ec1e2a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 86 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/lib_display/Arduino_ST7789-gemu-1.0/Arduino_ST7789.cpp
View File

@ -212,6 +212,8 @@ void Arduino_ST7789::writedata(uint8_t c) {
SPI_END_TRANSACTION();
}
// Companion code to the above tables. Reads and issues
// a series of LCD commands stored in PROGMEM byte array.
void Arduino_ST7789::displayInit(const uint8_t *addr) {
@ -473,6 +475,7 @@ void Arduino_ST7789::fillRect(int16_t x, int16_t y, int16_t w, int16_t h,
spiwrite(hi);
spiwrite(lo);
}
delay(0);
}
CS_HIGH();
SPI_END_TRANSACTION();

76
tasmota/xdrv_10_scripter.ino
View File

@ -166,6 +166,7 @@ void Script_ticker4_end(void) {
#include "SPIFFS.h"
#else
#include "FFat.h"
//#include <LittleFS.h>
#endif
#else
#include <LittleFS.h>
@ -746,7 +747,7 @@ char *script;
// now copy all vars
// numbers
glob_script_mem.fvars = (float*)script_mem;
uint16_t size = sizeof(float)*nvars;
uint16_t size = sizeof(float) * nvars;
memcpy(script_mem, fvalues, size);
script_mem += size;
glob_script_mem.s_fvars = (float*)script_mem;
@ -1943,6 +1944,12 @@ chknext:
case 9:
fvar = Energy.active_power[2];
break;
case 10:
fvar = Energy.start_energy;
break;
case 11:
fvar = Energy.daily;
break;
default:
fvar = 99999;
@ -3706,6 +3713,7 @@ void StopBeep( TimerHandle_t xTimer ) {
void esp32_beep(int32_t freq ,uint32_t len) {
if (freq<0) {
if (freq <= -64) freq = 0;
ledcSetup(7, 500, 10);
ledcAttachPin(-freq, 7);
ledcWriteTone(7, 0);
@ -3726,6 +3734,21 @@ void esp32_beep(int32_t freq ,uint32_t len) {
xTimerChangePeriod( beep_th, ticks, 10);
}
}
void esp32_pwm(int32_t value) {
if (value < 0) {
if (value <= -64) value = 0;
ledcSetup(7, 4000, 10);
ledcAttachPin(-value, 7);
ledcWrite(7, 0);
} else {
if (value > 1023) {
value = 1023;
}
ledcWrite(7, value);
}
}
#endif // ESP32
//#define IFTHEN_DEBUG
@ -4141,6 +4164,13 @@ int16_t Run_script_sub(const char *type, int8_t tlen, JsonParserObject *jo) {
lp++;
goto next_line;
}
else if (!strncmp(lp, "pwm(", 4)) {
lp = GetNumericArgument(lp + 4, OPER_EQU, &fvar, 0);
SCRIPT_SKIP_SPACES
esp32_pwm(fvar);
lp++;
goto next_line;
}
#endif //ESP32
else if (!strncmp(lp, "wcs", 3)) {
lp+=4;
@ -6375,6 +6405,8 @@ const char SCRIPT_MSG_GTABLEa[] PROGMEM =
const char SCRIPT_MSG_GTABLEd[] PROGMEM =
"['Timeline','start','end'],";
const char SCRIPT_MSG_GTABLEe[] PROGMEM =
"['Timeline','Label','start','end'],";
//#define CHART_EXTRA_OPTIONS ",width:'640px',height:'480px'"
#define CHART_EXTRA_OPTIONS
@ -6402,10 +6434,10 @@ const char SCRIPT_MSG_GOPT3[] PROGMEM =
const char SCRIPT_MSG_GOPT4[] PROGMEM =
//"hAxis:{minValue:new Date(0,1,1,0,0),maxValue:new Date(0,1,2,0,0),format:'HH:mm'}";
"hAxis:{minValue:new Date(0,1,1,0,0),maxValue:new Date(0,1,2,0,0),format:'HH:mm'},theme: 'maximized'";
"hAxis:{format:'HH:mm',minValue:new Date(0,0,0,0,0),maxValue:new Date(0,0,0,23,59)},theme: 'maximized'";
const char SCRIPT_MSG_GOPT5[] PROGMEM =
"new Date(0,1,1,%d,%d)";
"new Date(0,0,0,%d,%d)";
const char SCRIPT_MSG_GOPT6[] PROGMEM =
"title:'%s',isStacked:false,vAxis:{viewWindow:{min:%d,max:%d}}%s";
@ -6417,7 +6449,9 @@ const char SCRIPT_MSG_GTE1[] PROGMEM = "'%s'";
#define GLIBS_GAUGE 1<<2
#define GLIBS_TIMELINE 1<<3
#ifndef MAX_GARRAY
#define MAX_GARRAY 4
#endif
char *gc_get_arrays(char *lp, float **arrays, uint8_t *ranum, uint16_t *rentries, uint16_t *ipos) {
@ -6862,25 +6896,53 @@ exgc:
if (ctype=='T') {
if (anum && !(entries & 1)) {
WSContentSend_PD(SCRIPT_MSG_GTABLEa);
WSContentSend_PD(SCRIPT_MSG_GTABLEd);
char label[SCRIPT_MAXSSIZE];
lp = GetStringArgument(lp, OPER_EQU, label, 0);
SCRIPT_SKIP_SPACES
char lab2[SCRIPT_MAXSSIZE];
lab2[0] = 0;
if (*lp!=')') {
lp = GetStringArgument(lp, OPER_EQU, lab2, 0);
WSContentSend_PD(SCRIPT_MSG_GTABLEe);
} else {
WSContentSend_PD(SCRIPT_MSG_GTABLEd);
}
for (uint32_t ind = 0; ind < anum; ind++) {
char lbl[16];
float *fp = arrays[ind];
GetTextIndexed(lbl, sizeof(lbl), ind, label);
char lbl2[16];
if (lab2[0]) {
GetTextIndexed(lbl2, sizeof(lbl2), ind, lab2);
}
uint32_t ventries = 0;
for (uint32_t cnt = 0; cnt < entries; cnt += 2) {
if (fp[cnt]!=0 && fp[cnt+1]!=0) {
ventries+=2;
} else {
break;
}
}
for (uint32_t cnt = 0; cnt < ventries; cnt += 2) {
WSContentSend_PD("['%s',",lbl);
float *fp = arrays[ind];
if (lab2[0]) {
WSContentSend_PD("'%s',",lbl2);
}
uint32_t time = fp[cnt];
WSContentSend_PD(SCRIPT_MSG_GOPT5, time / 60, time % 60);
WSContentSend_PD(",");
time = fp[cnt + 1];
WSContentSend_PD(SCRIPT_MSG_GOPT5, time / 60, time % 60);
WSContentSend_PD("]");
if (cnt < entries - 2) { WSContentSend_PD(","); }
if (cnt < ventries - 2) { WSContentSend_PD(","); }
}
if (ind < anum - 1) {
if (ventries) {
WSContentSend_PD(",");
}
}
if (ind < anum - 1) { WSContentSend_PD(","); }
}
snprintf_P(options,sizeof(options), SCRIPT_MSG_GOPT4);
}

7
tasmota/xdrv_42_i2s_audio.ino
View File

@ -93,9 +93,15 @@ AudioGeneratorTalkie *talkie = nullptr;
#undef TWATCH_DAC_IIS_BCK
#undef TWATCH_DAC_IIS_WS
#undef TWATCH_DAC_IIS_DOUT
#ifndef TWATCH_DAC_IIS_BCK
#define TWATCH_DAC_IIS_BCK 26
#endif
#ifndef TWATCH_DAC_IIS_WS
#define TWATCH_DAC_IIS_WS 25
#endif
#ifndef TWATCH_DAC_IIS_DOUT
#define TWATCH_DAC_IIS_DOUT 33
#endif
#endif // ESP32
#ifdef SAY_TIME
@ -191,6 +197,7 @@ void sayTime(int hour, int minutes, AudioGeneratorTalkie *talkie) {
talkie->say(spA_M_, sizeof(spA_M_));
}
delete talkie;
out->stop();
TTGO_PWR_OFF
}
#endif

1
tasmota/xdsp_08_ILI9488.ino
View File

@ -103,6 +103,7 @@ void ILI9488_InitDriver()
ili9488->begin();
renderer = ili9488;
renderer->DisplayInit(DISPLAY_INIT_MODE,Settings.display_size,Settings.display_rotate,Settings.display_font);
renderer->dim(Settings.display_dimmer);
#ifdef SHOW_SPLASH
// Welcome text

7
tasmota/xdsp_12_ST7789.ino
View File

@ -114,7 +114,11 @@ void ST7789_InitDriver()
st7789 = new Arduino_ST7789(Pin(GPIO_SPI_DC), reset, cs, bppin);
} else {
if ((PinUsed(GPIO_SSPI_CS) || PinUsed(GPIO_OLED_RESET)) && PinUsed(GPIO_SSPI_MOSI) && PinUsed(GPIO_SSPI_SCLK) && PinUsed(GPIO_SSPI_DC)) {
st7789 = new Arduino_ST7789(Pin(GPIO_SSPI_DC), reset, Pin(GPIO_SSPI_MOSI), Pin(GPIO_SSPI_SCLK), cs, bppin);
if ((Pin(GPIO_SSPI_MOSI)==HW_SPI_MOSI) && (Pin(GPIO_SSPI_SCLK)==HW_SPI_CLK)) {
st7789 = new Arduino_ST7789(Pin(GPIO_SSPI_DC), reset, cs, bppin);
} else {
st7789 = new Arduino_ST7789(Pin(GPIO_SSPI_DC), reset, Pin(GPIO_SSPI_MOSI), Pin(GPIO_SSPI_SCLK), cs, bppin);
}
} else {
return;
}
@ -122,6 +126,7 @@ void ST7789_InitDriver()
st7789->init(Settings.display_width,Settings.display_height);
renderer = st7789;
renderer->DisplayInit(DISPLAY_INIT_MODE,Settings.display_size,Settings.display_rotate,Settings.display_font);
renderer->dim(Settings.display_dimmer);
#ifdef SHOW_SPLASH
// Welcome text