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

Fix C2/C6 exception

Browse Source
This commit is contained in:
Theo Arends 2023-11-10 11:20:41 +01:00
parent 211da12342
commit 7febc11b8c
1 changed files with 12 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tasmota/tasmota_support/support_esp.ino
View File

@ -677,7 +677,8 @@ uint32_t ESP_magicFlashChipSize(uint8_t spi_size) {
default: // fail so return (1KB) default: // fail so return (1KB)
return 1024; return 1024;
} }
*/ */
// When spi_size is bigger than 11 will return 0 (0x100000000 = 0x00000000)
return (uint32_t)0x100000 << (spi_size & 0x0F); // 0 = 8 MBit (1MB), 5 = 256 MBit (32MB) return (uint32_t)0x100000 << (spi_size & 0x0F); // 0 = 8 MBit (1MB), 5 = 256 MBit (32MB)
} }
@ -1158,6 +1159,11 @@ float ESP_getFreeHeap1024(void) {
* High entropy hardware random generator * High entropy hardware random generator
* Thanks to DigitalAlchemist * Thanks to DigitalAlchemist
\*********************************************************************************************/ \*********************************************************************************************/
#if ESP_IDF_VERSION_MAJOR >= 5
#include <esp_random.h>
#endif
// Based on code from https://raw.githubusercontent.com/espressif/esp-idf/master/components/esp32/hw_random.c // Based on code from https://raw.githubusercontent.com/espressif/esp-idf/master/components/esp32/hw_random.c
uint32_t HwRandom(void) { uint32_t HwRandom(void) {
#if ESP8266 #if ESP8266
@ -1165,6 +1171,11 @@ uint32_t HwRandom(void) {
#define _RAND_ADDR 0x3FF20E44UL #define _RAND_ADDR 0x3FF20E44UL
#endif // ESP8266 #endif // ESP8266
#ifdef ESP32 #ifdef ESP32
#if ESP_IDF_VERSION_MAJOR >= 5
// See for more info on the HW RNG:
// https://docs.espressif.com/projects/esp-idf/en/latest/esp32s2/api-reference/system/random.html
return esp_random();
#endif
#define _RAND_ADDR 0x3FF75144UL #define _RAND_ADDR 0x3FF75144UL
#endif // ESP32 #endif // ESP32
static uint32_t last_ccount = 0; static uint32_t last_ccount = 0;