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

Merge pull request #10508 from gemu2015/fixes 

Fixes
This commit is contained in:
Theo Arends 2021-01-10 19:55:00 +01:00 committed by GitHub
parent d53fa3234d e68d9e7e92
commit 13a61b562c
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
tasmota/xdrv_10_scripter.ino
View File

@ -155,16 +155,30 @@ void Script_ticker4_end(void) {
// i2c eeprom // i2c eeprom
#define EEP_WRITE(A,B,C) eeprom_writeBytes(A, B, (uint8_t*)C); #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_READ(A,B,C) eeprom_readBytes(A, B, (uint8_t*)C);
#ifdef ESP8266
#ifdef USE_24C256
#undef EEP_INIT
#define EEP_INIT(A) eeprom_init(A) #define EEP_INIT(A) eeprom_init(A)
#else
#undef EEP_INIT
#define EEP_INIT(A) alt_eeprom_init(A)
#endif
#endif
#if defined(EEP_SCRIPT_SIZE) && !defined(ESP32) #if defined(EEP_SCRIPT_SIZE) && !defined(ESP32)
// seems to be the last untouched sector, beside OTA and serial Flash
#define SPEC_SCRIPT_FLASH 0x000F2000
uint32_t eeprom_block; uint32_t eeprom_block;
// these support only one 4 k block below EEPROM this steals 4k of application area // these support only one 4 k block below EEPROM this steals 4k of application area
uint32_t alt_eeprom_init(uint32_t size) { uint32_t alt_eeprom_init(uint32_t size) {
//EEPROM.begin(size); //EEPROM.begin(size);
eeprom_block = (uint32_t)&_FS_end - 0x40200000 - SPI_FLASH_SEC_SIZE; //eeprom_block = (uint32_t)&_FS_end - 0x40200000 - SPI_FLASH_SEC_SIZE;
eeprom_block = SPEC_SCRIPT_FLASH;
return 1; return 1;
} }
@ -7424,7 +7438,7 @@ bool Xdrv10(uint8_t function)
glob_script_mem.script_pram = (uint8_t*)Settings.rules[0]; glob_script_mem.script_pram = (uint8_t*)Settings.rules[0];
glob_script_mem.script_pram_size = MAX_SCRIPT_SIZE; glob_script_mem.script_pram_size = MAX_SCRIPT_SIZE;
glob_script_mem.FLAGS.fsys = true; glob_script_mem.FLAGS.eeprom = true;
} }
#else // EEP_SCRIPT_SIZE #else // EEP_SCRIPT_SIZE
@ -7521,9 +7535,6 @@ bool Xdrv10(uint8_t function)
cpy2lf(bname, sizeof(bname), glob_script_mem.section_ptr + 3); cpy2lf(bname, sizeof(bname), glob_script_mem.section_ptr + 3);
WSContentSend_PD(HTTP_WEB_FULL_DISPLAY, bname); WSContentSend_PD(HTTP_WEB_FULL_DISPLAY, bname);
Webserver->on("/sfd", ScriptFullWebpage); Webserver->on("/sfd", ScriptFullWebpage);
#ifdef USE_SCRIPT_FATFS
Webserver->onNotFound(ScriptGetSDCard);
#endif
} }
#endif // SCRIPT_FULL_WEBPAGE #endif // SCRIPT_FULL_WEBPAGE
} }

2
tasmota/xdrv_50_filesystem.ino
View File

@ -181,7 +181,7 @@ void UfsCheckSDCardInit(void) {
#endif // USE_SDCARD #endif // USE_SDCARD
uint32_t UfsInfo(uint32_t sel, uint32_t type) { uint32_t UfsInfo(uint32_t sel, uint32_t type) {
uint32_t result = 0; uint64_t result = 0;
FS *ifsp = ufsp; FS *ifsp = ufsp;
uint8_t itype = ufs_type; uint8_t itype = ufs_type;
if (type) { if (type) {

3
tasmota/xdrv_81_webcam.ino
View File

@ -466,7 +466,7 @@ void draw_face_boxes(dl_matrix3du_t *image_matrix, box_array_t *boxes, int face_
} }
*/ */
#define DL_SPIRAM_SUPPORT //#define DL_SPIRAM_SUPPORT
uint32_t WcSetFaceDetect(int32_t value) { uint32_t WcSetFaceDetect(int32_t value) {
if (value >= 0) { Wc.face_detect_time = value; } if (value >= 0) { Wc.face_detect_time = value; }
@ -530,6 +530,7 @@ uint32_t WcDetectFace(void) {
//Serial.printf("face detected: %d",Wc.faces); //Serial.printf("face detected: %d",Wc.faces);
} }
return 0;
} }
#endif #endif