From 07e1b5a3284201b4eac36a15c361b85dfba147b5 Mon Sep 17 00:00:00 2001
From: jacqueline <me@jacqueline.id.au>
Date: Tue, 15 Nov 2022 16:36:42 +1100
Subject: WIP debug console for testing playback

---
 src/main/CMakeLists.txt  |   5 ++-
 src/main/app_console.cpp | 104 +++++++++++++++++++++++++++++++++++++++++++++++
 src/main/app_console.hpp |  21 ++++++++++
 src/main/main.cpp        |  13 +++---
 4 files changed, 135 insertions(+), 8 deletions(-)
 create mode 100644 src/main/app_console.cpp
 create mode 100644 src/main/app_console.hpp

(limited to 'src/main')

diff --git a/src/main/CMakeLists.txt b/src/main/CMakeLists.txt
index 210abed1..9bfefb1d 100644
--- a/src/main/CMakeLists.txt
+++ b/src/main/CMakeLists.txt
@@ -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})
diff --git a/src/main/app_console.cpp b/src/main/app_console.cpp
new file mode 100644
index 00000000..613d5a9a
--- /dev/null
+++ b/src/main/app_console.cpp
@@ -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
diff --git a/src/main/app_console.hpp b/src/main/app_console.hpp
new file mode 100644
index 00000000..fb051bd1
--- /dev/null
+++ b/src/main/app_console.hpp
@@ -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
diff --git a/src/main/main.cpp b/src/main/main.cpp
index 1bcf14ae..1f0f0db7 100644
--- a/src/main/main.cpp
+++ b/src/main/main.cpp
@@ -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);
-- 
cgit v1.2.3