From 049de947fd98804a240725a5c69ee2477196c927 Mon Sep 17 00:00:00 2001 From: "Morgan 'ARR\\!' Allen" Date: Thu, 14 Oct 2021 22:23:48 -0700 Subject: [PATCH] include idf-dfplaymini component and add basic audio functionality --- .gitmodules | 3 +++ CMakeLists.txt | 1 + components/idf-dfplayermini | 1 + main/CMakeLists.txt | 1 + main/main.c | 5 +++++ 5 files changed, 11 insertions(+) create mode 160000 components/idf-dfplayermini diff --git a/.gitmodules b/.gitmodules index e40a445..771e614 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +1,6 @@ [submodule "components/esp32-lora"] path = components/esp32-lora url = https://gitlab.com/morganrallen/esp32-lora.git +[submodule "components/idf-dfplayermini"] + path = components/idf-dfplayermini + url = git@git.oit.cloud:morgan/idf-dfplayermini.git diff --git a/CMakeLists.txt b/CMakeLists.txt index 0657921..c2a6b37 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -3,4 +3,5 @@ cmake_minimum_required(VERSION 3.5) include($ENV{IDF_PATH}/tools/cmake/project.cmake) + project(barback) diff --git a/components/idf-dfplayermini b/components/idf-dfplayermini new file mode 160000 index 0000000..7ec406c --- /dev/null +++ b/components/idf-dfplayermini @@ -0,0 +1 @@ +Subproject commit 7ec406c5af692b9c99ae9ed0c7fb5ba648a0a71e diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt index 125eaa2..55360f2 100644 --- a/main/CMakeLists.txt +++ b/main/CMakeLists.txt @@ -6,5 +6,6 @@ set(COMPONENT_SRCS "\ user_button.c\ ") set(COMPONENT_ADD_INCLUDEDIRS ". ../include") +set(REQUIRES idf-dfplayermini) register_component() diff --git a/main/main.c b/main/main.c index 71bc595..fc1bfce 100644 --- a/main/main.c +++ b/main/main.c @@ -14,6 +14,7 @@ #include "ble.h" #include "user_button.h" #include "pumps.h" +#include "dfplayermini.h" static const char *TAG = "BARBACK"; @@ -42,6 +43,10 @@ void app_main(void) { char *name = malloc(strlen(TAG) + 4); sprintf(name, "%s-%02X", TAG, mac[5]); + vTaskDelay(1000 / portTICK_PERIOD_MS); + + dfplayermini_init(); + user_button_init(); pumps_init(); ble_init(name);