fix name sclashes in esp8266 SAM

lib/ESP8266Audio/src/AudioFileSourceHTTPStream.h

@@ -25,6 +25,7 @@
 #ifdef ESP32
   #include <HTTPClient.h>
 #else
+  #include <WiFiClient.h>
   #include <ESP8266HTTPClient.h>
 #endif
 #include "AudioFileSource.h"
@@ -63,4 +64,3 @@ class AudioFileSourceHTTPStream : public AudioFileSource
 
 
 #endif
-

lib/ESP8266Audio/src/AudioFileSourceICYStream.h

@@ -23,9 +23,9 @@
 
 #include <Arduino.h>
 #ifdef ESP32
-  #include <HTTPClient.h>
+//  #include <HTTPClient.h>
 #else
-  #include <ESP8266HTTPClient.h>
+//  #include <ESP8266HTTPClient.h>
 #endif
 
 #include "AudioFileSourceHTTPStream.h"
@@ -47,4 +47,3 @@ class AudioFileSourceICYStream : public AudioFileSourceHTTPStream
 
 
 #endif
-

lib/ESP8266Audio/src/AudioFileSourceSD.h

@@ -22,6 +22,10 @@
 #define _AUDIOFILESOURCESD_H
 
 #include "AudioFileSource.h"
+#ifdef ESP8266
+#include <SdFat.h>
+#include <SDFS.h>
+#endif
 #include <SD.h>
 
 
@@ -46,4 +50,3 @@ class AudioFileSourceSD : public AudioFileSource
 
 
 #endif
-

lib/ESP8266Audio/src/AudioGeneratorMP3.cpp

@@ -272,6 +272,8 @@ bool AudioGeneratorMP3::begin(AudioFileSource *source, AudioOutput *output)
       stream = NULL;
       frame = NULL;
       synth = NULL;
+      uint32_t size = buffLen + sizeof(struct mad_stream) + sizeof(struct mad_frame) + sizeof(struct mad_synth);
+      audioLogger->printf_P("OOM error in MP3:  Want %d bytes\n", size);
       return false;
     }
   }
@@ -349,4 +351,3 @@ extern "C" {
   }
 #endif
 }
-

lib/ESP8266SAM/src/RenderTabs.h

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

lib/ESP8266SAM/src/SamTabs.h

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

lib/ESP8266SAM/src/reciter.c

@@ -2,7 +2,7 @@
 #include <string.h>
 #include "reciter.h"
 #include "ReciterTabs.h"
-#include "debug.h"
+#include "samdebug.h"
 #include "SamData.h"
 
 unsigned char A, X, Y;

lib/ESP8266SAM/src/render.c

@@ -5,7 +5,7 @@
 #include "render.h"
 #include "RenderTabs.h"
 
-#include "debug.h"
+#include "samdebug.h"
 //extern int debug;
 #include <pgmspace.h>
 #include "SamData.h"

platformio.ini

@@ -32,7 +32,7 @@ default_envs =
 ;                tasmota-BR
 ;                tasmota-CN
 ;                tasmota-CZ
-                tasmota-DE
+;                tasmota-DE
 ;                tasmota-ES
 ;                tasmota-FR
 ;                tasmota-GR