From e0711567a4a26ebbf5d235fec1866042f1d18ec0 Mon Sep 17 00:00:00 2001
From: Theo Arends <11044339+arendst@users.noreply.github.com>
Date: Wed, 3 Feb 2021 15:42:47 +0100
Subject: [PATCH] Prep ESP32S2

---
 lib/lib_audio/ESP8266SAM/src/ReciterTabs.h            |  2 +-
 lib/lib_audio/ESP8266SAM/src/sam.c                    |  2 +-
 .../NeoPixelBus-2.6.0/src/internal/Esp32_i2s.c        | 11 ++++++-----
 platformio_override_sample.ini                        |  5 +++++
 4 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/lib/lib_audio/ESP8266SAM/src/ReciterTabs.h b/lib/lib_audio/ESP8266SAM/src/ReciterTabs.h
index 373a94bdc..c89636e4d 100644
--- a/lib/lib_audio/ESP8266SAM/src/ReciterTabs.h
+++ b/lib/lib_audio/ESP8266SAM/src/ReciterTabs.h
@@ -2,7 +2,7 @@
 #define RECITERTABS_H
 
 #include <pgmspace.h>
-#include "debug.h"
+#include "samdebug.h"
 #if sam_debug
   #define PROGMEM
 #endif
diff --git a/lib/lib_audio/ESP8266SAM/src/sam.c b/lib/lib_audio/ESP8266SAM/src/sam.c
index 2939628c9..5dba52fda 100644
--- a/lib/lib_audio/ESP8266SAM/src/sam.c
+++ b/lib/lib_audio/ESP8266SAM/src/sam.c
@@ -2,7 +2,7 @@
 #include <string.h> // strlen()
 //#include <stdlib.h>
 #include <stddef.h> // define NULL
-#include "debug.h"
+#include "samdebug.h"
 #include "sam.h"
 #include "render.h"
 #include "SamTabs.h"
diff --git a/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/Esp32_i2s.c b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/Esp32_i2s.c
index 6f6b73089..44eb72120 100644
--- a/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/Esp32_i2s.c
+++ b/lib/lib_basic/NeoPixelBus-2.6.0/src/internal/Esp32_i2s.c
@@ -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.
 //
 // Copyright 2015-2016 Espressif Systems (Shanghai) PTE LTD
@@ -16,6 +16,7 @@
 // limitations under the License.
 
 #if defined(ARDUINO_ARCH_ESP32)
+#if CONFIG_IDF_TARGET_ESP32       // ESP32/PICO-D4
 
 #include <string.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->conf.tx_msb_shift = 0;
     dac_i2s_enable();
-    
+
     if (right) {// DAC1, right channel, GPIO25
         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)
     if (bus_num) {
         periph_module_enable(PERIPH_I2S1_MODULE);
-    } else 
+    } else
 #endif
     {
         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);
 
-    //  enable intr in cpu // 
+    //  enable intr in cpu //
     int i2sIntSource;
 
 #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;
 }
 
-
+#endif  // CONFIG_IDF_TARGET_ESP32       // ESP32/PICO-D4
 #endif
diff --git a/platformio_override_sample.ini b/platformio_override_sample.ini
index e3617c65c..6f0e29ba0 100644
--- a/platformio_override_sample.ini
+++ b/platformio_override_sample.ini
@@ -182,6 +182,11 @@ platform_packages           = framework-arduinoespressif32 @ https://github.com/
                               platformio/tool-esptoolpy @ ~1.30000.0
 build_unflags               = ${esp32_defaults.build_unflags}
 build_flags                 = ${common32.build_flags}
+lib_ignore                  =
+    cc1101
+    NimBLE-Arduino
+    Micro-RTSP
+    ESP32 Ethernet
 
 ; *** Debug version used for PlatformIO Home Project Inspection
 [env:tasmota-debug]