jeans/Tasmota
jeans/Tasmota
1
0
Fork 0
mirror of https://github.com/arendst/Tasmota.git synced 2025-07-27 20:56:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Prep ESP32S2

Browse Source
This commit is contained in:
Theo Arends 2021-02-03 15:42:47 +01:00
parent 91cec3cb46
commit e0711567a4
4 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/lib_audio/ESP8266SAM/src/ReciterTabs.h
View File

@ -2,7 +2,7 @@
#define RECITERTABS_H #define RECITERTABS_H
#include <pgmspace.h> #include <pgmspace.h>
#include "debug.h" #include "samdebug.h"
#if sam_debug #if sam_debug
#define PROGMEM #define PROGMEM
#endif #endif

2
lib/lib_audio/ESP8266SAM/src/sam.c
View File

@ -2,7 +2,7 @@
#include <string.h> // strlen() #include <string.h> // strlen()
//#include <stdlib.h> //#include <stdlib.h>
#include <stddef.h> // define NULL #include <stddef.h> // define NULL
#include "debug.h" #include "samdebug.h"
#include "sam.h" #include "sam.h"
#include "render.h" #include "render.h"
#include "SamTabs.h" #include "SamTabs.h"

11
lib/lib_basic/NeoPixelBus-2.6.0/src/internal/Esp32_i2s.c
View File

@ -1,4 +1,4 @@
// WARNING: This file contains code that is more than likely already // WARNING: This file contains code that is more than likely already
// exposed from the Esp32 Arduino API. It will be removed once integration is complete. // exposed from the Esp32 Arduino API. It will be removed once integration is complete.
// //
// Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD // Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
@ -16,6 +16,7 @@
// limitations under the License. // limitations under the License.
#if defined(ARDUINO_ARCH_ESP32) #if defined(ARDUINO_ARCH_ESP32)
#if CONFIG_IDF_TARGET_ESP32 // ESP32/PICO-D4
#include <string.h> #include <string.h>
#include <stdio.h> #include <stdio.h>
@ -227,7 +228,7 @@ void i2sSetDac(uint8_t bus_num, bool right, bool left) {
I2S[bus_num].bus->conf2.camera_en = 0; I2S[bus_num].bus->conf2.camera_en = 0;
I2S[bus_num].bus->conf.tx_msb_shift = 0; I2S[bus_num].bus->conf.tx_msb_shift = 0;
dac_i2s_enable(); dac_i2s_enable();
if (right) {// DAC1, right channel, GPIO25 if (right) {// DAC1, right channel, GPIO25
dac_output_enable(DAC_CHANNEL_1); dac_output_enable(DAC_CHANNEL_1);
} }
@ -293,7 +294,7 @@ void i2sInit(uint8_t bus_num, uint32_t bits_per_sample, uint32_t sample_rate, i2
// (I2S_NUM_MAX == 2) // (I2S_NUM_MAX == 2)
if (bus_num) { if (bus_num) {
periph_module_enable(PERIPH_I2S1_MODULE); periph_module_enable(PERIPH_I2S1_MODULE);
} else } else
#endif #endif
{ {
periph_module_enable(PERIPH_I2S0_MODULE); periph_module_enable(PERIPH_I2S0_MODULE);
@ -365,7 +366,7 @@ void i2sInit(uint8_t bus_num, uint32_t bits_per_sample, uint32_t sample_rate, i2
i2sSetSampleRate(bus_num, sample_rate, bits_per_sample); i2sSetSampleRate(bus_num, sample_rate, bits_per_sample);
// enable intr in cpu // // enable intr in cpu //
int i2sIntSource; int i2sIntSource;
#if !defined(CONFIG_IDF_TARGET_ESP32S2) #if !defined(CONFIG_IDF_TARGET_ESP32S2)
@ -494,5 +495,5 @@ size_t i2sWrite(uint8_t bus_num, uint8_t* data, size_t len, bool copy, bool free
return index; return index;
} }
#endif // CONFIG_IDF_TARGET_ESP32 // ESP32/PICO-D4
#endif #endif

5
platformio_override_sample.ini
View File

@ -182,6 +182,11 @@ platform_packages = framework-arduinoespressif32 @ https://github.com/
platformio/tool-esptoolpy @ ~1.30000.0 platformio/tool-esptoolpy @ ~1.30000.0
build_unflags = ${esp32_defaults.build_unflags} build_unflags = ${esp32_defaults.build_unflags}
build_flags = ${common32.build_flags} build_flags = ${common32.build_flags}
lib_ignore =
cc1101
NimBLE-Arduino
Micro-RTSP
ESP32 Ethernet
; *** Debug version used for PlatformIO Home Project Inspection ; *** Debug version used for PlatformIO Home Project Inspection
[env:tasmota-debug] [env:tasmota-debug]