From 4249ce08aacd135da3bc6b6c86157e9c6f42ab20 Mon Sep 17 00:00:00 2001 From: Willem Oldemans Date: Fri, 27 Aug 2021 19:30:43 +0200 Subject: [PATCH] Add m5core2 audio (working) --- FW/m5stack_audio/.gitignore | 5 +++ FW/m5stack_audio/.vscode/extensions.json | 7 +++ FW/m5stack_audio/include/README | 39 +++++++++++++++++ FW/m5stack_audio/lib/README | 46 +++++++++++++++++++ FW/m5stack_audio/platformio.ini | 18 ++++++++ FW/m5stack_audio/src/main.cpp | 56 ++++++++++++++++++++++++ FW/m5stack_audio/test/README | 11 +++++ 7 files changed, 182 insertions(+) create mode 100644 FW/m5stack_audio/.gitignore create mode 100644 FW/m5stack_audio/.vscode/extensions.json create mode 100644 FW/m5stack_audio/include/README create mode 100644 FW/m5stack_audio/lib/README create mode 100644 FW/m5stack_audio/platformio.ini create mode 100644 FW/m5stack_audio/src/main.cpp create mode 100644 FW/m5stack_audio/test/README diff --git a/FW/m5stack_audio/.gitignore b/FW/m5stack_audio/.gitignore new file mode 100644 index 0000000..89cc49c --- /dev/null +++ b/FW/m5stack_audio/.gitignore @@ -0,0 +1,5 @@ +.pio +.vscode/.browse.c_cpp.db* +.vscode/c_cpp_properties.json +.vscode/launch.json +.vscode/ipch diff --git a/FW/m5stack_audio/.vscode/extensions.json b/FW/m5stack_audio/.vscode/extensions.json new file mode 100644 index 0000000..0f0d740 --- /dev/null +++ b/FW/m5stack_audio/.vscode/extensions.json @@ -0,0 +1,7 @@ +{ + // See http://go.microsoft.com/fwlink/?LinkId=827846 + // for the documentation about the extensions.json format + "recommendations": [ + "platformio.platformio-ide" + ] +} diff --git a/FW/m5stack_audio/include/README b/FW/m5stack_audio/include/README new file mode 100644 index 0000000..194dcd4 --- /dev/null +++ b/FW/m5stack_audio/include/README @@ -0,0 +1,39 @@ + +This directory is intended for project header files. + +A header file is a file containing C declarations and macro definitions +to be shared between several project source files. You request the use of a +header file in your project source file (C, C++, etc) located in `src` folder +by including it, with the C preprocessing directive `#include'. + +```src/main.c + +#include "header.h" + +int main (void) +{ + ... +} +``` + +Including a header file produces the same results as copying the header file +into each source file that needs it. Such copying would be time-consuming +and error-prone. With a header file, the related declarations appear +in only one place. If they need to be changed, they can be changed in one +place, and programs that include the header file will automatically use the +new version when next recompiled. The header file eliminates the labor of +finding and changing all the copies as well as the risk that a failure to +find one copy will result in inconsistencies within a program. + +In C, the usual convention is to give header files names that end with `.h'. +It is most portable to use only letters, digits, dashes, and underscores in +header file names, and at most one dot. + +Read more about using header files in official GCC documentation: + +* Include Syntax +* Include Operation +* Once-Only Headers +* Computed Includes + +https://gcc.gnu.org/onlinedocs/cpp/Header-Files.html diff --git a/FW/m5stack_audio/lib/README b/FW/m5stack_audio/lib/README new file mode 100644 index 0000000..6debab1 --- /dev/null +++ b/FW/m5stack_audio/lib/README @@ -0,0 +1,46 @@ + +This directory is intended for project specific (private) libraries. +PlatformIO will compile them to static libraries and link into executable file. + +The source code of each library should be placed in a an own separate directory +("lib/your_library_name/[here are source files]"). + +For example, see a structure of the following two libraries `Foo` and `Bar`: + +|--lib +| | +| |--Bar +| | |--docs +| | |--examples +| | |--src +| | |- Bar.c +| | |- Bar.h +| | |- library.json (optional, custom build options, etc) https://docs.platformio.org/page/librarymanager/config.html +| | +| |--Foo +| | |- Foo.c +| | |- Foo.h +| | +| |- README --> THIS FILE +| +|- platformio.ini +|--src + |- main.c + +and a contents of `src/main.c`: +``` +#include +#include + +int main (void) +{ + ... +} + +``` + +PlatformIO Library Dependency Finder will find automatically dependent +libraries scanning project source files. + +More information about PlatformIO Library Dependency Finder +- https://docs.platformio.org/page/librarymanager/ldf.html diff --git a/FW/m5stack_audio/platformio.ini b/FW/m5stack_audio/platformio.ini new file mode 100644 index 0000000..99b47e0 --- /dev/null +++ b/FW/m5stack_audio/platformio.ini @@ -0,0 +1,18 @@ +; PlatformIO Project Configuration File +; +; Build options: build flags, source filter +; Upload options: custom upload port, speed and extra flags +; Library options: dependencies, extra library storages +; Advanced options: extra scripting +; +; Please visit documentation for the other options and examples +; https://docs.platformio.org/page/projectconf.html + +[env:m5stack-core2] +platform = espressif32 +board = m5stack-core2 +framework = arduino +lib_deps = + earlephilhower/ESP8266Audio@^1.9.2 + m5stack/M5Core2@^0.0.6 +monitor_speed = 115200 diff --git a/FW/m5stack_audio/src/main.cpp b/FW/m5stack_audio/src/main.cpp new file mode 100644 index 0000000..b6b11b6 --- /dev/null +++ b/FW/m5stack_audio/src/main.cpp @@ -0,0 +1,56 @@ +#pragma mark - Depend ESP8266Audio and ESP8266_Spiram libraries +/* +cd ~/Arduino/libraries +git clone https://github.com/earlephilhower/ESP8266Audio +git clone https://github.com/Gianbacchio/ESP8266_Spiram +*/ + + +#include +#include +#include +#include "AudioFileSourceSD.h" +#include "AudioFileSourceID3.h" +#include "AudioGeneratorMP3.h" +#include "AudioOutputI2S.h" + + +AudioGeneratorMP3 *mp3; +AudioFileSourceSD *file; +AudioOutputI2S *out; +AudioFileSourceID3 *id3; + +#define OUTPUT_GAIN 30 + +void setup() +{ + M5.begin(); + M5.Axp.SetSpkEnable(true); + + WiFi.mode(WIFI_OFF); + delay(500); + + M5.Lcd.setTextFont(2); + M5.Lcd.printf("Sample MP3 playback begins...\n"); + Serial.printf("Sample MP3 playback begins...\n"); + + // pno_cs from https://ccrma.stanford.edu/~jos/pasp/Sound_Examples.html + file = new AudioFileSourceSD("/003.mp3"); + id3 = new AudioFileSourceID3(file); + out = new AudioOutputI2S(0, 0); // Output to builtInDAC + out->SetPinout(12, 0, 2); + out->SetOutputModeMono(true); + out->SetGain((float)OUTPUT_GAIN/100.0); + mp3 = new AudioGeneratorMP3(); + mp3->begin(id3, out); +} + +void loop() +{ + if (mp3->isRunning()) { + if (!mp3->loop()) mp3->stop(); + } else { + Serial.printf("MP3 done\n"); + delay(1000); + } +} \ No newline at end of file diff --git a/FW/m5stack_audio/test/README b/FW/m5stack_audio/test/README new file mode 100644 index 0000000..b94d089 --- /dev/null +++ b/FW/m5stack_audio/test/README @@ -0,0 +1,11 @@ + +This directory is intended for PlatformIO Unit Testing and project tests. + +Unit Testing is a software testing method by which individual units of +source code, sets of one or more MCU program modules together with associated +control data, usage procedures, and operating procedures, are tested to +determine whether they are fit for use. Unit testing finds problems early +in the development cycle. + +More information about PlatformIO Unit Testing: +- https://docs.platformio.org/page/plus/unit-testing.html