jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-25 11:46:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Revert "Merge pull request #8174 from gemu2015/scripter_update"

Browse Source 
This reverts commit e66b961a546b93622d4177e3af3930dd2772e9ae, reversing
changes made to 07ce4315381cb9984d5139d22a380c88b1ec659c.
This commit is contained in:
Theo Arends 2020-04-14 14:58:17 +02:00
parent bec1f74685
commit a52d4c5208
1 changed files with 0 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
tasmota/xdrv_10_scripter.ino
View File

@ -65,31 +65,6 @@ keywords if then else endif, or, and are better readable for beginners (others m
uint32_t EncodeLightId(uint8_t relay_id); uint32_t EncodeLightId(uint8_t relay_id);
uint32_t DecodeLightId(uint32_t hue_id); uint32_t DecodeLightId(uint32_t hue_id);
#ifdef ESP32
#include "FS.h"
#include "SPIFFS.h"
void SaveFile(char *name,const uint8_t *buf,uint32_t len) {
File file = SPIFFS.open(name, FILE_WRITE);
if (!file) return;
file.write(buf, len);
file.close();
}
#define FORMAT_SPIFFS_IF_FAILED true
void LoadFile(char *name,uint8_t *buf,uint32_t len) {
if(!SPIFFS.begin(FORMAT_SPIFFS_IF_FAILED)){
return;
}
File file = SPIFFS.open(name);
if (!file) return;
file.read(buf, len);
file.close();
}
#endif
// offsets epoch readings by 1.1.2019 00:00:00 to fit into float with second resolution // offsets epoch readings by 1.1.2019 00:00:00 to fit into float with second resolution
#define EPOCH_OFFSET 1546300800 #define EPOCH_OFFSET 1546300800
@ -3622,15 +3597,6 @@ void ScriptSaveSettings(void) {
} }
#endif #endif
#ifndef ESP32_SCRIPT_SIZE
#define ESP32_SCRIPT_SIZE 8192
#endif
#if defined(ESP32) && !defined(USE_24C256) && !defined(USE_SCRIPT_FATFS)
if (glob_script_mem.flags&1) {
SaveFile("/script.txt",(uint8_t*)glob_script_mem.script_ram,ESP32_SCRIPT_SIZE);
}
#endif
} }
if (glob_script_mem.script_mem) { if (glob_script_mem.script_mem) {
@ -4854,7 +4820,6 @@ bool Xdrv10(uint8_t function)
switch (function) { switch (function) {
case FUNC_PRE_INIT: case FUNC_PRE_INIT:
//webcam_setup();
// set defaults to rules memory // set defaults to rules memory
glob_script_mem.script_ram=Settings.rules[0]; glob_script_mem.script_ram=Settings.rules[0];
glob_script_mem.script_size=MAX_SCRIPT_SIZE; glob_script_mem.script_size=MAX_SCRIPT_SIZE;
@ -4924,21 +4889,6 @@ bool Xdrv10(uint8_t function)
} }
#endif #endif
#if defined(ESP32) && !defined(USE_24C256) && !defined(USE_SCRIPT_FATFS)
char *script;
script=(char*)calloc(ESP32_SCRIPT_SIZE+4,1);
if (!script) break;
LoadFile("/script.txt",(uint8_t*)script,ESP32_SCRIPT_SIZE);
glob_script_mem.script_ram=script;
glob_script_mem.script_size=ESP32_SCRIPT_SIZE;
script[ESP32_SCRIPT_SIZE-1]=0;
// 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;
glob_script_mem.flags=1;
#endif
// assure permanent memory is 4 byte aligned // assure permanent memory is 4 byte aligned
{ uint32_t ptr=(uint32_t)glob_script_mem.script_pram; { uint32_t ptr=(uint32_t)glob_script_mem.script_pram;
ptr&=0xfffffffc; ptr&=0xfffffffc;