Skip to content

Commit 5af5c4d

Browse files
authored
Tasmota IDF4.4
* S2 ULP ADC * Official v4.4.3 from 20221110
1 parent cc5640a commit 5af5c4d

File tree

24 files changed

+578
-163
lines changed

24 files changed

+578
-163
lines changed

.github/workflows/docker.yml

Lines changed: 0 additions & 75 deletions
This file was deleted.

.github/workflows/issue_comment.yml

Lines changed: 0 additions & 19 deletions
This file was deleted.

.github/workflows/new_issues.yml

Lines changed: 0 additions & 19 deletions
This file was deleted.

.github/workflows/new_prs.yml

Lines changed: 0 additions & 24 deletions
This file was deleted.

.github/workflows/release_zips.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ jobs:
1010
name: Create release zip file
1111
runs-on: ubuntu-20.04
1212
steps:
13-
- name: Create a recursive clone source zip
14-
uses: espressif/github-actions/release_zips@master
13+
- name: Create a recursive clone source and stripped zip
14+
uses: Jason2866/github-actions/release_zips@master
1515
env:
1616
RELEASE_PROJECT_NAME: ESP-IDF
1717
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}

.gitmodules

Lines changed: 21 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,29 @@
33
# For Espressif's public projects please use '../../espressif/proj', not a '../proj'
44
#
55

6+
#
7+
# Arduino IDF components
8+
#
9+
10+
[submodule "components/esp32-camera"]
11+
path = components/esp32-camera
12+
url = ../../espressif/esp32-camera.git
13+
14+
[submodule "components/esp_littlefs"]
15+
path = components/esp_littlefs
16+
url = ../../joltwallet/esp_littlefs.git
17+
18+
[submodule "components/esp_dsp"]
19+
path = components/esp_dsp
20+
url = ../../espressif/esp-dsp.git
21+
22+
#
23+
# Standard IDF components
24+
#
25+
626
[submodule "components/esptool_py/esptool"]
727
path = components/esptool_py/esptool
8-
url = ../../espressif/esptool.git
28+
url = ../../tasmota/esptool.git
929

1030
[submodule "components/bt/controller/lib_esp32"]
1131
path = components/bt/controller/lib_esp32

components/esp32-camera

Submodule esp32-camera added at 5c8349f

components/esp_dsp

Submodule esp_dsp added at 401faf8

components/esp_hw_support/mac_addr.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,8 @@ esp_err_t esp_efuse_mac_get_default(uint8_t *mac)
131131
uint32_t mac_low = ((uint32_t)mac[2] << 24) | ((uint32_t)mac[3] << 16) | ((uint32_t)mac[4] << 8) | mac[5];
132132
if (((mac_high & 0xFFFF) == 0x18fe) && (mac_low >= 0x346a85c7) && (mac_low <= 0x346a85f8)) {
133133
return ESP_OK;
134+
} else if (esp_efuse_get_pkg_ver() == 3) {
135+
return ESP_OK; // override for Xiaomi SOC's and maybe others too
134136
} else {
135137
ESP_LOGE(TAG, "Base MAC address from BLK0 of EFUSE CRC error, efuse_crc = 0x%02x; calc_crc = 0x%02x", efuse_crc, calc_crc);
136138
abort();

components/esp_hw_support/port/esp32/spiram_psram.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -833,7 +833,7 @@ esp_err_t IRAM_ATTR psram_enable(psram_cache_mode_t mode, psram_vaddr_mode_t vad
833833
psram_io.psram_cs_io = D2WD_PSRAM_CS_IO;
834834
} else if (pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32PICOD4 && esp_efuse_get_chip_ver() >= 3) {
835835
ESP_EARLY_LOGE(TAG, "This chip is ESP32-PICO-V3. It does not support PSRAM (disable it in Kconfig)");
836-
abort();
836+
return ESP_FAIL;
837837
} else if ((pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32PICOD2) || (pkg_ver == EFUSE_RD_CHIP_VER_PKG_ESP32PICOD4)) {
838838
ESP_EARLY_LOGI(TAG, "This chip is ESP32-PICO");
839839
rtc_vddsdio_config_t cfg = rtc_vddsdio_get_config();
@@ -870,7 +870,7 @@ esp_err_t IRAM_ATTR psram_enable(psram_cache_mode_t mode, psram_vaddr_mode_t vad
870870
psram_io.psram_cs_io = D0WDR2_V3_PSRAM_CS_IO;
871871
} else {
872872
ESP_EARLY_LOGE(TAG, "Not a valid or known package id: %d", pkg_ver);
873-
abort();
873+
return ESP_FAIL;
874874
}
875875
s_psram_cs_io = psram_io.psram_cs_io;
876876

0 commit comments

Comments
 (0)