Merge pull request #10120 from gemu2015/fixes

scripter update

tasmota/xdrv_10_scripter.ino

@@ -108,7 +108,11 @@ uint32_t DecodeLightId(uint32_t hue_id);
 #pragma message "script 24c256 file option used"
 #else
 //#warning "EEP_SCRIPT_SIZE also needs USE_24C256"
+#if EEP_SCRIPT_SIZE==SPI_FLASH_SEC_SIZE
 #pragma message "internal eeprom script buffer used"
+#else
+#pragma message "internal compressed eeprom script buffer used"
+#endif
 //#define USE_24C256
 #endif
 #endif // EEP_SCRIPT_SIZE
@@ -119,7 +123,7 @@ uint32_t DecodeLightId(uint32_t hue_id);
 #endif // USE_UNISHOX_COMPRESSION
 
 
-#ifdef USE_SCRIPT_COMPRESSION
+//#ifdef USE_SCRIPT_COMPRESSION
 #include <unishox.h>
 
 #define SCRIPT_COMPRESS compressor.unishox_compress
@@ -127,7 +131,8 @@ uint32_t DecodeLightId(uint32_t hue_id);
 #ifndef UNISHOXRSIZE
 #define UNISHOXRSIZE 2560
 #endif
-#endif // USE_SCRIPT_COMPRESSION
+
+//#endif // USE_SCRIPT_COMPRESSION
 
 #ifndef STASK_PRIO
 #define STASK_PRIO 1
@@ -158,6 +163,51 @@ void Script_ticker4_end(void) {
 }
 #endif
 
+// EEPROM MACROS
+// i2c eeprom
+
+#if defined(ALT_EEPROM) && !defined(ESP32)
+#undef EEP_WRITE
+#undef EEP_READ
+#undef EEP_INIT
+#define EEP_WRITE(A,B,C) alt_eeprom_writeBytes(A, B, (uint8_t*)C);
+#define EEP_READ(A,B,C) alt_eeprom_readBytes(A, B, (uint8_t*)C);
+#define EEP_INIT(A) alt_eeprom_init(A)
+
+#if EEP_SCRIPT_SIZE>6500
+#undef EEP_SCRIPT_SIZE
+#define EEP_SCRIPT_SIZE 6500
+#endif
+
+uint32_t eeprom_block;
+
+// these support only one 4 k block below EEPROM this steals 4k of application area
+uint32_t alt_eeprom_init(uint32_t size) {
+    //EEPROM.begin(size);
+    eeprom_block = (uint32_t)&_FS_end - 0x40200000 - SPI_FLASH_SEC_SIZE;
+    return 1;
+}
+
+void alt_eeprom_writeBytes(uint32_t adr, uint32_t len, uint8_t *buf) {
+  uint32_t *lwp=(uint32_t*)buf;
+  ESP.flashEraseSector(eeprom_block / SPI_FLASH_SEC_SIZE);
+  ESP.flashWrite(eeprom_block , lwp, SPI_FLASH_SEC_SIZE);
+}
+
+void alt_eeprom_readBytes(uint32_t adr, uint32_t len, uint8_t *buf) {
+  uint32_t *lwp=(uint32_t*)buf;
+  ESP.flashRead(eeprom_block , lwp, SPI_FLASH_SEC_SIZE);
+}
+#else
+#undef EEP_WRITE
+#undef EEP_READ
+#undef EEP_INIT
+#define EEP_WRITE(A,B,C) eeprom_writeBytes(A, B, (uint8_t*)C);
+#define EEP_READ(A,B,C) eeprom_readBytes(A, B, (uint8_t*)C);
+#define EEP_INIT(A) eeprom_init(A)
+#endif // ALT_EEPROM
+
+
 
 #if defined(LITTLEFS_SCRIPT_SIZE) || (USE_SCRIPT_FATFS==-1)
 #ifdef ESP32
@@ -516,10 +566,7 @@ void RulesTeleperiod(void) {
   if (bitRead(Settings.rule_enabled, 0) && TasmotaGlobal.mqtt_data[0]) Run_Scripter(">T", 2, TasmotaGlobal.mqtt_data);
 }
 
-// EEPROM MACROS
+
-// i2c eeprom
-#define EEP_WRITE(A,B,C) eeprom_writeBytes(A, B, (uint8_t*)C);
-#define EEP_READ(A,B,C) eeprom_readBytes(A, B, (uint8_t*)C);
 
 
 #define SCRIPT_SKIP_SPACES while (*lp==' ' || *lp=='\t') lp++;
@@ -3734,22 +3781,45 @@ void esp32_beep(int32_t freq ,uint32_t len) {
     xTimerChangePeriod( beep_th, ticks, 10);
   }
 }
+#endif // ESP32
 
-void esp32_pwm(int32_t value) {
+uint8_t pwmpin[5];
+
+void esp_pwm(int32_t value, uint32 freq, uint32_t channel) {
+  if (channel < 1 || channel > 3) channel = 1;
+#ifdef ESP32
+  channel+=7;
   if (value < 0) {
     if (value <= -64) value = 0;
-    ledcSetup(7, 4000, 10);
+    // set range to 10 bit
-    ledcAttachPin(-value, 7);
+    ledcSetup(channel, freq, 10);
-    ledcWrite(7, 0);
+    ledcAttachPin(-value, channel);
+    ledcWrite(channel, 0);
   } else {
     if (value > 1023) {
       value = 1023;
     }
-    ledcWrite(7, value);
+    ledcWrite(channel, value);
   }
+#else
+  // esp8266 default to range 0-1023
+  channel-=1;
+  if (value < 0) {
+    if (value <= -64) value = 0;
+    pwmpin[channel] = -value;
+    pinMode(pwmpin[channel], OUTPUT);
+    analogWriteFreq(freq);
+    analogWrite(pwmpin[channel], 0);
+  } else {
+    if (value > 1023) {
+      value = 1023;
+    }
+    analogWrite(pwmpin[channel],value);
+  }
+#endif // ESP32
 }
 
-#endif // ESP32
+
 
 //#define IFTHEN_DEBUG
 
@@ -4164,14 +4234,34 @@ int16_t Run_script_sub(const char *type, int8_t tlen, JsonParserObject *jo) {
               lp++;
               goto next_line;
             }
-            else if (!strncmp(lp, "pwm(", 4)) {
+#endif //ESP32
-              lp = GetNumericArgument(lp + 4, OPER_EQU, &fvar, 0);
+
+            else if (!strncmp(lp, "pwm", 3)) {
+              lp += 3;
+              uint8_t channel = 1;
+              if (*(lp+1)=='(') {
+                channel = *lp & 7;
+                if (channel > 5) {
+                  channel = 5;
+                }
+                lp += 2;
+              } else {
+                if (*lp=='(') {
+                  lp++;
+                } else {
+                  goto next_line;
+                }
+              }
+              lp = GetNumericArgument(lp, OPER_EQU, &fvar, 0);
               SCRIPT_SKIP_SPACES
-              esp32_pwm(fvar);
+              float fvar1=4000;
+              if (*lp!=')') {
+                lp = GetNumericArgument(lp, OPER_EQU, &fvar1, 0);
+              }
+              esp_pwm(fvar, fvar1, channel);
               lp++;
               goto next_line;
             }
-#endif //ESP32
             else if (!strncmp(lp, "wcs", 3)) {
               lp+=4;
               // skip one space after cmd
@@ -5116,7 +5206,16 @@ void SaveScript(void) {
 
 #ifdef EEP_SCRIPT_SIZE
   if (glob_script_mem.flags&1) {
+#if EEP_SCRIPT_SIZE==SPI_FLASH_SEC_SIZE
     EEP_WRITE(0, EEP_SCRIPT_SIZE, glob_script_mem.script_ram);
+#else
+    char *ucs;
+    ucs = (char*)calloc(SPI_FLASH_SEC_SIZE + 4, 1);
+    if (!script_compress(ucs,EEP_SCRIPT_SIZE-1)) {
+      EEP_WRITE(0, EEP_SCRIPT_SIZE, ucs);
+    }
+    if (ucs) free(ucs);
+#endif
   }
 #endif // EEP_SCRIPT_SIZE
 
@@ -5198,6 +5297,21 @@ void ScriptSaveSettings(void) {
   SaveScriptEnd();
 }
 
+//
+uint32_t script_compress(char *dest, uint32_t size) {
+  //AddLog_P(LOG_LEVEL_INFO,PSTR("in string: %s len = %d"),glob_script_mem.script_ram,strlen(glob_script_mem.script_ram));
+  uint32_t len_compressed = SCRIPT_COMPRESS(glob_script_mem.script_ram, strlen(glob_script_mem.script_ram), dest, size);
+  if (len_compressed > 0) {
+    dest[len_compressed] = 0;
+    AddLog_P(LOG_LEVEL_INFO,PSTR("script compressed to %d bytes = %d %%"),len_compressed,len_compressed * 100 / strlen(glob_script_mem.script_ram));
+    return 0;
+  } else {
+    AddLog_P(LOG_LEVEL_INFO, PSTR("script compress error: %d"), len_compressed);
+    return 1;
+  }
+}
+//#endif // USE_SCRIPT_COMPRESSION
+
 void SaveScriptEnd(void) {
 
 #ifdef USE_SCRIPT_GLOBVARS
@@ -5212,20 +5326,11 @@ void SaveScriptEnd(void) {
   }
 
 #ifdef USE_SCRIPT_COMPRESSION
-  //AddLog_P(LOG_LEVEL_INFO,PSTR("in string: %s len = %d"),glob_script_mem.script_ram,strlen(glob_script_mem.script_ram));
+  script_compress(Settings.rules[0],MAX_SCRIPT_SIZE-1);
-  uint32_t len_compressed = SCRIPT_COMPRESS(glob_script_mem.script_ram, strlen(glob_script_mem.script_ram), Settings.rules[0], MAX_SCRIPT_SIZE-1);
-  if (len_compressed > 0) {
-    Settings.rules[0][len_compressed] = 0;
-    AddLog_P(LOG_LEVEL_INFO,PSTR("script compressed to %d bytes = %d %%"),len_compressed,len_compressed * 100 / strlen(glob_script_mem.script_ram));
-  } else {
-    AddLog_P(LOG_LEVEL_INFO, PSTR("script compress error: %d"), len_compressed);
-  }
 #endif // USE_SCRIPT_COMPRESSION
 
   if (bitRead(Settings.rule_enabled, 0)) {
 
-
-
     int16_t res = Init_Scripter();
     if (res) {
       AddLog_P(LOG_LEVEL_INFO, PSTR("script init error: %d"), res);
@@ -6990,7 +7095,7 @@ exgc:
                   WSContentSend_PD("['");
                   char lbl[16];
                   if (todflg>=0) {
-                    sprintf(lbl, "%d", todflg / divflg);
+                    sprintf(lbl, "%d:%02d", todflg / divflg, (todflg % divflg) * (60 / divflg) );
                     todflg++;
                     if (todflg >= entries) {
                       todflg = 0;
@@ -7395,9 +7500,10 @@ bool Xdrv10(uint8_t function)
 #endif //USE_BUTTON_EVENT
 
 #ifdef EEP_SCRIPT_SIZE
-      if (eeprom_init(EEP_SCRIPT_SIZE)) {
+      if (EEP_INIT(EEP_SCRIPT_SIZE)) {
-          // found 32kb eeprom
+          // found 32kb eeprom,
           char *script;
+#if EEP_SCRIPT_SIZE==SPI_FLASH_SEC_SIZE
           script = (char*)calloc(EEP_SCRIPT_SIZE + 4, 1);
           if (!script) break;
           glob_script_mem.script_ram = script;
@@ -7407,6 +7513,28 @@ bool Xdrv10(uint8_t function)
             memset(script, EEP_SCRIPT_SIZE, 0);
           }
           script[EEP_SCRIPT_SIZE - 1] = 0;
+#else
+          char *ucs;
+          ucs = (char*)calloc(SPI_FLASH_SEC_SIZE + 4, 1);
+          if (!ucs) break;
+          EEP_READ(0, SPI_FLASH_SEC_SIZE, ucs);
+          if (*ucs==0xff) {
+            memset(ucs, SPI_FLASH_SEC_SIZE, 0);
+          }
+          ucs[SPI_FLASH_SEC_SIZE - 1] = 0;
+
+          script = (char*)calloc(EEP_SCRIPT_SIZE + 4, 1);
+          if (!script) break;
+          glob_script_mem.script_ram = script;
+          glob_script_mem.script_size = EEP_SCRIPT_SIZE;
+
+          int32_t len_decompressed;
+          len_decompressed = SCRIPT_DECOMPRESS(ucs, strlen(ucs), glob_script_mem.script_ram, glob_script_mem.script_size);
+          if (len_decompressed>0) glob_script_mem.script_ram[len_decompressed] = 0;
+
+          if (ucs) free(ucs);
+
+#endif
           // use rules storage for permanent vars
           glob_script_mem.script_pram = (uint8_t*)Settings.rules[0];
           glob_script_mem.script_pram_size = MAX_SCRIPT_SIZE;

tasmota/xdrv_42_i2s_audio.ino

@@ -90,16 +90,16 @@ AudioGeneratorTalkie *talkie = nullptr;
 #define TWATCH_DAC_IIS_DOUT      3
 #endif  // ESP8266
 #ifdef ESP32
-#undef TWATCH_DAC_IIS_BCK
-#undef TWATCH_DAC_IIS_WS
-#undef TWATCH_DAC_IIS_DOUT
 #ifndef TWATCH_DAC_IIS_BCK
+#undef TWATCH_DAC_IIS_BCK
 #define TWATCH_DAC_IIS_BCK       26
 #endif
 #ifndef TWATCH_DAC_IIS_WS
+#undef TWATCH_DAC_IIS_WS
 #define TWATCH_DAC_IIS_WS        25
 #endif
 #ifndef TWATCH_DAC_IIS_DOUT
+#undef TWATCH_DAC_IIS_DOUT
 #define TWATCH_DAC_IIS_DOUT      33
 #endif
 #endif  // ESP32