Porting for ESP-32 (#33)

* support ESP-32
* make compile with ESP-32/arduino platform
* fixed: use libmad on ESP8266 as original
This commit is contained in:
tueddy authored and Earle F. Philhower, III committed 2018-01-18 08:55:03 -08:00
1 parent 0c002cd014
commit 03aa2467f0
22 files changed
+199 -42

No files matched your search

@@ -1,5 +1,10 @@
#include <Arduino.h>
#include <ESP8266WiFi.h>
#ifdef ESP32
#include <WiFi.h>
#else
#include <ESP8266WiFi.h>
#endif
#include <AudioOutputNull.h>
#include <AudioOutputI2SDAC.h>
@@ -17,7 +22,7 @@ void setup()
const char *soundfont = "1mgm.sf2";
const char *midifile = "furelise.mid";
WiFi.forceSleepBegin();
WiFi.mode(WIFI_OFF);
Serial.begin(115200);
Serial.println("Starting up...\n");
@@ -1,8 +1,12 @@
#include <Arduino.h>
#include <ESP8266WiFi.h>
#include "AudioFileSourcePROGMEM.h"
#include "AudioGeneratorMOD.h"
#include "AudioOutputI2SDAC.h"
#ifdef ESP32
#include <WiFi.h>
#else
#include <ESP8266WiFi.h>
#endif
// enigma.mod sample from the mod archive: https://modarchive.org/index.php?request=view_by_moduleid&query=42146
#include "enigma.h"
@@ -13,7 +17,7 @@ AudioOutputI2SDAC *out;
void setup()
{
WiFi.forceSleepBegin();
WiFi.mode(WIFI_OFF); //WiFi.forceSleepBegin();
Serial.begin(115200);
delay(1000);
file = new AudioFileSourcePROGMEM( enigma_mod, sizeof(enigma_mod) );
@@ -1,12 +1,17 @@
#include <Arduino.h>
#include <ESP8266WiFi.h>
#ifdef ESP32
#include <WiFi.h>
#include "SPIFFS.h"
#else
#include <ESP8266WiFi.h>
#endif
#include "AudioFileSourceSPIFFS.h"
#include "AudioFileSourceID3.h"
#include "AudioGeneratorMP3.h"
#include "AudioOutputI2SNoDAC.h"
// To run, set your ESP8266 build to 160MHz, and include a SPIFFS of 512KB or greater.
// Use the "Tools->ESP8266 Sketch Data Upload" menu to write the MP3 to SPIFFS
// Use the "Tools->ESP8266/ESP32 Sketch Data Upload" menu to write the MP3 to SPIFFS
// Then upload the sketch normally.
// pno_cs from https://ccrma.stanford.edu/~jos/pasp/Sound_Examples.html
@@ -41,7 +46,7 @@ void MDCallback(void *cbData, const char *type, bool isUnicode, const char *stri
void setup()
{
WiFi.forceSleepBegin();
WiFi.mode(WIFI_OFF);
Serial.begin(115200);
delay(1000);
SPIFFS.begin();
@@ -1,5 +1,10 @@
#include <Arduino.h>
#include <ESP8266WiFi.h>
#ifdef ESP32
#include <WiFi.h>
#else
#include <ESP8266WiFi.h>
#endif
#include "AudioFileSourcePROGMEM.h"
#include "AudioGeneratorWAV.h"
#include "AudioOutputI2SNoDAC.h"
@@ -13,9 +18,10 @@ AudioOutputI2SNoDAC *out;
void setup()
{
WiFi.forceSleepBegin();
WiFi.mode(WIFI_OFF);
Serial.begin(115200);
delay(1000);
Serial.printf("WAV start\n");
file = new AudioFileSourcePROGMEM( viola, sizeof(viola) );
out = new AudioOutputI2SNoDAC();
wav = new AudioGeneratorWAV();
@@ -1,6 +1,10 @@
#include <Arduino.h>
#include <ESP8266WiFi.h>
#ifdef ESP32
#include <WiFi.h>
#else
#include <ESP8266WiFi.h>
#endif
#include "AudioFileSourceICYStream.h"
#include "AudioFileSourceBuffer.h"
#include "AudioGeneratorMP3.h"
@@ -1,5 +1,9 @@
#include <Arduino.h>
#include <ESP8266WiFi.h>
#ifdef ESP32
#include <WiFi.h>
#else
#include <ESP8266WiFi.h>
#endif
#include "AudioFileSourceICYStream.h"
#include "AudioFileSourceSPIRAMBuffer.h"
#include "AudioGeneratorMP3.h"
+5 -1
View File
@@ -19,7 +19,11 @@
*/
#include <Arduino.h>
#include <ESP8266WiFi.h>
#ifdef ESP32
#include <WiFi.h>
#else
#include <ESP8266WiFi.h>
#endif
#include "AudioFileSourceICYStream.h"
#include "AudioFileSourceBuffer.h"
#include "AudioGeneratorMP3.h"
+5 -1
View File
@@ -19,7 +19,11 @@
*/
#include <Arduino.h>
#include <ESP8266WiFi.h>
#ifdef ESP32
#include <WiFi.h>
#else
#include <ESP8266WiFi.h>
#endif
#include "web.h"
void WebPrintError(WiFiClient *client, int code)