Barback/barback32
2
0
Fork 0
Code Issues 2 Pull requests Projects Releases 1 Wiki Activity

include idf-dfplaymini component and add basic audio functionality
Some checks failed
continuous-integration/drone/push Build is failing
Details

Browse source
This commit is contained in:
Morgan 'ARR\!' Allen 2021-10-14 22:23:48 -07:00
parent b56ad43a59
commit 049de947fd
5 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
.gitmodules vendored
View file

@ -1,3 +1,6 @@
[submodule "components/esp32-lora"] [submodule "components/esp32-lora"]
path = components/esp32-lora path = components/esp32-lora
url = https://gitlab.com/morganrallen/esp32-lora.git 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

1
CMakeLists.txt
View file

@ -3,4 +3,5 @@
cmake_minimum_required(VERSION 3.5) cmake_minimum_required(VERSION 3.5)
include($ENV{IDF_PATH}/tools/cmake/project.cmake) include($ENV{IDF_PATH}/tools/cmake/project.cmake)
project(barback) project(barback)

1
components/idf-dfplayermini Submodule

@ -0,0 +1 @@
Subproject commit 7ec406c5af692b9c99ae9ed0c7fb5ba648a0a71e

1
main/CMakeLists.txt
View file

@ -6,5 +6,6 @@ set(COMPONENT_SRCS "\
user_button.c\ user_button.c\
") ")
set(COMPONENT_ADD_INCLUDEDIRS ". ../include") set(COMPONENT_ADD_INCLUDEDIRS ". ../include")
set(REQUIRES idf-dfplayermini)
register_component() register_component()

5
main/main.c
View file

@ -14,6 +14,7 @@
#include "ble.h" #include "ble.h"
#include "user_button.h" #include "user_button.h"
#include "pumps.h" #include "pumps.h"
#include "dfplayermini.h"
static const char *TAG = "BARBACK"; static const char *TAG = "BARBACK";
@ -42,6 +43,10 @@ void app_main(void) {
char *name = malloc(strlen(TAG) + 4); char *name = malloc(strlen(TAG) + 4);
sprintf(name, "%s-%02X", TAG, mac[5]); sprintf(name, "%s-%02X", TAG, mac[5]);
vTaskDelay(1000 / portTICK_PERIOD_MS);
dfplayermini_init();
user_button_init(); user_button_init();
pumps_init(); pumps_init();
ble_init(name); ble_init(name);