WIP debug console for testing playback

This commit is contained in:
jacqueline
2022-11-15 16:39:54 +11:00
parent aef2eb7566
commit 07e1b5a328
11 changed files with 280 additions and 80 deletions
+3 -2
View File
@@ -1,4 +1,5 @@
idf_component_register(
SRCS "main.cpp"
REQUIRES "drivers")
SRCS "main.cpp" "app_console.cpp"
INCLUDE_DIRS "."
REQUIRES "drivers" "dev_console")
target_compile_options(${COMPONENT_LIB} PRIVATE ${EXTRA_WARNINGS})
+104
View File
@@ -0,0 +1,104 @@
#include "app_console.hpp"
#include <dirent.h>
#include <cstdio>
#include <iostream>
#include <string>
#include "esp_console.h"
namespace console {
static AppConsole* sInstance = nullptr;
int CmdListDir(int argc, char** argv) {
static const std::string usage = "usage: ls [directory]";
if (argc > 2) {
std::cout << usage << std::endl;
return 1;
}
std::string path = drivers::kStoragePath;
if (argc == 2) {
path += "/";
path += argv[1];
}
DIR* dir;
struct dirent* ent;
dir = opendir(path.c_str());
while ((ent = readdir(dir))) {
std::cout << ent->d_name << std::endl;
}
closedir(dir);
return 0;
}
void RegisterListDir() {
esp_console_cmd_t cmd{.command = "ls",
.help = "Lists SD contents",
.hint = NULL,
.func = &CmdListDir,
.argtable = NULL};
esp_console_cmd_register(&cmd);
}
int CmdPlayFile(int argc, char** argv) {
static const std::string usage = "usage: play [file]";
if (argc != 2) {
std::cout << usage << std::endl;
return 1;
}
std::string path = drivers::kStoragePath;
path += "/";
path += argv[1];
sInstance->playback_->Play(path.c_str());
return 0;
}
void RegisterPlayFile() {
esp_console_cmd_t cmd{.command = "play",
.help = "Begins playback of the file at the given path",
.hint = "filepath",
.func = &CmdPlayFile,
.argtable = NULL};
esp_console_cmd_register(&cmd);
}
int CmdToggle(int argc, char** argv) {
static const std::string usage = "usage: toggle";
if (argc != 1) {
std::cout << usage << std::endl;
return 1;
}
sInstance->playback_->Toggle();
return 0;
}
void RegisterToggle() {
esp_console_cmd_t cmd{.command = "toggle",
.help = "Toggles between play and pause",
.hint = NULL,
.func = &CmdToggle,
.argtable = NULL};
esp_console_cmd_register(&cmd);
}
AppConsole::AppConsole(std::unique_ptr<drivers::AudioPlayback> playback)
: playback_(std::move(playback)) {
sInstance = this;
}
AppConsole::~AppConsole() {
sInstance = nullptr;
}
auto AppConsole::RegisterExtraComponents() -> void {
RegisterListDir();
RegisterPlayFile();
RegisterToggle();
}
} // namespace console
+21
View File
@@ -0,0 +1,21 @@
#pragma once
#include "audio_playback.hpp"
#include "console.hpp"
#include <memory>
namespace console {
class AppConsole : public Console {
public:
AppConsole(std::unique_ptr<drivers::AudioPlayback> playback);
virtual ~AppConsole();
std::unique_ptr<drivers::AudioPlayback> playback_;
protected:
virtual auto RegisterExtraComponents() -> void;
};
} // namespace console
+7 -6
View File
@@ -1,3 +1,5 @@
#include "app_console.hpp"
#include "audio_playback.hpp"
#include "battery.hpp"
#include "core/lv_disp.h"
#include "core/lv_obj_pos.h"
@@ -11,8 +13,6 @@
#include "i2s_audio_output.hpp"
#include "misc/lv_color.h"
#include "misc/lv_timer.h"
#include "audio_playback.hpp"
#include "i2s_audio_output.hpp"
#include "spi.hpp"
#include "storage.hpp"
@@ -114,7 +114,7 @@ extern "C" void app_main(void) {
(void*)lvglArgs, 1, sLvglStack,
&sLvglTaskBuffer, 1);
ESP_LOGI(TAG, "Init Audio Output (I2S)");
ESP_LOGI(TAG, "Init audio output (I2S)");
auto sink_res = drivers::I2SAudioOutput::create(expander);
if (sink_res.has_error()) {
ESP_LOGE(TAG, "Failed: %d", sink_res.error());
@@ -122,7 +122,7 @@ extern "C" void app_main(void) {
}
std::unique_ptr<drivers::IAudioOutput> sink = std::move(sink_res.value());
ESP_LOGI(TAG, "Init Audio Pipeline");
ESP_LOGI(TAG, "Init audio pipeline");
auto playback_res = drivers::AudioPlayback::create(std::move(sink));
if (playback_res.has_error()) {
ESP_LOGE(TAG, "Failed: %d", playback_res.error());
@@ -131,8 +131,9 @@ extern "C" void app_main(void) {
std::unique_ptr<drivers::AudioPlayback> playback =
std::move(playback_res.value());
ESP_LOGI(TAG, "Everything looks good! Waiting a mo for debugger.");
vTaskDelay(pdMS_TO_TICKS(1500));
ESP_LOGI(TAG, "Launch console");
console::AppConsole console(std::move(playback));
console.Launch();
while (1) {
playback->ProcessEvents(5);