fix(audio): use audio-stream instead of direct I2S - fixes fast playback
Main / Build (BookPlayer) (push) Has been cancelled
Main / Build (Brainfuck) (push) Has been cancelled
Main / Build (Breakout) (push) Has been cancelled
Main / Build (Calculator) (push) Has been cancelled
Main / Build (Diceware) (push) Has been cancelled
Main / Build (EpubReader) (push) Has been cancelled
Main / Build (GPIO) (push) Has been cancelled
Main / Build (GraphicsDemo) (push) Has been cancelled
Main / Build (HelloWorld) (push) Has been cancelled
Main / Build (M5UnitTest) (push) Has been cancelled
Main / Build (Magic8Ball) (push) Has been cancelled
Main / Build (MediaKeys) (push) Has been cancelled
Main / Build (MystifyDemo) (push) Has been cancelled
Main / Build (SerialConsole) (push) Has been cancelled
Main / Build (Snake) (push) Has been cancelled
Main / Build (TamaTac) (push) Has been cancelled
Main / Build (TodoList) (push) Has been cancelled
Main / Build (TwoEleven) (push) Has been cancelled
Main / Bundle (push) Has been cancelled
Main / Build (BookPlayer) (push) Has been cancelled
Main / Build (Brainfuck) (push) Has been cancelled
Main / Build (Breakout) (push) Has been cancelled
Main / Build (Calculator) (push) Has been cancelled
Main / Build (Diceware) (push) Has been cancelled
Main / Build (EpubReader) (push) Has been cancelled
Main / Build (GPIO) (push) Has been cancelled
Main / Build (GraphicsDemo) (push) Has been cancelled
Main / Build (HelloWorld) (push) Has been cancelled
Main / Build (M5UnitTest) (push) Has been cancelled
Main / Build (Magic8Ball) (push) Has been cancelled
Main / Build (MediaKeys) (push) Has been cancelled
Main / Build (MystifyDemo) (push) Has been cancelled
Main / Build (SerialConsole) (push) Has been cancelled
Main / Build (Snake) (push) Has been cancelled
Main / Build (TamaTac) (push) Has been cancelled
Main / Build (TodoList) (push) Has been cancelled
Main / Build (TwoEleven) (push) Has been cancelled
Main / Bundle (push) Has been cancelled
- Mp3Player: sdk 0.7->0.8.0-dev, find audio-stream device, open_output with resampler (hz/ch), write via audio_stream_write, close on pause - BookPlayer: close/open per format change via AudioStreamConfig, write via stream - VoiceRecorder: input_handle open_input 16k/mono via audio_stream_read, output_handle open_output file rate via write/resampler - ES8311 native 44100, old direct I2S at 16k caused 4.096MHz MCLK vs 11.29MHz -> fast playback - Brick game correct because it uses audio-stream resampler path
This commit is contained in:
+154
-179
@@ -4,7 +4,7 @@
|
|||||||
#include <tt_app_alertdialog.h>
|
#include <tt_app_alertdialog.h>
|
||||||
|
|
||||||
#include <tactility/device.h>
|
#include <tactility/device.h>
|
||||||
#include <tactility/drivers/i2s_controller.h>
|
#include <tactility/drivers/audio_stream.h>
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
@@ -45,14 +45,15 @@ typedef struct {
|
|||||||
} BookMetadata;
|
} BookMetadata;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
struct Device* i2s_dev;
|
struct Device* stream_dev;
|
||||||
|
AudioStreamHandle stream_handle;
|
||||||
PlaybackState state;
|
PlaybackState state;
|
||||||
int volume;
|
int volume;
|
||||||
|
|
||||||
// Book picker list data
|
// Book picker list data
|
||||||
BookMetadata books[MAX_BOOKS];
|
BookMetadata books[MAX_BOOKS];
|
||||||
int book_count;
|
int book_count;
|
||||||
|
|
||||||
// Currently loaded book details
|
// Currently loaded book details
|
||||||
char current_book_slug[MAX_PATH];
|
char current_book_slug[MAX_PATH];
|
||||||
cJSON* manifest_root;
|
cJSON* manifest_root;
|
||||||
@@ -60,12 +61,12 @@ typedef struct {
|
|||||||
int page_count;
|
int page_count;
|
||||||
int current_page;
|
int current_page;
|
||||||
int last_pct;
|
int last_pct;
|
||||||
|
|
||||||
// UI elements
|
// UI elements
|
||||||
AppHandle app;
|
AppHandle app;
|
||||||
lv_obj_t* picker_wrapper;
|
lv_obj_t* picker_wrapper;
|
||||||
lv_obj_t* lst_books;
|
lv_obj_t* lst_books;
|
||||||
|
|
||||||
lv_obj_t* player_wrapper;
|
lv_obj_t* player_wrapper;
|
||||||
lv_obj_t* header_bar;
|
lv_obj_t* header_bar;
|
||||||
lv_obj_t* ctrl_bar;
|
lv_obj_t* ctrl_bar;
|
||||||
@@ -76,29 +77,29 @@ typedef struct {
|
|||||||
lv_obj_t* btn_play_pause;
|
lv_obj_t* btn_play_pause;
|
||||||
lv_obj_t* btn_prev;
|
lv_obj_t* btn_prev;
|
||||||
lv_obj_t* btn_next;
|
lv_obj_t* btn_next;
|
||||||
|
|
||||||
// Audio State
|
// Audio State
|
||||||
char current_audio_path[512];
|
char current_audio_path[512];
|
||||||
uint8_t* audio_buf; // Shared MP3 input and WAV buffer
|
uint8_t* audio_buf; // Shared MP3 input and WAV buffer
|
||||||
mp3d_sample_t* pcm_buf; // MP3 decoded pcm buffer
|
mp3d_sample_t* pcm_buf; // MP3 decoded pcm buffer
|
||||||
|
|
||||||
TaskHandle_t playback_task_handle;
|
TaskHandle_t playback_task_handle;
|
||||||
} AppCtx;
|
} AppCtx;
|
||||||
|
|
||||||
typedef struct __attribute__((packed)) {
|
typedef struct __attribute__((packed)) {
|
||||||
char riff[4]; // "RIFF"
|
char riff[4];
|
||||||
uint32_t overall_size; // file size - 8
|
uint32_t overall_size;
|
||||||
char wave[4]; // "WAVE"
|
char wave[4];
|
||||||
char fmt_chunk_marker[4]; // "fmt "
|
char fmt_chunk_marker[4];
|
||||||
uint32_t length_of_fmt; // 16 for PCM
|
uint32_t length_of_fmt;
|
||||||
uint16_t format_type; // 1 for PCM
|
uint16_t format_type;
|
||||||
uint16_t channels; // 1 for mono
|
uint16_t channels;
|
||||||
uint32_t sample_rate; // 16000
|
uint32_t sample_rate;
|
||||||
uint32_t byterate; // sample_rate * channels * (bits_per_sample / 8)
|
uint32_t byterate;
|
||||||
uint16_t block_align; // channels * (bits_per_sample / 8)
|
uint16_t block_align;
|
||||||
uint16_t bits_per_sample; // 16
|
uint16_t bits_per_sample;
|
||||||
char data_chunk_header[4]; // "data"
|
char data_chunk_header[4];
|
||||||
uint32_t data_size; // data size in bytes
|
uint32_t data_size;
|
||||||
} WavHeader;
|
} WavHeader;
|
||||||
|
|
||||||
static AppCtx g_ctx;
|
static AppCtx g_ctx;
|
||||||
@@ -113,19 +114,60 @@ static void play_mp3(AppCtx* ctx);
|
|||||||
static void play_wav(AppCtx* ctx);
|
static void play_wav(AppCtx* ctx);
|
||||||
static void scan_books(AppCtx* ctx);
|
static void scan_books(AppCtx* ctx);
|
||||||
|
|
||||||
|
/* ─── Audio-stream helpers ─── */
|
||||||
|
static bool find_audio_stream_device(AppCtx* ctx) {
|
||||||
|
// Prefer device_find_first_by_type but keep compatibility with name lookup
|
||||||
|
struct Device* dev = device_find_by_name("audio-stream");
|
||||||
|
if (dev) {
|
||||||
|
ctx->stream_dev = dev;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
dev = device_find_first_by_type(&AUDIO_STREAM_TYPE);
|
||||||
|
if (dev) {
|
||||||
|
ctx->stream_dev = dev;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
|
static void close_stream_if_open(AppCtx* ctx) {
|
||||||
|
if (ctx->stream_handle) {
|
||||||
|
audio_stream_close(ctx->stream_handle);
|
||||||
|
ctx->stream_handle = NULL;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
static bool open_output_stream(AppCtx* ctx, uint32_t sample_rate, uint8_t channels, uint8_t bits) {
|
||||||
|
close_stream_if_open(ctx);
|
||||||
|
if (!ctx->stream_dev) return false;
|
||||||
|
struct AudioStreamConfig cfg = {
|
||||||
|
.sample_rate = sample_rate,
|
||||||
|
.bits_per_sample = bits,
|
||||||
|
.channels = channels
|
||||||
|
};
|
||||||
|
error_t err = audio_stream_open_output(ctx->stream_dev, &cfg, &ctx->stream_handle);
|
||||||
|
if (err != ERROR_NONE) {
|
||||||
|
ESP_LOGE(TAG, "audio_stream_open_output failed: %d (rate=%u ch=%u)", err, (unsigned)sample_rate, channels);
|
||||||
|
ctx->stream_handle = NULL;
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
ESP_LOGI(TAG, "audio_stream output opened: %u Hz %u ch %u-bit", (unsigned)sample_rate, channels, bits);
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
|
||||||
/* ─── UI Helper to update status labels & button states ─── */
|
/* ─── UI Helper to update status labels & button states ─── */
|
||||||
static void update_ui(AppCtx* ctx) {
|
static void update_ui(AppCtx* ctx) {
|
||||||
if (!ctx->btn_play_pause) return;
|
if (!ctx->btn_play_pause) return;
|
||||||
|
|
||||||
lv_obj_t* lbl_play = lv_obj_get_child(ctx->btn_play_pause, 0);
|
lv_obj_t* lbl_play = lv_obj_get_child(ctx->btn_play_pause, 0);
|
||||||
|
|
||||||
// Prev button state
|
// Prev button state
|
||||||
if (ctx->current_page <= 0) {
|
if (ctx->current_page <= 0) {
|
||||||
lv_obj_add_state(ctx->btn_prev, LV_STATE_DISABLED);
|
lv_obj_add_state(ctx->btn_prev, LV_STATE_DISABLED);
|
||||||
} else {
|
} else {
|
||||||
lv_obj_clear_state(ctx->btn_prev, LV_STATE_DISABLED);
|
lv_obj_clear_state(ctx->btn_prev, LV_STATE_DISABLED);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Next button state
|
// Next button state
|
||||||
if (ctx->current_page >= ctx->page_count - 1) {
|
if (ctx->current_page >= ctx->page_count - 1) {
|
||||||
lv_obj_add_state(ctx->btn_next, LV_STATE_DISABLED);
|
lv_obj_add_state(ctx->btn_next, LV_STATE_DISABLED);
|
||||||
@@ -162,13 +204,13 @@ static char* read_full_file(const char* filepath) {
|
|||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
fseek(file, 0, SEEK_SET);
|
fseek(file, 0, SEEK_SET);
|
||||||
|
|
||||||
char* buf = malloc(size + 1);
|
char* buf = malloc(size + 1);
|
||||||
if (!buf) {
|
if (!buf) {
|
||||||
fclose(file);
|
fclose(file);
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t read_bytes = fread(buf, 1, size, file);
|
size_t read_bytes = fread(buf, 1, size, file);
|
||||||
buf[read_bytes] = '\0';
|
buf[read_bytes] = '\0';
|
||||||
fclose(file);
|
fclose(file);
|
||||||
@@ -185,7 +227,6 @@ static void on_auto_advance_timer(lv_timer_t* timer) {
|
|||||||
|
|
||||||
static void handle_audio_finished(AppCtx* ctx) {
|
static void handle_audio_finished(AppCtx* ctx) {
|
||||||
if (ctx->current_page + 1 < ctx->page_count) {
|
if (ctx->current_page + 1 < ctx->page_count) {
|
||||||
// Create a one-shot timer with repeat count 1 to run on the GUI thread
|
|
||||||
lv_timer_t* timer = lv_timer_create(on_auto_advance_timer, 0, ctx);
|
lv_timer_t* timer = lv_timer_create(on_auto_advance_timer, 0, ctx);
|
||||||
lv_timer_set_repeat_count(timer, 1);
|
lv_timer_set_repeat_count(timer, 1);
|
||||||
} else {
|
} else {
|
||||||
@@ -208,7 +249,6 @@ static void wait_for_playback_task_to_exit(AppCtx* ctx) {
|
|||||||
|
|
||||||
/* ─── Load Page Content (Image, Caption, Audio path) ─── */
|
/* ─── Load Page Content (Image, Caption, Audio path) ─── */
|
||||||
static void load_page(AppCtx* ctx, int page_index, bool start_audio) {
|
static void load_page(AppCtx* ctx, int page_index, bool start_audio) {
|
||||||
// 1. Stop current audio if running and wait for thread to finish
|
|
||||||
wait_for_playback_task_to_exit(ctx);
|
wait_for_playback_task_to_exit(ctx);
|
||||||
|
|
||||||
if (page_index < 0 || page_index >= ctx->page_count) return;
|
if (page_index < 0 || page_index >= ctx->page_count) return;
|
||||||
@@ -225,7 +265,7 @@ static void load_page(AppCtx* ctx, int page_index, bool start_audio) {
|
|||||||
if (img_item && img_item->valuestring) {
|
if (img_item && img_item->valuestring) {
|
||||||
char img_path[512];
|
char img_path[512];
|
||||||
snprintf(img_path, sizeof(img_path), "/sdcard/books/%s/%s", ctx->current_book_slug, img_item->valuestring);
|
snprintf(img_path, sizeof(img_path), "/sdcard/books/%s/%s", ctx->current_book_slug, img_item->valuestring);
|
||||||
|
|
||||||
FILE* img_file = fopen(img_path, "rb");
|
FILE* img_file = fopen(img_path, "rb");
|
||||||
if (img_file) {
|
if (img_file) {
|
||||||
fclose(img_file);
|
fclose(img_file);
|
||||||
@@ -238,15 +278,13 @@ static void load_page(AppCtx* ctx, int page_index, bool start_audio) {
|
|||||||
lv_image_set_src(ctx->img_page, lv_img_path);
|
lv_image_set_src(ctx->img_page, lv_img_path);
|
||||||
} else {
|
} else {
|
||||||
ESP_LOGW(TAG, "Image file not found: %s", img_path);
|
ESP_LOGW(TAG, "Image file not found: %s", img_path);
|
||||||
lv_image_set_src(ctx->img_page, LV_SYMBOL_IMAGE); // Show default fallback icon
|
lv_image_set_src(ctx->img_page, LV_SYMBOL_IMAGE);
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
lv_image_set_src(ctx->img_page, LV_SYMBOL_IMAGE);
|
lv_image_set_src(ctx->img_page, LV_SYMBOL_IMAGE);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// Update Page index indicator
|
||||||
|
|
||||||
// Update Page index indicator (e.g. "1 / 12")
|
|
||||||
char ind_buf[32];
|
char ind_buf[32];
|
||||||
snprintf(ind_buf, sizeof(ind_buf), "%d / %d", page_index + 1, ctx->page_count);
|
snprintf(ind_buf, sizeof(ind_buf), "%d / %d", page_index + 1, ctx->page_count);
|
||||||
lv_label_set_text(ctx->lbl_indicator, ind_buf);
|
lv_label_set_text(ctx->lbl_indicator, ind_buf);
|
||||||
@@ -258,18 +296,16 @@ static void load_page(AppCtx* ctx, int page_index, bool start_audio) {
|
|||||||
ctx->current_audio_path[0] = '\0';
|
ctx->current_audio_path[0] = '\0';
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update UI states (like Prev/Next buttons)
|
|
||||||
update_ui(ctx);
|
update_ui(ctx);
|
||||||
|
|
||||||
// Start playback if requested and valid
|
// Start playback if requested and valid
|
||||||
if (start_audio && ctx->current_audio_path[0] != '\0') {
|
if (start_audio && ctx->current_audio_path[0] != '\0') {
|
||||||
// Verify audio file exists
|
|
||||||
FILE* audio_file = fopen(ctx->current_audio_path, "rb");
|
FILE* audio_file = fopen(ctx->current_audio_path, "rb");
|
||||||
if (audio_file) {
|
if (audio_file) {
|
||||||
fclose(audio_file);
|
fclose(audio_file);
|
||||||
ctx->state = STATE_PLAYING;
|
ctx->state = STATE_PLAYING;
|
||||||
update_ui(ctx);
|
update_ui(ctx);
|
||||||
xTaskCreate(audio_playback_task, "audio_play", 4096, ctx, 5, &ctx->playback_task_handle);
|
xTaskCreate(audio_playback_task, "audio_play", 8192, ctx, 5, &ctx->playback_task_handle);
|
||||||
} else {
|
} else {
|
||||||
ESP_LOGE(TAG, "Audio file not found: %s", ctx->current_audio_path);
|
ESP_LOGE(TAG, "Audio file not found: %s", ctx->current_audio_path);
|
||||||
const char* buttons[] = {"OK"};
|
const char* buttons[] = {"OK"};
|
||||||
@@ -300,7 +336,7 @@ static void return_to_picker(AppCtx* ctx) {
|
|||||||
/* ─── Task Selection (MP3 or WAV) ─── */
|
/* ─── Task Selection (MP3 or WAV) ─── */
|
||||||
static void audio_playback_task(void* arg) {
|
static void audio_playback_task(void* arg) {
|
||||||
AppCtx* ctx = (AppCtx*)arg;
|
AppCtx* ctx = (AppCtx*)arg;
|
||||||
|
|
||||||
size_t len = strlen(ctx->current_audio_path);
|
size_t len = strlen(ctx->current_audio_path);
|
||||||
bool is_wav = false;
|
bool is_wav = false;
|
||||||
if (len > 4 && strcasecmp(ctx->current_audio_path + len - 4, ".wav") == 0) {
|
if (len > 4 && strcasecmp(ctx->current_audio_path + len - 4, ".wav") == 0) {
|
||||||
@@ -314,9 +350,8 @@ static void audio_playback_task(void* arg) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ─── MP3 Decoder Routine ─── */
|
/* ─── MP3 Decoder Routine (audio-stream) ─── */
|
||||||
static void play_mp3(AppCtx* ctx) {
|
static void play_mp3(AppCtx* ctx) {
|
||||||
// Let the GUI thread load the image from SD first to avoid hardware SD card bus contention
|
|
||||||
vTaskDelay(pdMS_TO_TICKS(400));
|
vTaskDelay(pdMS_TO_TICKS(400));
|
||||||
|
|
||||||
FILE* file = fopen(ctx->current_audio_path, "rb");
|
FILE* file = fopen(ctx->current_audio_path, "rb");
|
||||||
@@ -354,14 +389,12 @@ static void play_mp3(AppCtx* ctx) {
|
|||||||
int sample_rate = 0;
|
int sample_rate = 0;
|
||||||
int channels = 0;
|
int channels = 0;
|
||||||
|
|
||||||
ESP_LOGI(TAG, "Starting MP3 playback: %s (%d bytes)", ctx->current_audio_path, file_size);
|
ESP_LOGI(TAG, "Starting MP3 playback via audio-stream: %s (%d bytes)", ctx->current_audio_path, file_size);
|
||||||
|
|
||||||
while (ctx->state != STATE_IDLE) {
|
while (ctx->state != STATE_IDLE) {
|
||||||
if (ctx->state == STATE_PAUSED) {
|
if (ctx->state == STATE_PAUSED) {
|
||||||
if (sample_rate != 0) {
|
if (ctx->stream_handle) {
|
||||||
device_lock(ctx->i2s_dev);
|
close_stream_if_open(ctx);
|
||||||
i2s_controller_reset(ctx->i2s_dev);
|
|
||||||
device_unlock(ctx->i2s_dev);
|
|
||||||
sample_rate = 0;
|
sample_rate = 0;
|
||||||
channels = 0;
|
channels = 0;
|
||||||
}
|
}
|
||||||
@@ -390,7 +423,6 @@ static void play_mp3(AppCtx* ctx) {
|
|||||||
|
|
||||||
if (info.frame_bytes <= 0) {
|
if (info.frame_bytes <= 0) {
|
||||||
if (eof) break;
|
if (eof) break;
|
||||||
// Resync
|
|
||||||
memmove(ctx->audio_buf, ctx->audio_buf + 1, --buffered_bytes);
|
memmove(ctx->audio_buf, ctx->audio_buf + 1, --buffered_bytes);
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
@@ -400,22 +432,10 @@ static void play_mp3(AppCtx* ctx) {
|
|||||||
memmove(ctx->audio_buf, ctx->audio_buf + consumed, buffered_bytes);
|
memmove(ctx->audio_buf, ctx->audio_buf + consumed, buffered_bytes);
|
||||||
|
|
||||||
if (samples > 0) {
|
if (samples > 0) {
|
||||||
// Configure I2S
|
// Open/reopen stream on format change
|
||||||
if (sample_rate != info.hz || channels != info.channels) {
|
if (sample_rate != info.hz || channels != info.channels) {
|
||||||
struct I2sConfig config = {
|
if (!open_output_stream(ctx, (uint32_t)info.hz, (uint8_t)info.channels, 16)) {
|
||||||
.communication_format = I2S_FORMAT_STAND_I2S,
|
ESP_LOGE(TAG, "Failed to open audio stream for MP3: %d Hz %d ch", info.hz, info.channels);
|
||||||
.sample_rate = (uint32_t)info.hz,
|
|
||||||
.bits_per_sample = 16,
|
|
||||||
.channel_left = 0,
|
|
||||||
.channel_right = (info.channels == 2) ? 1 : I2S_CHANNEL_NONE
|
|
||||||
};
|
|
||||||
|
|
||||||
device_lock(ctx->i2s_dev);
|
|
||||||
error_t err = i2s_controller_set_config(ctx->i2s_dev, &config);
|
|
||||||
device_unlock(ctx->i2s_dev);
|
|
||||||
|
|
||||||
if (err != ERROR_NONE) {
|
|
||||||
ESP_LOGE(TAG, "Failed to configure I2S: %d", err);
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
sample_rate = info.hz;
|
sample_rate = info.hz;
|
||||||
@@ -431,15 +451,15 @@ static void play_mp3(AppCtx* ctx) {
|
|||||||
samples_ptr[i] = (int16_t)scaled;
|
samples_ptr[i] = (int16_t)scaled;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Write PCM to I2S
|
// Write via audio_stream (resampled to native 44100 internally)
|
||||||
size_t offset = 0;
|
size_t offset = 0;
|
||||||
size_t data_size = sample_count * sizeof(int16_t);
|
size_t data_size = sample_count * sizeof(int16_t);
|
||||||
bool write_err = false;
|
bool write_err = false;
|
||||||
while (offset < data_size && ctx->state == STATE_PLAYING) {
|
while (offset < data_size && ctx->state == STATE_PLAYING) {
|
||||||
size_t written = 0;
|
size_t written = 0;
|
||||||
error_t err = i2s_controller_write(ctx->i2s_dev, (uint8_t*)ctx->pcm_buf + offset, data_size - offset, &written, pdMS_TO_TICKS(250));
|
error_t err = audio_stream_write(ctx->stream_handle, (uint8_t*)ctx->pcm_buf + offset, data_size - offset, &written, pdMS_TO_TICKS(1000));
|
||||||
if (err != ERROR_NONE || written == 0) {
|
if (err != ERROR_NONE || written == 0) {
|
||||||
ESP_LOGE(TAG, "I2S write error: %d", err);
|
ESP_LOGE(TAG, "audio_stream_write error: %d", err);
|
||||||
write_err = true;
|
write_err = true;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -465,12 +485,7 @@ static void play_mp3(AppCtx* ctx) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fclose(file);
|
fclose(file);
|
||||||
|
close_stream_if_open(ctx);
|
||||||
if (ctx->i2s_dev) {
|
|
||||||
device_lock(ctx->i2s_dev);
|
|
||||||
i2s_controller_reset(ctx->i2s_dev);
|
|
||||||
device_unlock(ctx->i2s_dev);
|
|
||||||
}
|
|
||||||
|
|
||||||
bool stopped_externally = (ctx->state == STATE_IDLE);
|
bool stopped_externally = (ctx->state == STATE_IDLE);
|
||||||
|
|
||||||
@@ -489,9 +504,8 @@ static void play_mp3(AppCtx* ctx) {
|
|||||||
vTaskDelete(NULL);
|
vTaskDelete(NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ─── WAV Decoder Routine ─── */
|
/* ─── WAV Decoder Routine (audio-stream) ─── */
|
||||||
static void play_wav(AppCtx* ctx) {
|
static void play_wav(AppCtx* ctx) {
|
||||||
// Let the GUI thread load the image from SD first to avoid hardware SD card bus contention
|
|
||||||
vTaskDelay(pdMS_TO_TICKS(400));
|
vTaskDelay(pdMS_TO_TICKS(400));
|
||||||
|
|
||||||
FILE* file = fopen(ctx->current_audio_path, "rb");
|
FILE* file = fopen(ctx->current_audio_path, "rb");
|
||||||
@@ -538,49 +552,36 @@ static void play_wav(AppCtx* ctx) {
|
|||||||
fseek(file, sizeof(WavHeader), SEEK_SET);
|
fseek(file, sizeof(WavHeader), SEEK_SET);
|
||||||
}
|
}
|
||||||
|
|
||||||
struct I2sConfig config = {
|
if (!open_output_stream(ctx, header.sample_rate, header.channels, header.bits_per_sample)) {
|
||||||
.communication_format = I2S_FORMAT_STAND_I2S,
|
ESP_LOGE(TAG, "Failed to open audio stream for WAV: %u Hz %u ch", (unsigned)header.sample_rate, header.channels);
|
||||||
.sample_rate = header.sample_rate,
|
|
||||||
.bits_per_sample = header.bits_per_sample,
|
|
||||||
.channel_left = 0,
|
|
||||||
.channel_right = (header.channels == 2) ? 1 : I2S_CHANNEL_NONE
|
|
||||||
};
|
|
||||||
|
|
||||||
device_lock(ctx->i2s_dev);
|
|
||||||
error_t err = i2s_controller_set_config(ctx->i2s_dev, &config);
|
|
||||||
device_unlock(ctx->i2s_dev);
|
|
||||||
|
|
||||||
if (err != ERROR_NONE) {
|
|
||||||
ESP_LOGE(TAG, "Failed to configure WAV I2S: %d", err);
|
|
||||||
fclose(file);
|
fclose(file);
|
||||||
|
tt_lvgl_lock(portMAX_DELAY);
|
||||||
|
ctx->state = STATE_IDLE;
|
||||||
|
update_ui(ctx);
|
||||||
|
tt_lvgl_unlock();
|
||||||
ctx->playback_task_handle = NULL;
|
ctx->playback_task_handle = NULL;
|
||||||
vTaskDelete(NULL);
|
vTaskDelete(NULL);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
ESP_LOGI(TAG, "Starting WAV playback: %s (%u Hz, %u channels)", ctx->current_audio_path, (unsigned int)header.sample_rate, (unsigned int)header.channels);
|
ESP_LOGI(TAG, "Starting WAV via audio-stream: %s (%u Hz, %u ch)", ctx->current_audio_path, (unsigned int)header.sample_rate, (unsigned int)header.channels);
|
||||||
|
|
||||||
size_t total_played = 0;
|
size_t total_played = 0;
|
||||||
bool i2s_configured = true;
|
bool stream_open = true;
|
||||||
|
|
||||||
while (total_played < data_size && ctx->state != STATE_IDLE) {
|
while (total_played < data_size && ctx->state != STATE_IDLE) {
|
||||||
if (ctx->state == STATE_PAUSED) {
|
if (ctx->state == STATE_PAUSED) {
|
||||||
if (i2s_configured) {
|
if (stream_open) {
|
||||||
device_lock(ctx->i2s_dev);
|
close_stream_if_open(ctx);
|
||||||
i2s_controller_reset(ctx->i2s_dev);
|
stream_open = false;
|
||||||
device_unlock(ctx->i2s_dev);
|
|
||||||
i2s_configured = false;
|
|
||||||
}
|
}
|
||||||
vTaskDelay(pdMS_TO_TICKS(50));
|
vTaskDelay(pdMS_TO_TICKS(50));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!i2s_configured) {
|
if (!stream_open) {
|
||||||
device_lock(ctx->i2s_dev);
|
if (!open_output_stream(ctx, header.sample_rate, header.channels, header.bits_per_sample)) break;
|
||||||
err = i2s_controller_set_config(ctx->i2s_dev, &config);
|
stream_open = true;
|
||||||
device_unlock(ctx->i2s_dev);
|
|
||||||
if (err != ERROR_NONE) break;
|
|
||||||
i2s_configured = true;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t to_read = (data_size - total_played < MP3_INPUT_BUFFER_SIZE) ? (data_size - total_played) : MP3_INPUT_BUFFER_SIZE;
|
size_t to_read = (data_size - total_played < MP3_INPUT_BUFFER_SIZE) ? (data_size - total_played) : MP3_INPUT_BUFFER_SIZE;
|
||||||
@@ -596,14 +597,14 @@ static void play_wav(AppCtx* ctx) {
|
|||||||
samples_ptr[i] = (int16_t)scaled;
|
samples_ptr[i] = (int16_t)scaled;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Play to I2S
|
// Write via audio_stream
|
||||||
size_t offset = 0;
|
size_t offset = 0;
|
||||||
bool write_err = false;
|
bool write_err = false;
|
||||||
while (offset < read_bytes && ctx->state == STATE_PLAYING) {
|
while (offset < read_bytes && ctx->state == STATE_PLAYING) {
|
||||||
size_t written = 0;
|
size_t written = 0;
|
||||||
err = i2s_controller_write(ctx->i2s_dev, ctx->audio_buf + offset, read_bytes - offset, &written, pdMS_TO_TICKS(100));
|
error_t err = audio_stream_write(ctx->stream_handle, ctx->audio_buf + offset, read_bytes - offset, &written, pdMS_TO_TICKS(500));
|
||||||
if (err != ERROR_NONE || written == 0) {
|
if (err != ERROR_NONE || written == 0) {
|
||||||
ESP_LOGE(TAG, "I2S WAV write error: %d", err);
|
ESP_LOGE(TAG, "audio_stream WAV write error: %d", err);
|
||||||
write_err = true;
|
write_err = true;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -614,7 +615,6 @@ static void play_wav(AppCtx* ctx) {
|
|||||||
|
|
||||||
total_played += read_bytes;
|
total_played += read_bytes;
|
||||||
|
|
||||||
// Update progress bar
|
|
||||||
int pct = (int)((total_played * 100) / data_size);
|
int pct = (int)((total_played * 100) / data_size);
|
||||||
if (pct < 0) pct = 0;
|
if (pct < 0) pct = 0;
|
||||||
if (pct > 100) pct = 100;
|
if (pct > 100) pct = 100;
|
||||||
@@ -629,12 +629,7 @@ static void play_wav(AppCtx* ctx) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
fclose(file);
|
fclose(file);
|
||||||
|
close_stream_if_open(ctx);
|
||||||
if (ctx->i2s_dev) {
|
|
||||||
device_lock(ctx->i2s_dev);
|
|
||||||
i2s_controller_reset(ctx->i2s_dev);
|
|
||||||
device_unlock(ctx->i2s_dev);
|
|
||||||
}
|
|
||||||
|
|
||||||
bool stopped_externally = (ctx->state == STATE_IDLE);
|
bool stopped_externally = (ctx->state == STATE_IDLE);
|
||||||
|
|
||||||
@@ -652,29 +647,29 @@ static void play_wav(AppCtx* ctx) {
|
|||||||
static void on_book_selected(lv_event_t* e) {
|
static void on_book_selected(lv_event_t* e) {
|
||||||
int index = (int)(intptr_t)lv_event_get_user_data(e);
|
int index = (int)(intptr_t)lv_event_get_user_data(e);
|
||||||
AppCtx* ctx = &g_ctx;
|
AppCtx* ctx = &g_ctx;
|
||||||
|
|
||||||
BookMetadata* book = &ctx->books[index];
|
BookMetadata* book = &ctx->books[index];
|
||||||
strncpy(ctx->current_book_slug, book->slug, sizeof(ctx->current_book_slug) - 1);
|
strncpy(ctx->current_book_slug, book->slug, sizeof(ctx->current_book_slug) - 1);
|
||||||
|
|
||||||
char manifest_path[512];
|
char manifest_path[512];
|
||||||
snprintf(manifest_path, sizeof(manifest_path), "/sdcard/books/%s/manifest.json", book->slug);
|
snprintf(manifest_path, sizeof(manifest_path), "/sdcard/books/%s/manifest.json", book->slug);
|
||||||
|
|
||||||
char* json_str = read_full_file(manifest_path);
|
char* json_str = read_full_file(manifest_path);
|
||||||
if (!json_str) {
|
if (!json_str) {
|
||||||
const char* buttons[] = {"OK"};
|
const char* buttons[] = {"OK"};
|
||||||
tt_app_alertdialog_start("Read Error", "Failed to open the book manifest.", buttons, 1);
|
tt_app_alertdialog_start("Read Error", "Failed to open the book manifest.", buttons, 1);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
ctx->manifest_root = cJSON_Parse(json_str);
|
ctx->manifest_root = cJSON_Parse(json_str);
|
||||||
free(json_str);
|
free(json_str);
|
||||||
|
|
||||||
if (!ctx->manifest_root) {
|
if (!ctx->manifest_root) {
|
||||||
const char* buttons[] = {"OK"};
|
const char* buttons[] = {"OK"};
|
||||||
tt_app_alertdialog_start("JSON Error", "The book manifest is not formatted correctly.", buttons, 1);
|
tt_app_alertdialog_start("JSON Error", "The book manifest is not formatted correctly.", buttons, 1);
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
ctx->pages_array = cJSON_GetObjectItem(ctx->manifest_root, "pages");
|
ctx->pages_array = cJSON_GetObjectItem(ctx->manifest_root, "pages");
|
||||||
if (!ctx->pages_array || !cJSON_IsArray(ctx->pages_array)) {
|
if (!ctx->pages_array || !cJSON_IsArray(ctx->pages_array)) {
|
||||||
const char* buttons[] = {"OK"};
|
const char* buttons[] = {"OK"};
|
||||||
@@ -684,7 +679,7 @@ static void on_book_selected(lv_event_t* e) {
|
|||||||
ctx->pages_array = NULL;
|
ctx->pages_array = NULL;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
ctx->page_count = cJSON_GetArraySize(ctx->pages_array);
|
ctx->page_count = cJSON_GetArraySize(ctx->pages_array);
|
||||||
if (ctx->page_count <= 0) {
|
if (ctx->page_count <= 0) {
|
||||||
const char* buttons[] = {"OK"};
|
const char* buttons[] = {"OK"};
|
||||||
@@ -694,17 +689,16 @@ static void on_book_selected(lv_event_t* e) {
|
|||||||
ctx->pages_array = NULL;
|
ctx->pages_array = NULL;
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
lv_label_set_text(ctx->lbl_book_title, book->title);
|
lv_label_set_text(ctx->lbl_book_title, book->title);
|
||||||
|
|
||||||
// Switch views
|
// Switch views
|
||||||
lv_obj_add_flag(ctx->picker_wrapper, LV_OBJ_FLAG_HIDDEN);
|
lv_obj_add_flag(ctx->picker_wrapper, LV_OBJ_FLAG_HIDDEN);
|
||||||
lv_obj_remove_flag(ctx->player_wrapper, LV_OBJ_FLAG_HIDDEN);
|
lv_obj_remove_flag(ctx->player_wrapper, LV_OBJ_FLAG_HIDDEN);
|
||||||
lv_obj_remove_flag(ctx->header_bar, LV_OBJ_FLAG_HIDDEN);
|
lv_obj_remove_flag(ctx->header_bar, LV_OBJ_FLAG_HIDDEN);
|
||||||
lv_obj_remove_flag(ctx->ctrl_bar, LV_OBJ_FLAG_HIDDEN);
|
lv_obj_remove_flag(ctx->ctrl_bar, LV_OBJ_FLAG_HIDDEN);
|
||||||
lv_obj_remove_flag(ctx->bar_progress, LV_OBJ_FLAG_HIDDEN);
|
lv_obj_remove_flag(ctx->bar_progress, LV_OBJ_FLAG_HIDDEN);
|
||||||
|
|
||||||
// Load first page (no auto-play initially)
|
|
||||||
load_page(ctx, 0, false);
|
load_page(ctx, 0, false);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -712,57 +706,57 @@ static void on_book_selected(lv_event_t* e) {
|
|||||||
static void scan_books(AppCtx* ctx) {
|
static void scan_books(AppCtx* ctx) {
|
||||||
ctx->book_count = 0;
|
ctx->book_count = 0;
|
||||||
lv_obj_clean(ctx->lst_books);
|
lv_obj_clean(ctx->lst_books);
|
||||||
|
|
||||||
DIR* dir = opendir("/sdcard/books");
|
DIR* dir = opendir("/sdcard/books");
|
||||||
if (!dir) {
|
if (!dir) {
|
||||||
ESP_LOGE(TAG, "Failed to scan books: /sdcard/books folder missing.");
|
ESP_LOGE(TAG, "Failed to scan books: /sdcard/books folder missing.");
|
||||||
lv_list_add_text(ctx->lst_books, "No SD card or books directory found.");
|
lv_list_add_text(ctx->lst_books, "No SD card or books directory found.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
struct dirent* entry;
|
struct dirent* entry;
|
||||||
while ((entry = readdir(dir)) != NULL && ctx->book_count < MAX_BOOKS) {
|
while ((entry = readdir(dir)) != NULL && ctx->book_count < MAX_BOOKS) {
|
||||||
if (entry->d_name[0] == '.') continue;
|
if (entry->d_name[0] == '.') continue;
|
||||||
|
|
||||||
char manifest_path[512];
|
char manifest_path[512];
|
||||||
snprintf(manifest_path, sizeof(manifest_path), "/sdcard/books/%s/manifest.json", entry->d_name);
|
snprintf(manifest_path, sizeof(manifest_path), "/sdcard/books/%s/manifest.json", entry->d_name);
|
||||||
|
|
||||||
char* json_str = read_full_file(manifest_path);
|
char* json_str = read_full_file(manifest_path);
|
||||||
if (json_str) {
|
if (json_str) {
|
||||||
cJSON* root = cJSON_Parse(json_str);
|
cJSON* root = cJSON_Parse(json_str);
|
||||||
free(json_str);
|
free(json_str);
|
||||||
|
|
||||||
if (root) {
|
if (root) {
|
||||||
cJSON* title_item = cJSON_GetObjectItem(root, "title");
|
cJSON* title_item = cJSON_GetObjectItem(root, "title");
|
||||||
cJSON* author_item = cJSON_GetObjectItem(root, "author");
|
cJSON* author_item = cJSON_GetObjectItem(root, "author");
|
||||||
|
|
||||||
BookMetadata* book = &ctx->books[ctx->book_count];
|
BookMetadata* book = &ctx->books[ctx->book_count];
|
||||||
strncpy(book->slug, entry->d_name, sizeof(book->slug) - 1);
|
strncpy(book->slug, entry->d_name, sizeof(book->slug) - 1);
|
||||||
|
|
||||||
if (title_item && title_item->valuestring) {
|
if (title_item && title_item->valuestring) {
|
||||||
strncpy(book->title, title_item->valuestring, sizeof(book->title) - 1);
|
strncpy(book->title, title_item->valuestring, sizeof(book->title) - 1);
|
||||||
} else {
|
} else {
|
||||||
strncpy(book->title, entry->d_name, sizeof(book->title) - 1);
|
strncpy(book->title, entry->d_name, sizeof(book->title) - 1);
|
||||||
}
|
}
|
||||||
|
|
||||||
if (author_item && author_item->valuestring) {
|
if (author_item && author_item->valuestring) {
|
||||||
strncpy(book->author, author_item->valuestring, sizeof(book->author) - 1);
|
strncpy(book->author, author_item->valuestring, sizeof(book->author) - 1);
|
||||||
} else {
|
} else {
|
||||||
book->author[0] = '\0';
|
book->author[0] = '\0';
|
||||||
}
|
}
|
||||||
|
|
||||||
cJSON_Delete(root);
|
cJSON_Delete(root);
|
||||||
ctx->book_count++;
|
ctx->book_count++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
closedir(dir);
|
closedir(dir);
|
||||||
|
|
||||||
if (ctx->book_count == 0) {
|
if (ctx->book_count == 0) {
|
||||||
lv_list_add_text(ctx->lst_books, "No book manifest.json files found.");
|
lv_list_add_text(ctx->lst_books, "No book manifest.json files found.");
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Bubble sort by title
|
// Bubble sort by title
|
||||||
for (int i = 0; i < ctx->book_count - 1; i++) {
|
for (int i = 0; i < ctx->book_count - 1; i++) {
|
||||||
for (int j = 0; j < ctx->book_count - i - 1; j++) {
|
for (int j = 0; j < ctx->book_count - i - 1; j++) {
|
||||||
@@ -773,7 +767,7 @@ static void scan_books(AppCtx* ctx) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Add items to screen list
|
// Add items to screen list
|
||||||
for (int i = 0; i < ctx->book_count; ++i) {
|
for (int i = 0; i < ctx->book_count; ++i) {
|
||||||
char label_text[512];
|
char label_text[512];
|
||||||
@@ -795,7 +789,7 @@ static void on_play_pause_click(lv_event_t* e) {
|
|||||||
if (ctx->state == STATE_IDLE) {
|
if (ctx->state == STATE_IDLE) {
|
||||||
ctx->state = STATE_PLAYING;
|
ctx->state = STATE_PLAYING;
|
||||||
update_ui(ctx);
|
update_ui(ctx);
|
||||||
xTaskCreate(audio_playback_task, "audio_play", 4096, ctx, 5, &ctx->playback_task_handle);
|
xTaskCreate(audio_playback_task, "audio_play", 8192, ctx, 5, &ctx->playback_task_handle);
|
||||||
} else if (ctx->state == STATE_PLAYING) {
|
} else if (ctx->state == STATE_PLAYING) {
|
||||||
ctx->state = STATE_PAUSED;
|
ctx->state = STATE_PAUSED;
|
||||||
update_ui(ctx);
|
update_ui(ctx);
|
||||||
@@ -824,7 +818,7 @@ static void on_next_click(lv_event_t* e) {
|
|||||||
static void on_image_click(lv_event_t* e) {
|
static void on_image_click(lv_event_t* e) {
|
||||||
AppCtx* ctx = (AppCtx*)lv_event_get_user_data(e);
|
AppCtx* ctx = (AppCtx*)lv_event_get_user_data(e);
|
||||||
if (!ctx) return;
|
if (!ctx) return;
|
||||||
|
|
||||||
bool is_hidden = lv_obj_has_flag(ctx->header_bar, LV_OBJ_FLAG_HIDDEN);
|
bool is_hidden = lv_obj_has_flag(ctx->header_bar, LV_OBJ_FLAG_HIDDEN);
|
||||||
if (is_hidden) {
|
if (is_hidden) {
|
||||||
lv_obj_remove_flag(ctx->header_bar, LV_OBJ_FLAG_HIDDEN);
|
lv_obj_remove_flag(ctx->header_bar, LV_OBJ_FLAG_HIDDEN);
|
||||||
@@ -847,7 +841,7 @@ static void onShowApp(AppHandle app, void* data, lv_obj_t* parent) {
|
|||||||
memset(&g_ctx, 0, sizeof(g_ctx));
|
memset(&g_ctx, 0, sizeof(g_ctx));
|
||||||
g_ctx.app = app;
|
g_ctx.app = app;
|
||||||
g_ctx.volume = 80;
|
g_ctx.volume = 80;
|
||||||
|
|
||||||
// Allocate shared audio buffers
|
// Allocate shared audio buffers
|
||||||
#ifdef ESP_PLATFORM
|
#ifdef ESP_PLATFORM
|
||||||
g_ctx.audio_buf = (uint8_t*)heap_caps_malloc(MP3_INPUT_BUFFER_SIZE, MALLOC_CAP_SPIRAM | MALLOC_CAP_8BIT);
|
g_ctx.audio_buf = (uint8_t*)heap_caps_malloc(MP3_INPUT_BUFFER_SIZE, MALLOC_CAP_SPIRAM | MALLOC_CAP_8BIT);
|
||||||
@@ -856,13 +850,12 @@ static void onShowApp(AppHandle app, void* data, lv_obj_t* parent) {
|
|||||||
g_ctx.audio_buf = (uint8_t*)malloc(MP3_INPUT_BUFFER_SIZE);
|
g_ctx.audio_buf = (uint8_t*)malloc(MP3_INPUT_BUFFER_SIZE);
|
||||||
g_ctx.pcm_buf = (mp3d_sample_t*)malloc(MINIMP3_MAX_SAMPLES_PER_FRAME * sizeof(mp3d_sample_t));
|
g_ctx.pcm_buf = (mp3d_sample_t*)malloc(MINIMP3_MAX_SAMPLES_PER_FRAME * sizeof(mp3d_sample_t));
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Find I2S sound device
|
// Find audio-stream device (provides resampling to native 44100)
|
||||||
g_ctx.i2s_dev = device_find_by_name("i2s0");
|
if (!find_audio_stream_device(&g_ctx)) {
|
||||||
if (!g_ctx.i2s_dev) {
|
ESP_LOGE(TAG, "audio-stream device not found! Tried 'audio-stream' name and AUDIO_STREAM_TYPE");
|
||||||
ESP_LOGE(TAG, "I2S device 'i2s0' not found!");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// Create dual layouts
|
// Create dual layouts
|
||||||
// 1. Picker Screen wrapper
|
// 1. Picker Screen wrapper
|
||||||
g_ctx.picker_wrapper = lv_obj_create(parent);
|
g_ctx.picker_wrapper = lv_obj_create(parent);
|
||||||
@@ -870,13 +863,11 @@ static void onShowApp(AppHandle app, void* data, lv_obj_t* parent) {
|
|||||||
lv_obj_set_style_border_width(g_ctx.picker_wrapper, 0, 0);
|
lv_obj_set_style_border_width(g_ctx.picker_wrapper, 0, 0);
|
||||||
lv_obj_set_style_pad_all(g_ctx.picker_wrapper, 0, 0);
|
lv_obj_set_style_pad_all(g_ctx.picker_wrapper, 0, 0);
|
||||||
lv_obj_set_style_pad_gap(g_ctx.picker_wrapper, 0, 0);
|
lv_obj_set_style_pad_gap(g_ctx.picker_wrapper, 0, 0);
|
||||||
lv_obj_set_style_bg_color(g_ctx.picker_wrapper, lv_color_hex(0x1E1E2E), 0); // Dark background
|
lv_obj_set_style_bg_color(g_ctx.picker_wrapper, lv_color_hex(0x1E1E2E), 0);
|
||||||
|
|
||||||
// Toolbar in picker
|
|
||||||
lv_obj_t* toolbar = tt_lvgl_toolbar_create_for_app(g_ctx.picker_wrapper, app);
|
lv_obj_t* toolbar = tt_lvgl_toolbar_create_for_app(g_ctx.picker_wrapper, app);
|
||||||
lv_obj_align(toolbar, LV_ALIGN_TOP_MID, 0, 0);
|
lv_obj_align(toolbar, LV_ALIGN_TOP_MID, 0, 0);
|
||||||
|
|
||||||
// Picker list
|
|
||||||
g_ctx.lst_books = lv_list_create(g_ctx.picker_wrapper);
|
g_ctx.lst_books = lv_list_create(g_ctx.picker_wrapper);
|
||||||
lv_obj_set_width(g_ctx.lst_books, LV_PCT(100));
|
lv_obj_set_width(g_ctx.lst_books, LV_PCT(100));
|
||||||
lv_obj_align_to(g_ctx.lst_books, toolbar, LV_ALIGN_OUT_BOTTOM_MID, 0, 0);
|
lv_obj_align_to(g_ctx.lst_books, toolbar, LV_ALIGN_OUT_BOTTOM_MID, 0, 0);
|
||||||
@@ -885,7 +876,7 @@ static void onShowApp(AppHandle app, void* data, lv_obj_t* parent) {
|
|||||||
lv_obj_set_height(g_ctx.lst_books, parent_height - toolbar_height);
|
lv_obj_set_height(g_ctx.lst_books, parent_height - toolbar_height);
|
||||||
lv_obj_set_style_bg_color(g_ctx.lst_books, lv_color_hex(0x1E1E2E), 0);
|
lv_obj_set_style_bg_color(g_ctx.lst_books, lv_color_hex(0x1E1E2E), 0);
|
||||||
lv_obj_set_style_border_color(g_ctx.lst_books, lv_color_hex(0x313244), 0);
|
lv_obj_set_style_border_color(g_ctx.lst_books, lv_color_hex(0x313244), 0);
|
||||||
|
|
||||||
// 2. Player Screen wrapper (hidden on start)
|
// 2. Player Screen wrapper (hidden on start)
|
||||||
g_ctx.player_wrapper = lv_obj_create(parent);
|
g_ctx.player_wrapper = lv_obj_create(parent);
|
||||||
lv_obj_set_size(g_ctx.player_wrapper, LV_PCT(100), LV_PCT(100));
|
lv_obj_set_size(g_ctx.player_wrapper, LV_PCT(100), LV_PCT(100));
|
||||||
@@ -893,10 +884,9 @@ static void onShowApp(AppHandle app, void* data, lv_obj_t* parent) {
|
|||||||
lv_obj_set_style_pad_all(g_ctx.player_wrapper, 0, 0);
|
lv_obj_set_style_pad_all(g_ctx.player_wrapper, 0, 0);
|
||||||
lv_obj_set_style_pad_gap(g_ctx.player_wrapper, 0, 0);
|
lv_obj_set_style_pad_gap(g_ctx.player_wrapper, 0, 0);
|
||||||
lv_obj_set_style_bg_color(g_ctx.player_wrapper, lv_color_hex(0x1E1E2E), 0);
|
lv_obj_set_style_bg_color(g_ctx.player_wrapper, lv_color_hex(0x1E1E2E), 0);
|
||||||
lv_obj_remove_flag(g_ctx.player_wrapper, LV_OBJ_FLAG_SCROLLABLE); // Lock page scrolling
|
lv_obj_remove_flag(g_ctx.player_wrapper, LV_OBJ_FLAG_SCROLLABLE);
|
||||||
lv_obj_add_flag(g_ctx.player_wrapper, LV_OBJ_FLAG_HIDDEN);
|
lv_obj_add_flag(g_ctx.player_wrapper, LV_OBJ_FLAG_HIDDEN);
|
||||||
|
|
||||||
// Page Image (covers the whole screen as background)
|
|
||||||
g_ctx.img_page = lv_image_create(g_ctx.player_wrapper);
|
g_ctx.img_page = lv_image_create(g_ctx.player_wrapper);
|
||||||
lv_obj_align(g_ctx.img_page, LV_ALIGN_CENTER, 0, 0);
|
lv_obj_align(g_ctx.img_page, LV_ALIGN_CENTER, 0, 0);
|
||||||
lv_obj_set_style_bg_opa(g_ctx.img_page, LV_OPA_TRANSP, 0);
|
lv_obj_set_style_bg_opa(g_ctx.img_page, LV_OPA_TRANSP, 0);
|
||||||
@@ -905,20 +895,18 @@ static void onShowApp(AppHandle app, void* data, lv_obj_t* parent) {
|
|||||||
lv_obj_remove_flag(g_ctx.img_page, LV_OBJ_FLAG_SCROLLABLE);
|
lv_obj_remove_flag(g_ctx.img_page, LV_OBJ_FLAG_SCROLLABLE);
|
||||||
lv_obj_add_flag(g_ctx.img_page, LV_OBJ_FLAG_CLICKABLE);
|
lv_obj_add_flag(g_ctx.img_page, LV_OBJ_FLAG_CLICKABLE);
|
||||||
lv_obj_add_event_cb(g_ctx.img_page, on_image_click, LV_EVENT_CLICKED, &g_ctx);
|
lv_obj_add_event_cb(g_ctx.img_page, on_image_click, LV_EVENT_CLICKED, &g_ctx);
|
||||||
|
|
||||||
// Custom Player header (Back button, Book Title, Page Indicator)
|
|
||||||
g_ctx.header_bar = lv_obj_create(g_ctx.player_wrapper);
|
g_ctx.header_bar = lv_obj_create(g_ctx.player_wrapper);
|
||||||
lv_obj_t* header_bar = g_ctx.header_bar;
|
lv_obj_t* header_bar = g_ctx.header_bar;
|
||||||
lv_obj_set_size(header_bar, LV_PCT(100), 36);
|
lv_obj_set_size(header_bar, LV_PCT(100), 36);
|
||||||
lv_obj_align(header_bar, LV_ALIGN_TOP_MID, 0, 0);
|
lv_obj_align(header_bar, LV_ALIGN_TOP_MID, 0, 0);
|
||||||
lv_obj_set_style_radius(header_bar, 0, 0);
|
lv_obj_set_style_radius(header_bar, 0, 0);
|
||||||
lv_obj_set_style_bg_color(header_bar, lv_color_hex(0x11111B), 0);
|
lv_obj_set_style_bg_color(header_bar, lv_color_hex(0x11111B), 0);
|
||||||
lv_obj_set_style_bg_opa(header_bar, LV_OPA_COVER, 0); // Solid header bar
|
lv_obj_set_style_bg_opa(header_bar, LV_OPA_COVER, 0);
|
||||||
lv_obj_set_style_border_color(header_bar, lv_color_hex(0x313244), 0);
|
lv_obj_set_style_border_color(header_bar, lv_color_hex(0x313244), 0);
|
||||||
lv_obj_set_style_border_width(header_bar, 1, LV_PART_MAIN);
|
lv_obj_set_style_border_width(header_bar, 1, LV_PART_MAIN);
|
||||||
lv_obj_remove_flag(header_bar, LV_OBJ_FLAG_SCROLLABLE);
|
lv_obj_remove_flag(header_bar, LV_OBJ_FLAG_SCROLLABLE);
|
||||||
|
|
||||||
// Back button
|
|
||||||
lv_obj_t* btn_back = lv_button_create(header_bar);
|
lv_obj_t* btn_back = lv_button_create(header_bar);
|
||||||
lv_obj_set_size(btn_back, 44, 26);
|
lv_obj_set_size(btn_back, 44, 26);
|
||||||
lv_obj_align(btn_back, LV_ALIGN_LEFT_MID, 0, 0);
|
lv_obj_align(btn_back, LV_ALIGN_LEFT_MID, 0, 0);
|
||||||
@@ -928,37 +916,33 @@ static void onShowApp(AppHandle app, void* data, lv_obj_t* parent) {
|
|||||||
lv_label_set_text(lbl_back, LV_SYMBOL_LEFT);
|
lv_label_set_text(lbl_back, LV_SYMBOL_LEFT);
|
||||||
lv_obj_center(lbl_back);
|
lv_obj_center(lbl_back);
|
||||||
lv_obj_add_event_cb(btn_back, on_back_click, LV_EVENT_CLICKED, &g_ctx);
|
lv_obj_add_event_cb(btn_back, on_back_click, LV_EVENT_CLICKED, &g_ctx);
|
||||||
|
|
||||||
// Title
|
|
||||||
g_ctx.lbl_book_title = lv_label_create(header_bar);
|
g_ctx.lbl_book_title = lv_label_create(header_bar);
|
||||||
lv_obj_align(g_ctx.lbl_book_title, LV_ALIGN_CENTER, 0, 0);
|
lv_obj_align(g_ctx.lbl_book_title, LV_ALIGN_CENTER, 0, 0);
|
||||||
lv_obj_set_width(g_ctx.lbl_book_title, 180);
|
lv_obj_set_width(g_ctx.lbl_book_title, 180);
|
||||||
lv_obj_set_style_text_align(g_ctx.lbl_book_title, LV_TEXT_ALIGN_CENTER, 0);
|
lv_obj_set_style_text_align(g_ctx.lbl_book_title, LV_TEXT_ALIGN_CENTER, 0);
|
||||||
lv_obj_set_style_text_color(g_ctx.lbl_book_title, lv_color_hex(0xCDD6F4), 0);
|
lv_obj_set_style_text_color(g_ctx.lbl_book_title, lv_color_hex(0xCDD6F4), 0);
|
||||||
lv_label_set_long_mode(g_ctx.lbl_book_title, LV_LABEL_LONG_DOT); // Static text with dots to prevent dynamic redraw overhead
|
lv_label_set_long_mode(g_ctx.lbl_book_title, LV_LABEL_LONG_DOT);
|
||||||
|
|
||||||
// Page Indicator
|
|
||||||
g_ctx.lbl_indicator = lv_label_create(header_bar);
|
g_ctx.lbl_indicator = lv_label_create(header_bar);
|
||||||
lv_obj_align(g_ctx.lbl_indicator, LV_ALIGN_RIGHT_MID, 0, 0);
|
lv_obj_align(g_ctx.lbl_indicator, LV_ALIGN_RIGHT_MID, 0, 0);
|
||||||
lv_obj_set_style_text_color(g_ctx.lbl_indicator, lv_color_hex(0xA6ADC8), 0);
|
lv_obj_set_style_text_color(g_ctx.lbl_indicator, lv_color_hex(0xA6ADC8), 0);
|
||||||
lv_label_set_text(g_ctx.lbl_indicator, "1 / 1");
|
lv_label_set_text(g_ctx.lbl_indicator, "1 / 1");
|
||||||
|
|
||||||
// Bottom Controls container (overlaying background image)
|
|
||||||
g_ctx.ctrl_bar = lv_obj_create(g_ctx.player_wrapper);
|
g_ctx.ctrl_bar = lv_obj_create(g_ctx.player_wrapper);
|
||||||
lv_obj_t* ctrl_bar = g_ctx.ctrl_bar;
|
lv_obj_t* ctrl_bar = g_ctx.ctrl_bar;
|
||||||
lv_obj_set_size(ctrl_bar, LV_PCT(100), 40);
|
lv_obj_set_size(ctrl_bar, LV_PCT(100), 40);
|
||||||
lv_obj_align(ctrl_bar, LV_ALIGN_BOTTOM_MID, 0, 0);
|
lv_obj_align(ctrl_bar, LV_ALIGN_BOTTOM_MID, 0, 0);
|
||||||
lv_obj_set_style_radius(ctrl_bar, 0, 0);
|
lv_obj_set_style_radius(ctrl_bar, 0, 0);
|
||||||
lv_obj_set_style_bg_color(ctrl_bar, lv_color_hex(0x11111B), 0);
|
lv_obj_set_style_bg_color(ctrl_bar, lv_color_hex(0x11111B), 0);
|
||||||
lv_obj_set_style_bg_opa(ctrl_bar, LV_OPA_COVER, 0); // Solid control bar
|
lv_obj_set_style_bg_opa(ctrl_bar, LV_OPA_COVER, 0);
|
||||||
lv_obj_set_style_border_width(ctrl_bar, 0, 0);
|
lv_obj_set_style_border_width(ctrl_bar, 0, 0);
|
||||||
lv_obj_set_style_pad_all(ctrl_bar, 0, 0);
|
lv_obj_set_style_pad_all(ctrl_bar, 0, 0);
|
||||||
lv_obj_set_style_pad_gap(ctrl_bar, 0, 0);
|
lv_obj_set_style_pad_gap(ctrl_bar, 0, 0);
|
||||||
lv_obj_set_flex_flow(ctrl_bar, LV_FLEX_FLOW_ROW);
|
lv_obj_set_flex_flow(ctrl_bar, LV_FLEX_FLOW_ROW);
|
||||||
lv_obj_set_flex_align(ctrl_bar, LV_FLEX_ALIGN_SPACE_EVENLY, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_CENTER);
|
lv_obj_set_flex_align(ctrl_bar, LV_FLEX_ALIGN_SPACE_EVENLY, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_CENTER);
|
||||||
lv_obj_remove_flag(ctrl_bar, LV_OBJ_FLAG_SCROLLABLE);
|
lv_obj_remove_flag(ctrl_bar, LV_OBJ_FLAG_SCROLLABLE);
|
||||||
|
|
||||||
// Progress Bar (thin bar running along the top of control bar)
|
|
||||||
g_ctx.bar_progress = lv_bar_create(g_ctx.player_wrapper);
|
g_ctx.bar_progress = lv_bar_create(g_ctx.player_wrapper);
|
||||||
lv_obj_set_size(g_ctx.bar_progress, LV_PCT(100), 4);
|
lv_obj_set_size(g_ctx.bar_progress, LV_PCT(100), 4);
|
||||||
lv_obj_align_to(g_ctx.bar_progress, ctrl_bar, LV_ALIGN_OUT_TOP_MID, 0, 0);
|
lv_obj_align_to(g_ctx.bar_progress, ctrl_bar, LV_ALIGN_OUT_TOP_MID, 0, 0);
|
||||||
@@ -966,8 +950,7 @@ static void onShowApp(AppHandle app, void* data, lv_obj_t* parent) {
|
|||||||
lv_bar_set_value(g_ctx.bar_progress, 0, LV_ANIM_OFF);
|
lv_bar_set_value(g_ctx.bar_progress, 0, LV_ANIM_OFF);
|
||||||
lv_obj_set_style_bg_color(g_ctx.bar_progress, lv_color_hex(0x45475A), LV_PART_MAIN);
|
lv_obj_set_style_bg_color(g_ctx.bar_progress, lv_color_hex(0x45475A), LV_PART_MAIN);
|
||||||
lv_obj_set_style_bg_color(g_ctx.bar_progress, lv_color_hex(0x89B4FA), LV_PART_INDICATOR);
|
lv_obj_set_style_bg_color(g_ctx.bar_progress, lv_color_hex(0x89B4FA), LV_PART_INDICATOR);
|
||||||
|
|
||||||
// Prev Button
|
|
||||||
g_ctx.btn_prev = lv_button_create(ctrl_bar);
|
g_ctx.btn_prev = lv_button_create(ctrl_bar);
|
||||||
lv_obj_set_size(g_ctx.btn_prev, 54, 30);
|
lv_obj_set_size(g_ctx.btn_prev, 54, 30);
|
||||||
lv_obj_set_style_radius(g_ctx.btn_prev, 15, 0);
|
lv_obj_set_style_radius(g_ctx.btn_prev, 15, 0);
|
||||||
@@ -976,8 +959,7 @@ static void onShowApp(AppHandle app, void* data, lv_obj_t* parent) {
|
|||||||
lv_label_set_text(lbl_prev, LV_SYMBOL_PREV);
|
lv_label_set_text(lbl_prev, LV_SYMBOL_PREV);
|
||||||
lv_obj_center(lbl_prev);
|
lv_obj_center(lbl_prev);
|
||||||
lv_obj_add_event_cb(g_ctx.btn_prev, on_prev_click, LV_EVENT_CLICKED, &g_ctx);
|
lv_obj_add_event_cb(g_ctx.btn_prev, on_prev_click, LV_EVENT_CLICKED, &g_ctx);
|
||||||
|
|
||||||
// Play/Pause Button
|
|
||||||
g_ctx.btn_play_pause = lv_button_create(ctrl_bar);
|
g_ctx.btn_play_pause = lv_button_create(ctrl_bar);
|
||||||
lv_obj_set_size(g_ctx.btn_play_pause, 94, 30);
|
lv_obj_set_size(g_ctx.btn_play_pause, 94, 30);
|
||||||
lv_obj_set_style_radius(g_ctx.btn_play_pause, 15, 0);
|
lv_obj_set_style_radius(g_ctx.btn_play_pause, 15, 0);
|
||||||
@@ -987,8 +969,7 @@ static void onShowApp(AppHandle app, void* data, lv_obj_t* parent) {
|
|||||||
lv_label_set_text(lbl_play_btn, LV_SYMBOL_PLAY " Play");
|
lv_label_set_text(lbl_play_btn, LV_SYMBOL_PLAY " Play");
|
||||||
lv_obj_center(lbl_play_btn);
|
lv_obj_center(lbl_play_btn);
|
||||||
lv_obj_add_event_cb(g_ctx.btn_play_pause, on_play_pause_click, LV_EVENT_CLICKED, &g_ctx);
|
lv_obj_add_event_cb(g_ctx.btn_play_pause, on_play_pause_click, LV_EVENT_CLICKED, &g_ctx);
|
||||||
|
|
||||||
// Next Button
|
|
||||||
g_ctx.btn_next = lv_button_create(ctrl_bar);
|
g_ctx.btn_next = lv_button_create(ctrl_bar);
|
||||||
lv_obj_set_size(g_ctx.btn_next, 54, 30);
|
lv_obj_set_size(g_ctx.btn_next, 54, 30);
|
||||||
lv_obj_set_style_radius(g_ctx.btn_next, 15, 0);
|
lv_obj_set_style_radius(g_ctx.btn_next, 15, 0);
|
||||||
@@ -1001,26 +982,20 @@ static void onShowApp(AppHandle app, void* data, lv_obj_t* parent) {
|
|||||||
// Initial load
|
// Initial load
|
||||||
g_ctx.state = STATE_IDLE;
|
g_ctx.state = STATE_IDLE;
|
||||||
update_ui(&g_ctx);
|
update_ui(&g_ctx);
|
||||||
|
|
||||||
// Scan Books
|
|
||||||
scan_books(&g_ctx);
|
scan_books(&g_ctx);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void onHideApp(AppHandle app, void* data) {
|
static void onHideApp(AppHandle app, void* data) {
|
||||||
wait_for_playback_task_to_exit(&g_ctx);
|
wait_for_playback_task_to_exit(&g_ctx);
|
||||||
|
close_stream_if_open(&g_ctx);
|
||||||
if (g_ctx.i2s_dev) {
|
|
||||||
device_lock(g_ctx.i2s_dev);
|
|
||||||
i2s_controller_reset(g_ctx.i2s_dev);
|
|
||||||
device_unlock(g_ctx.i2s_dev);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (g_ctx.manifest_root) {
|
if (g_ctx.manifest_root) {
|
||||||
cJSON_Delete(g_ctx.manifest_root);
|
cJSON_Delete(g_ctx.manifest_root);
|
||||||
g_ctx.manifest_root = NULL;
|
g_ctx.manifest_root = NULL;
|
||||||
g_ctx.pages_array = NULL;
|
g_ctx.pages_array = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
#ifdef ESP_PLATFORM
|
#ifdef ESP_PLATFORM
|
||||||
if (g_ctx.audio_buf) {
|
if (g_ctx.audio_buf) {
|
||||||
heap_caps_free(g_ctx.audio_buf);
|
heap_caps_free(g_ctx.audio_buf);
|
||||||
|
|||||||
@@ -3,7 +3,8 @@
|
|||||||
#include <tt_lvgl_toolbar.h>
|
#include <tt_lvgl_toolbar.h>
|
||||||
|
|
||||||
#include <tactility/device.h>
|
#include <tactility/device.h>
|
||||||
#include <tactility/drivers/i2s_controller.h>
|
#include <tactility/drivers/audio_stream.h>
|
||||||
|
#include <tactility/drivers/audio_codec.h>
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
@@ -27,7 +28,8 @@ typedef enum {
|
|||||||
} PlaybackState;
|
} PlaybackState;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
struct Device* i2s_dev;
|
struct Device* stream_dev;
|
||||||
|
AudioStreamHandle stream_handle;
|
||||||
char filepath[512];
|
char filepath[512];
|
||||||
PlaybackState state;
|
PlaybackState state;
|
||||||
|
|
||||||
@@ -119,17 +121,17 @@ static void mp3_playback_task(void* arg) {
|
|||||||
ctx->eof = false;
|
ctx->eof = false;
|
||||||
ctx->sample_rate = 0;
|
ctx->sample_rate = 0;
|
||||||
ctx->channels = 0;
|
ctx->channels = 0;
|
||||||
|
ctx->stream_handle = NULL;
|
||||||
|
|
||||||
ESP_LOGI(TAG, "Starting MP3 playback: %s (size: %d bytes)", ctx->filepath, ctx->file_size);
|
ESP_LOGI(TAG, "Starting MP3 playback: %s (size: %d bytes)", ctx->filepath, ctx->file_size);
|
||||||
|
|
||||||
while (ctx->state != STATE_IDLE) {
|
while (ctx->state != STATE_IDLE) {
|
||||||
if (ctx->state == STATE_PAUSED) {
|
if (ctx->state == STATE_PAUSED) {
|
||||||
if (ctx->sample_rate != 0) {
|
if (ctx->stream_handle != NULL) {
|
||||||
// Reset I2S immediately on pause to stop DMA loops
|
// Close stream immediately on pause to stop DMA
|
||||||
device_lock(ctx->i2s_dev);
|
audio_stream_close(ctx->stream_handle);
|
||||||
i2s_controller_reset(ctx->i2s_dev);
|
ctx->stream_handle = NULL;
|
||||||
device_unlock(ctx->i2s_dev);
|
// Clear cached format to force re-open on resume
|
||||||
// Clear configuration cache to force reconfig on resume
|
|
||||||
ctx->sample_rate = 0;
|
ctx->sample_rate = 0;
|
||||||
ctx->channels = 0;
|
ctx->channels = 0;
|
||||||
}
|
}
|
||||||
@@ -172,30 +174,30 @@ static void mp3_playback_task(void* arg) {
|
|||||||
memmove(ctx->input_buf, ctx->input_buf + consumed, ctx->buffered_bytes);
|
memmove(ctx->input_buf, ctx->input_buf + consumed, ctx->buffered_bytes);
|
||||||
|
|
||||||
if (samples > 0) {
|
if (samples > 0) {
|
||||||
// Configure I2S if format changed
|
// Configure audio-stream if format changed
|
||||||
if (ctx->sample_rate != info.hz || ctx->channels != info.channels) {
|
if (ctx->sample_rate != info.hz || ctx->channels != info.channels) {
|
||||||
struct I2sConfig config = {
|
if (ctx->stream_handle != NULL) {
|
||||||
.communication_format = I2S_FORMAT_STAND_I2S,
|
audio_stream_close(ctx->stream_handle);
|
||||||
|
ctx->stream_handle = NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
struct AudioStreamConfig config = {
|
||||||
.sample_rate = (uint32_t)info.hz,
|
.sample_rate = (uint32_t)info.hz,
|
||||||
.bits_per_sample = 16,
|
.bits_per_sample = 16,
|
||||||
.channel_left = 0,
|
.channels = (uint8_t)info.channels
|
||||||
.channel_right = (info.channels == 2) ? 1 : I2S_CHANNEL_NONE
|
|
||||||
};
|
};
|
||||||
|
|
||||||
device_lock(ctx->i2s_dev);
|
error_t err = audio_stream_open_output(ctx->stream_dev, &config, &ctx->stream_handle);
|
||||||
error_t err = i2s_controller_set_config(ctx->i2s_dev, &config);
|
|
||||||
device_unlock(ctx->i2s_dev);
|
|
||||||
|
|
||||||
if (err != ERROR_NONE) {
|
if (err != ERROR_NONE) {
|
||||||
ESP_LOGE(TAG, "Failed to set config: %d", err);
|
ESP_LOGE(TAG, "Failed to open audio stream: %d", err);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
ctx->sample_rate = info.hz;
|
ctx->sample_rate = info.hz;
|
||||||
ctx->channels = info.channels;
|
ctx->channels = info.channels;
|
||||||
ESP_LOGI(TAG, "I2S configured: %d Hz, %d channels", info.hz, info.channels);
|
ESP_LOGI(TAG, "Audio stream opened: %d Hz, %d channels", info.hz, info.channels);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Adjust volume
|
// Adjust volume (after resampler)
|
||||||
int vol = ctx->volume;
|
int vol = ctx->volume;
|
||||||
int16_t* samples_ptr = (int16_t*)ctx->pcm_buf;
|
int16_t* samples_ptr = (int16_t*)ctx->pcm_buf;
|
||||||
size_t sample_count = (size_t)samples * info.channels;
|
size_t sample_count = (size_t)samples * info.channels;
|
||||||
@@ -204,15 +206,15 @@ static void mp3_playback_task(void* arg) {
|
|||||||
samples_ptr[i] = (int16_t)scaled;
|
samples_ptr[i] = (int16_t)scaled;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Play audio to I2S
|
// Play audio via audio-stream (resampled to native 44100)
|
||||||
size_t offset = 0;
|
size_t offset = 0;
|
||||||
size_t data_size = sample_count * sizeof(int16_t);
|
size_t data_size = sample_count * sizeof(int16_t);
|
||||||
bool write_err = false;
|
bool write_err = false;
|
||||||
while (offset < data_size && ctx->state == STATE_PLAYING) {
|
while (offset < data_size && ctx->state == STATE_PLAYING) {
|
||||||
size_t written = 0;
|
size_t written = 0;
|
||||||
error_t err = i2s_controller_write(ctx->i2s_dev, (uint8_t*)ctx->pcm_buf + offset, data_size - offset, &written, pdMS_TO_TICKS(250));
|
error_t err = audio_stream_write(ctx->stream_handle, (uint8_t*)ctx->pcm_buf + offset, data_size - offset, &written, pdMS_TO_TICKS(500));
|
||||||
if (err != ERROR_NONE || written == 0) {
|
if (err != ERROR_NONE || written == 0) {
|
||||||
ESP_LOGE(TAG, "I2S write failed: %d", err);
|
ESP_LOGE(TAG, "Audio stream write failed: %d", err);
|
||||||
write_err = true;
|
write_err = true;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
@@ -232,18 +234,15 @@ static void mp3_playback_task(void* arg) {
|
|||||||
lv_bar_set_value(ctx->bar_progress, pct, LV_ANIM_OFF);
|
lv_bar_set_value(ctx->bar_progress, pct, LV_ANIM_OFF);
|
||||||
tt_lvgl_unlock();
|
tt_lvgl_unlock();
|
||||||
}
|
}
|
||||||
|
|
||||||
// taskYIELD removed to avoid audio gaps - decoder loop is fast enough
|
|
||||||
}
|
}
|
||||||
|
|
||||||
fclose(ctx->file);
|
fclose(ctx->file);
|
||||||
ctx->file = NULL;
|
ctx->file = NULL;
|
||||||
|
|
||||||
// Reset I2S controller to clean up DMA channels and stop looping noise
|
// Close audio stream to clean up DMA / resampler task
|
||||||
if (ctx->i2s_dev) {
|
if (ctx->stream_handle != NULL) {
|
||||||
device_lock(ctx->i2s_dev);
|
audio_stream_close(ctx->stream_handle);
|
||||||
i2s_controller_reset(ctx->i2s_dev);
|
ctx->stream_handle = NULL;
|
||||||
device_unlock(ctx->i2s_dev);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
ESP_LOGI(TAG, "Playback task finished");
|
ESP_LOGI(TAG, "Playback task finished");
|
||||||
@@ -292,10 +291,10 @@ static void onShowApp(AppHandle app, void* data, lv_obj_t* parent) {
|
|||||||
g_ctx.input_buf = (uint8_t*)malloc(MP3_INPUT_BUFFER_SIZE);
|
g_ctx.input_buf = (uint8_t*)malloc(MP3_INPUT_BUFFER_SIZE);
|
||||||
g_ctx.pcm_buf = (mp3d_sample_t*)malloc(MINIMP3_MAX_SAMPLES_PER_FRAME * sizeof(mp3d_sample_t));
|
g_ctx.pcm_buf = (mp3d_sample_t*)malloc(MINIMP3_MAX_SAMPLES_PER_FRAME * sizeof(mp3d_sample_t));
|
||||||
|
|
||||||
// Find device
|
// Find audio-stream device (resampling layer over ES8311 codec)
|
||||||
g_ctx.i2s_dev = device_find_by_name("i2s0");
|
g_ctx.stream_dev = device_find_by_name("audio-stream");
|
||||||
if (!g_ctx.i2s_dev) {
|
if (!g_ctx.stream_dev) {
|
||||||
ESP_LOGE(TAG, "I2S device 'i2s0' not found!");
|
ESP_LOGE(TAG, "Audio-stream device not found!");
|
||||||
}
|
}
|
||||||
|
|
||||||
// Parse launch parameters
|
// Parse launch parameters
|
||||||
@@ -393,8 +392,8 @@ static void onShowApp(AppHandle app, void* data, lv_obj_t* parent) {
|
|||||||
lv_obj_center(lbl_stop);
|
lv_obj_center(lbl_stop);
|
||||||
lv_obj_add_event_cb(g_ctx.btn_stop, on_stop_click, LV_EVENT_CLICKED, &g_ctx);
|
lv_obj_add_event_cb(g_ctx.btn_stop, on_stop_click, LV_EVENT_CLICKED, &g_ctx);
|
||||||
|
|
||||||
if (!g_ctx.i2s_dev) {
|
if (!g_ctx.stream_dev) {
|
||||||
lv_label_set_text(g_ctx.lbl_status, "Error: I2S Not Found");
|
lv_label_set_text(g_ctx.lbl_status, "Error: Audio Not Found");
|
||||||
lv_obj_add_state(g_ctx.btn_play_pause, LV_STATE_DISABLED);
|
lv_obj_add_state(g_ctx.btn_play_pause, LV_STATE_DISABLED);
|
||||||
lv_obj_add_state(g_ctx.btn_stop, LV_STATE_DISABLED);
|
lv_obj_add_state(g_ctx.btn_stop, LV_STATE_DISABLED);
|
||||||
} else if (!g_ctx.input_buf || !g_ctx.pcm_buf) {
|
} else if (!g_ctx.input_buf || !g_ctx.pcm_buf) {
|
||||||
@@ -409,7 +408,7 @@ static void onShowApp(AppHandle app, void* data, lv_obj_t* parent) {
|
|||||||
if (g_ctx.filepath[0] != '\0') {
|
if (g_ctx.filepath[0] != '\0') {
|
||||||
g_ctx.state = STATE_PLAYING;
|
g_ctx.state = STATE_PLAYING;
|
||||||
update_ui(&g_ctx);
|
update_ui(&g_ctx);
|
||||||
xTaskCreate(mp3_playback_task, "mp3_play", 4096, &g_ctx, 5, &g_ctx.playback_task_handle);
|
xTaskCreate(mp3_playback_task, "mp3_play", 6144, &g_ctx, 6, &g_ctx.playback_task_handle);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -424,11 +423,10 @@ static void onHideApp(AppHandle app, void* data) {
|
|||||||
vTaskDelay(pdMS_TO_TICKS(10));
|
vTaskDelay(pdMS_TO_TICKS(10));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Reset I2S to ensure DMA channel is stopped
|
// Close any open audio stream
|
||||||
if (g_ctx.i2s_dev) {
|
if (g_ctx.stream_handle != NULL) {
|
||||||
device_lock(g_ctx.i2s_dev);
|
audio_stream_close(g_ctx.stream_handle);
|
||||||
i2s_controller_reset(g_ctx.i2s_dev);
|
g_ctx.stream_handle = NULL;
|
||||||
device_unlock(g_ctx.i2s_dev);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
if (g_ctx.input_buf) {
|
if (g_ctx.input_buf) {
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
[manifest]
|
[manifest]
|
||||||
version=0.1
|
version=0.1
|
||||||
[target]
|
[target]
|
||||||
sdk=0.7.0-dev
|
sdk=0.8.0-dev
|
||||||
platforms=esp32s3
|
platforms=esp32s3
|
||||||
[app]
|
[app]
|
||||||
id=one.tactility.mp3player
|
id=one.tactility.mp3player
|
||||||
|
|||||||
@@ -1,16 +1,15 @@
|
|||||||
/**
|
/**
|
||||||
* Voice Recorder App for Tactility OS
|
* Voice Recorder App for Tactility OS
|
||||||
*
|
*
|
||||||
* Records voice memos (16kHz 16-bit Mono WAV format) to the SD card (/sdcard/memos/)
|
* Records voice memos (16kHz 16-bit Mono WAV) to /sdcard/memos/
|
||||||
* and plays them back.
|
* Uses audio-stream API with resampling (native codec 44100 -> app 16000)
|
||||||
*/
|
*/
|
||||||
|
|
||||||
#include <tt_app.h>
|
#include <tt_app.h>
|
||||||
#include <tt_lvgl.h>
|
#include <tt_lvgl.h>
|
||||||
#include <tt_lvgl_toolbar.h>
|
#include <tt_lvgl_toolbar.h>
|
||||||
|
|
||||||
#include <tactility/device.h>
|
#include <tactility/device.h>
|
||||||
#include <tactility/drivers/i2s_controller.h>
|
#include <tactility/drivers/audio_stream.h>
|
||||||
|
|
||||||
#include <string.h>
|
#include <string.h>
|
||||||
#include <stdlib.h>
|
#include <stdlib.h>
|
||||||
@@ -42,7 +41,9 @@ typedef enum {
|
|||||||
} AudioState;
|
} AudioState;
|
||||||
|
|
||||||
typedef struct {
|
typedef struct {
|
||||||
struct Device* i2s_dev;
|
struct Device* stream_dev;
|
||||||
|
AudioStreamHandle input_handle;
|
||||||
|
AudioStreamHandle output_handle;
|
||||||
uint8_t* audio_buf;
|
uint8_t* audio_buf;
|
||||||
AudioState state;
|
AudioState state;
|
||||||
int volume;
|
int volume;
|
||||||
@@ -65,19 +66,19 @@ typedef struct {
|
|||||||
} AppCtx;
|
} AppCtx;
|
||||||
|
|
||||||
typedef struct __attribute__((packed)) {
|
typedef struct __attribute__((packed)) {
|
||||||
char riff[4]; // "RIFF"
|
char riff[4];
|
||||||
uint32_t overall_size; // file size - 8
|
uint32_t overall_size;
|
||||||
char wave[4]; // "WAVE"
|
char wave[4];
|
||||||
char fmt_chunk_marker[4]; // "fmt "
|
char fmt_chunk_marker[4];
|
||||||
uint32_t length_of_fmt; // 16 for PCM
|
uint32_t length_of_fmt;
|
||||||
uint16_t format_type; // 1 for PCM
|
uint16_t format_type;
|
||||||
uint16_t channels; // 1 for mono
|
uint16_t channels;
|
||||||
uint32_t sample_rate; // 16000
|
uint32_t sample_rate;
|
||||||
uint32_t byterate; // sample_rate * channels * (bits_per_sample / 8)
|
uint32_t byterate;
|
||||||
uint16_t block_align; // channels * (bits_per_sample / 8)
|
uint16_t block_align;
|
||||||
uint16_t bits_per_sample; // 16
|
uint16_t bits_per_sample;
|
||||||
char data_chunk_header[4]; // "data"
|
char data_chunk_header[4];
|
||||||
uint32_t data_size; // data size in bytes
|
uint32_t data_size;
|
||||||
} WavHeader;
|
} WavHeader;
|
||||||
|
|
||||||
static AppCtx g_ctx;
|
static AppCtx g_ctx;
|
||||||
@@ -87,6 +88,20 @@ static void update_ui(AppCtx* ctx);
|
|||||||
static void refresh_memo_list(AppCtx* ctx);
|
static void refresh_memo_list(AppCtx* ctx);
|
||||||
static void on_memo_selected(lv_event_t* e);
|
static void on_memo_selected(lv_event_t* e);
|
||||||
|
|
||||||
|
static bool find_audio_stream_device(AppCtx* ctx) {
|
||||||
|
struct Device* dev = device_find_by_name("audio-stream");
|
||||||
|
if (dev) {
|
||||||
|
ctx->stream_dev = dev;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
dev = device_find_first_by_type(&AUDIO_STREAM_TYPE);
|
||||||
|
if (dev) {
|
||||||
|
ctx->stream_dev = dev;
|
||||||
|
return true;
|
||||||
|
}
|
||||||
|
return false;
|
||||||
|
}
|
||||||
|
|
||||||
/* ─── WAV Header Writer ─── */
|
/* ─── WAV Header Writer ─── */
|
||||||
static void write_wav_header(FILE* f, uint32_t sample_rate, uint16_t bits_per_sample, uint16_t channels, uint32_t data_size) {
|
static void write_wav_header(FILE* f, uint32_t sample_rate, uint16_t bits_per_sample, uint16_t channels, uint32_t data_size) {
|
||||||
WavHeader header;
|
WavHeader header;
|
||||||
@@ -114,10 +129,8 @@ static void get_next_memo_filename(char* out_filename, size_t max_len) {
|
|||||||
struct tm timeinfo;
|
struct tm timeinfo;
|
||||||
localtime_r(&rawtime, &timeinfo);
|
localtime_r(&rawtime, &timeinfo);
|
||||||
|
|
||||||
// Format: YYYYMMDD_HHMMSS (e.g., 20260629_232202)
|
|
||||||
strftime(datetime_buf, sizeof(datetime_buf), "%Y%m%d_%H%M%S", &timeinfo);
|
strftime(datetime_buf, sizeof(datetime_buf), "%Y%m%d_%H%M%S", &timeinfo);
|
||||||
|
|
||||||
// Default unique name candidate
|
|
||||||
snprintf(out_filename, max_len, "memo_%s.wav", datetime_buf);
|
snprintf(out_filename, max_len, "memo_%s.wav", datetime_buf);
|
||||||
|
|
||||||
char filepath[256];
|
char filepath[256];
|
||||||
@@ -125,24 +138,21 @@ static void get_next_memo_filename(char* out_filename, size_t max_len) {
|
|||||||
|
|
||||||
struct stat st;
|
struct stat st;
|
||||||
if (stat(filepath, &st) != 0) {
|
if (stat(filepath, &st) != 0) {
|
||||||
// File does not exist, safe to use
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// File exists, let's search for a unique name by appending _N
|
|
||||||
int suffix = 1;
|
int suffix = 1;
|
||||||
while (1) {
|
while (1) {
|
||||||
snprintf(out_filename, max_len, "memo_%s_%d.wav", datetime_buf, suffix);
|
snprintf(out_filename, max_len, "memo_%s_%d.wav", datetime_buf, suffix);
|
||||||
snprintf(filepath, sizeof(filepath), "/sdcard/memos/%s", out_filename);
|
snprintf(filepath, sizeof(filepath), "/sdcard/memos/%s", out_filename);
|
||||||
if (stat(filepath, &st) != 0) {
|
if (stat(filepath, &st) != 0) {
|
||||||
// Found a unique name!
|
|
||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
suffix++;
|
suffix++;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ─── Record Task ─── */
|
/* ─── Record Task (audio-stream input, resampled to 16k mono) ─── */
|
||||||
static void record_task(void* arg) {
|
static void record_task(void* arg) {
|
||||||
AppCtx* ctx = (AppCtx*)arg;
|
AppCtx* ctx = (AppCtx*)arg;
|
||||||
char filepath[256];
|
char filepath[256];
|
||||||
@@ -164,29 +174,18 @@ static void record_task(void* arg) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Write default header
|
|
||||||
write_wav_header(f, SAMPLE_RATE, BITS_PER_SAMPLE, 1, 0);
|
write_wav_header(f, SAMPLE_RATE, BITS_PER_SAMPLE, 1, 0);
|
||||||
|
|
||||||
/* Configure I2S for recording - RLCD fix: ES7210 outputs stereo (2 mics)
|
// Open input stream via audio-stream (resampler provides 16k mono regardless of codec native rate)
|
||||||
* even when we want mono file. Working MicroPython uses I2S.STEREO for RX
|
struct AudioStreamConfig in_cfg = {
|
||||||
* then extracts left channel. If we request MONO, driver uses MONO slot mode
|
|
||||||
* but ES7210 still sends 2 slots, causing channel mismatch / low pitch.
|
|
||||||
* So request STEREO from I2S and downmix to mono in the loop.
|
|
||||||
* See audio_util.py: i2s = I2S(..., format=I2S.STEREO, rate=16000) */
|
|
||||||
struct I2sConfig cfg = {
|
|
||||||
.communication_format = I2S_FORMAT_STAND_I2S,
|
|
||||||
.sample_rate = SAMPLE_RATE,
|
.sample_rate = SAMPLE_RATE,
|
||||||
.bits_per_sample = BITS_PER_SAMPLE,
|
.bits_per_sample = BITS_PER_SAMPLE,
|
||||||
.channel_left = 0,
|
.channels = 1
|
||||||
.channel_right = 1 // STEREO for ES7210 dual mic - we downmix to mono below
|
|
||||||
};
|
};
|
||||||
|
|
||||||
device_lock(ctx->i2s_dev);
|
error_t err = audio_stream_open_input(ctx->stream_dev, &in_cfg, &ctx->input_handle);
|
||||||
error_t err = i2s_controller_set_config(ctx->i2s_dev, &cfg);
|
|
||||||
device_unlock(ctx->i2s_dev);
|
|
||||||
|
|
||||||
if (err != ERROR_NONE) {
|
if (err != ERROR_NONE) {
|
||||||
ESP_LOGE(TAG, "Failed to set I2S config: %d", err);
|
ESP_LOGE(TAG, "audio_stream_open_input failed: %d", err);
|
||||||
fclose(f);
|
fclose(f);
|
||||||
unlink(filepath);
|
unlink(filepath);
|
||||||
tt_lvgl_lock(portMAX_DELAY);
|
tt_lvgl_lock(portMAX_DELAY);
|
||||||
@@ -199,68 +198,47 @@ static void record_task(void* arg) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
ESP_LOGI(TAG, "Recording started -> %s", filepath);
|
ESP_LOGI(TAG, "Recording started -> %s (via audio-stream %u Hz)", filepath, (unsigned)SAMPLE_RATE);
|
||||||
|
|
||||||
size_t total_written = 0;
|
size_t total_written = 0;
|
||||||
uint32_t start_time = xTaskGetTickCount();
|
uint32_t start_time = xTaskGetTickCount();
|
||||||
|
|
||||||
while (ctx->state == STATE_RECORDING) {
|
while (ctx->state == STATE_RECORDING) {
|
||||||
size_t bytes_read = 0;
|
size_t bytes_read = 0;
|
||||||
err = i2s_controller_read(ctx->i2s_dev, ctx->audio_buf, AUDIO_BUF_SIZE, &bytes_read, pdMS_TO_TICKS(100));
|
err = audio_stream_read(ctx->input_handle, ctx->audio_buf, AUDIO_BUF_SIZE, &bytes_read, pdMS_TO_TICKS(200));
|
||||||
if (err == ERROR_NONE && bytes_read > 0) {
|
if (err == ERROR_NONE && bytes_read > 0) {
|
||||||
// ES7210 stereo -> mono downmix: extract left channel (every other 16-bit sample)
|
// Data already 16k mono from audio-stream resampler, no downmix needed
|
||||||
// Working MP: for i in 0..bytes_read step 4: mono[j:j+2]=buffer[i:i+2]
|
size_t written = fwrite(ctx->audio_buf, 1, bytes_read, f);
|
||||||
// CHUNK_BYTES=1024 mono, but we read AUDIO_BUF_SIZE stereo (4096) then downmix to half
|
if (written != bytes_read) {
|
||||||
size_t mono_bytes = bytes_read / 2;
|
ESP_LOGE(TAG, "SD write error: wrote %d of %d", (int)written, (int)bytes_read);
|
||||||
// In-place downmix using separate temp? Use static tmp buffer via audio_buf + mono offset
|
|
||||||
// Easiest: convert in-place from end to start to avoid overwrite
|
|
||||||
// Stereo layout: L0 R0 L1 R1 ... each 2 bytes, total bytes_read
|
|
||||||
// We want L0 L1 L2 ... -> mono_bytes
|
|
||||||
// Do backward copy: dest index = mono_bytes-2, src left = bytes_read-4
|
|
||||||
// This avoids needing second buffer
|
|
||||||
for (int src = (int)bytes_read - 4, dst = (int)mono_bytes - 2; src >= 0 && dst >= 0; src -= 4, dst -= 2) {
|
|
||||||
ctx->audio_buf[dst] = ctx->audio_buf[src];
|
|
||||||
ctx->audio_buf[dst+1] = ctx->audio_buf[src+1];
|
|
||||||
}
|
|
||||||
size_t written = fwrite(ctx->audio_buf, 1, mono_bytes, f);
|
|
||||||
if (written != mono_bytes) {
|
|
||||||
ESP_LOGE(TAG, "SD write error: wrote %d of %d", (int)written, (int)mono_bytes);
|
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
total_written += written;
|
total_written += written;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Update elapsed time in UI
|
|
||||||
uint32_t elapsed_sec = (xTaskGetTickCount() - start_time) / configTICK_RATE_HZ;
|
uint32_t elapsed_sec = (xTaskGetTickCount() - start_time) / configTICK_RATE_HZ;
|
||||||
char status_buf[64];
|
char status_buf[64];
|
||||||
snprintf(status_buf, sizeof(status_buf), "🔴 Recording... %02u:%02u", (unsigned)(elapsed_sec / 60), (unsigned)(elapsed_sec % 60));
|
snprintf(status_buf, sizeof(status_buf), "🔴 Recording... %02u:%02u", (unsigned)(elapsed_sec / 60), (unsigned)(elapsed_sec % 60));
|
||||||
|
|
||||||
// Animate progress bar using modulo
|
|
||||||
int bar_val = (int)(((xTaskGetTickCount() - start_time) * 100) / (configTICK_RATE_HZ * 300)); // 5 min max
|
|
||||||
|
|
||||||
tt_lvgl_lock(portMAX_DELAY);
|
tt_lvgl_lock(portMAX_DELAY);
|
||||||
lv_label_set_text(ctx->lbl_status, status_buf);
|
lv_label_set_text(ctx->lbl_status, status_buf);
|
||||||
lv_bar_set_value(ctx->bar_progress, bar_val % 100, LV_ANIM_OFF);
|
lv_bar_set_value(ctx->bar_progress, (int)((elapsed_sec * 100 / 300)) % 100, LV_ANIM_OFF);
|
||||||
tt_lvgl_unlock();
|
tt_lvgl_unlock();
|
||||||
}
|
}
|
||||||
|
|
||||||
// Rewrite WAV header with actual recorded size
|
audio_stream_close(ctx->input_handle);
|
||||||
|
ctx->input_handle = NULL;
|
||||||
|
|
||||||
fseek(f, 0, SEEK_SET);
|
fseek(f, 0, SEEK_SET);
|
||||||
write_wav_header(f, SAMPLE_RATE, BITS_PER_SAMPLE, 1, total_written);
|
write_wav_header(f, SAMPLE_RATE, BITS_PER_SAMPLE, 1, total_written);
|
||||||
fclose(f);
|
fclose(f);
|
||||||
|
|
||||||
ESP_LOGI(TAG, "Recording finished: %u bytes", (unsigned)total_written);
|
ESP_LOGI(TAG, "Recording finished: %u bytes", (unsigned)total_written);
|
||||||
|
|
||||||
// Reset I2S controller to stop/release DMA channel
|
|
||||||
device_lock(ctx->i2s_dev);
|
|
||||||
i2s_controller_reset(ctx->i2s_dev);
|
|
||||||
device_unlock(ctx->i2s_dev);
|
|
||||||
|
|
||||||
tt_lvgl_lock(portMAX_DELAY);
|
tt_lvgl_lock(portMAX_DELAY);
|
||||||
ctx->state = STATE_IDLE;
|
ctx->state = STATE_IDLE;
|
||||||
refresh_memo_list(ctx);
|
refresh_memo_list(ctx);
|
||||||
|
|
||||||
// Select the new file automatically
|
|
||||||
ctx->selected_index = -1;
|
ctx->selected_index = -1;
|
||||||
for (int i = 0; i < ctx->memo_count; i++) {
|
for (int i = 0; i < ctx->memo_count; i++) {
|
||||||
if (strcmp(ctx->memos[i], filename) == 0) {
|
if (strcmp(ctx->memos[i], filename) == 0) {
|
||||||
@@ -268,7 +246,7 @@ static void record_task(void* arg) {
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
update_ui(ctx);
|
update_ui(ctx);
|
||||||
tt_lvgl_unlock();
|
tt_lvgl_unlock();
|
||||||
|
|
||||||
@@ -276,7 +254,7 @@ static void record_task(void* arg) {
|
|||||||
vTaskDelete(NULL);
|
vTaskDelete(NULL);
|
||||||
}
|
}
|
||||||
|
|
||||||
/* ─── Playback Task ─── */
|
/* ─── Playback Task (audio-stream output with resampling) ─── */
|
||||||
static void play_task(void* arg) {
|
static void play_task(void* arg) {
|
||||||
AppCtx* ctx = (AppCtx*)arg;
|
AppCtx* ctx = (AppCtx*)arg;
|
||||||
if (ctx->selected_index < 0 || ctx->selected_index >= ctx->memo_count) {
|
if (ctx->selected_index < 0 || ctx->selected_index >= ctx->memo_count) {
|
||||||
@@ -305,7 +283,6 @@ static void play_task(void* arg) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Read and parse WAV header
|
|
||||||
WavHeader header;
|
WavHeader header;
|
||||||
if (fread(&header, 1, sizeof(WavHeader), f) != sizeof(WavHeader)) {
|
if (fread(&header, 1, sizeof(WavHeader), f) != sizeof(WavHeader)) {
|
||||||
ESP_LOGE(TAG, "Failed to read WAV header");
|
ESP_LOGE(TAG, "Failed to read WAV header");
|
||||||
@@ -320,7 +297,6 @@ static void play_task(void* arg) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Verify file structure
|
|
||||||
if (memcmp(header.riff, "RIFF", 4) != 0 || memcmp(header.wave, "WAVE", 4) != 0) {
|
if (memcmp(header.riff, "RIFF", 4) != 0 || memcmp(header.wave, "WAVE", 4) != 0) {
|
||||||
ESP_LOGE(TAG, "Invalid WAV format");
|
ESP_LOGE(TAG, "Invalid WAV format");
|
||||||
fclose(f);
|
fclose(f);
|
||||||
@@ -334,21 +310,16 @@ static void play_task(void* arg) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
/* Configure I2S based on file metadata */
|
/* Open output stream via audio-stream (resampler converts file rate -> native 44100) */
|
||||||
struct I2sConfig cfg = {
|
struct AudioStreamConfig out_cfg = {
|
||||||
.communication_format = I2S_FORMAT_STAND_I2S,
|
|
||||||
.sample_rate = header.sample_rate,
|
.sample_rate = header.sample_rate,
|
||||||
.bits_per_sample = header.bits_per_sample,
|
.bits_per_sample = header.bits_per_sample,
|
||||||
.channel_left = 0,
|
.channels = header.channels
|
||||||
.channel_right = (header.channels == 2) ? 1 : I2S_CHANNEL_NONE
|
|
||||||
};
|
};
|
||||||
|
|
||||||
device_lock(ctx->i2s_dev);
|
error_t err = audio_stream_open_output(ctx->stream_dev, &out_cfg, &ctx->output_handle);
|
||||||
error_t err = i2s_controller_set_config(ctx->i2s_dev, &cfg);
|
|
||||||
device_unlock(ctx->i2s_dev);
|
|
||||||
|
|
||||||
if (err != ERROR_NONE) {
|
if (err != ERROR_NONE) {
|
||||||
ESP_LOGE(TAG, "Failed to set I2S config for playback: %d", err);
|
ESP_LOGE(TAG, "audio_stream_open_output failed for playback: %d (rate=%u)", err, (unsigned)header.sample_rate);
|
||||||
fclose(f);
|
fclose(f);
|
||||||
tt_lvgl_lock(portMAX_DELAY);
|
tt_lvgl_lock(portMAX_DELAY);
|
||||||
ctx->state = STATE_IDLE;
|
ctx->state = STATE_IDLE;
|
||||||
@@ -360,7 +331,7 @@ static void play_task(void* arg) {
|
|||||||
return;
|
return;
|
||||||
}
|
}
|
||||||
|
|
||||||
ESP_LOGI(TAG, "Playing: %s, rate=%u Hz, channels=%u, size=%u bytes",
|
ESP_LOGI(TAG, "Playing via audio-stream: %s, rate=%u Hz, ch=%u, size=%u",
|
||||||
filepath, (unsigned)header.sample_rate, header.channels, (unsigned)header.data_size);
|
filepath, (unsigned)header.sample_rate, header.channels, (unsigned)header.data_size);
|
||||||
|
|
||||||
size_t total_played = 0;
|
size_t total_played = 0;
|
||||||
@@ -371,40 +342,35 @@ static void play_task(void* arg) {
|
|||||||
fseek(f, sizeof(WavHeader), SEEK_SET);
|
fseek(f, sizeof(WavHeader), SEEK_SET);
|
||||||
}
|
}
|
||||||
|
|
||||||
bool i2s_configured = true;
|
bool out_open = true;
|
||||||
|
|
||||||
while (total_played < data_size && ctx->state != STATE_IDLE) {
|
while (total_played < data_size && ctx->state != STATE_IDLE) {
|
||||||
if (ctx->state == STATE_PAUSED) {
|
if (ctx->state == STATE_PAUSED) {
|
||||||
if (i2s_configured) {
|
if (out_open) {
|
||||||
// Reset I2S controller to stop DMA immediately when pausing
|
audio_stream_close(ctx->output_handle);
|
||||||
device_lock(ctx->i2s_dev);
|
ctx->output_handle = NULL;
|
||||||
i2s_controller_reset(ctx->i2s_dev);
|
out_open = false;
|
||||||
device_unlock(ctx->i2s_dev);
|
|
||||||
i2s_configured = false;
|
|
||||||
}
|
}
|
||||||
vTaskDelay(pdMS_TO_TICKS(50));
|
vTaskDelay(pdMS_TO_TICKS(50));
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (!i2s_configured) {
|
if (!out_open) {
|
||||||
// Reconfigure I2S when resuming
|
err = audio_stream_open_output(ctx->stream_dev, &out_cfg, &ctx->output_handle);
|
||||||
device_lock(ctx->i2s_dev);
|
|
||||||
err = i2s_controller_set_config(ctx->i2s_dev, &cfg);
|
|
||||||
device_unlock(ctx->i2s_dev);
|
|
||||||
if (err != ERROR_NONE) {
|
if (err != ERROR_NONE) {
|
||||||
ESP_LOGE(TAG, "Failed to reconfigure I2S on resume: %d", err);
|
ESP_LOGE(TAG, "Failed to reopen audio_stream on resume: %d", err);
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
i2s_configured = true;
|
out_open = true;
|
||||||
}
|
}
|
||||||
|
|
||||||
size_t to_read = (data_size - total_played < CHUNK_BYTES) ? (data_size - total_played) : CHUNK_BYTES;
|
size_t to_read = (data_size - total_played < CHUNK_BYTES) ? (data_size - total_played) : CHUNK_BYTES;
|
||||||
size_t read_bytes = fread(ctx->audio_buf, 1, to_read, f);
|
size_t read_bytes = fread(ctx->audio_buf, 1, to_read, f);
|
||||||
if (read_bytes == 0) {
|
if (read_bytes == 0) {
|
||||||
break; // EOF
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Scaling Volume
|
// Volume scaling
|
||||||
int vol = ctx->volume;
|
int vol = ctx->volume;
|
||||||
int16_t* samples_ptr = (int16_t*)ctx->audio_buf;
|
int16_t* samples_ptr = (int16_t*)ctx->audio_buf;
|
||||||
size_t sample_count = read_bytes / sizeof(int16_t);
|
size_t sample_count = read_bytes / sizeof(int16_t);
|
||||||
@@ -417,22 +383,19 @@ static void play_task(void* arg) {
|
|||||||
bool write_err = false;
|
bool write_err = false;
|
||||||
while (offset < read_bytes && ctx->state == STATE_PLAYING) {
|
while (offset < read_bytes && ctx->state == STATE_PLAYING) {
|
||||||
size_t written = 0;
|
size_t written = 0;
|
||||||
err = i2s_controller_write(ctx->i2s_dev, ctx->audio_buf + offset, read_bytes - offset, &written, pdMS_TO_TICKS(100));
|
err = audio_stream_write(ctx->output_handle, ctx->audio_buf + offset, read_bytes - offset, &written, pdMS_TO_TICKS(500));
|
||||||
if (err != ERROR_NONE || written == 0) {
|
if (err != ERROR_NONE || written == 0) {
|
||||||
ESP_LOGE(TAG, "I2S playback write error: %d", err);
|
ESP_LOGE(TAG, "audio_stream write error: %d", err);
|
||||||
write_err = true;
|
write_err = true;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
offset += written;
|
offset += written;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (write_err) {
|
if (write_err) break;
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
total_played += read_bytes;
|
total_played += read_bytes;
|
||||||
|
|
||||||
// UI progress update
|
|
||||||
int pct = (int)((total_played * 100) / data_size);
|
int pct = (int)((total_played * 100) / data_size);
|
||||||
uint32_t bytes_per_sec = header.sample_rate * header.channels * (header.bits_per_sample / 8);
|
uint32_t bytes_per_sec = header.sample_rate * header.channels * (header.bits_per_sample / 8);
|
||||||
uint32_t elapsed_sec = total_played / bytes_per_sec;
|
uint32_t elapsed_sec = total_played / bytes_per_sec;
|
||||||
@@ -452,10 +415,10 @@ static void play_task(void* arg) {
|
|||||||
fclose(f);
|
fclose(f);
|
||||||
ESP_LOGI(TAG, "Playback task complete");
|
ESP_LOGI(TAG, "Playback task complete");
|
||||||
|
|
||||||
// Reset I2S controller to stop/release DMA channel and prevent looping noise
|
if (out_open && ctx->output_handle) {
|
||||||
device_lock(ctx->i2s_dev);
|
audio_stream_close(ctx->output_handle);
|
||||||
i2s_controller_reset(ctx->i2s_dev);
|
ctx->output_handle = NULL;
|
||||||
device_unlock(ctx->i2s_dev);
|
}
|
||||||
|
|
||||||
tt_lvgl_lock(portMAX_DELAY);
|
tt_lvgl_lock(portMAX_DELAY);
|
||||||
ctx->state = STATE_IDLE;
|
ctx->state = STATE_IDLE;
|
||||||
@@ -470,12 +433,12 @@ static void play_task(void* arg) {
|
|||||||
static void on_record_click(lv_event_t* e) {
|
static void on_record_click(lv_event_t* e) {
|
||||||
AppCtx* ctx = (AppCtx*)lv_event_get_user_data(e);
|
AppCtx* ctx = (AppCtx*)lv_event_get_user_data(e);
|
||||||
if (ctx->state != STATE_IDLE) return;
|
if (ctx->state != STATE_IDLE) return;
|
||||||
if (ctx->i2s_dev == NULL) return;
|
if (ctx->stream_dev == NULL) return;
|
||||||
|
|
||||||
ctx->state = STATE_RECORDING;
|
ctx->state = STATE_RECORDING;
|
||||||
update_ui(ctx);
|
update_ui(ctx);
|
||||||
|
|
||||||
xTaskCreate(record_task, "voice_rec", 4096, ctx, 5, &ctx->task_handle);
|
xTaskCreate(record_task, "voice_rec", 8192, ctx, 5, &ctx->task_handle);
|
||||||
}
|
}
|
||||||
|
|
||||||
static void on_play_pause_click(lv_event_t* e) {
|
static void on_play_pause_click(lv_event_t* e) {
|
||||||
@@ -485,7 +448,7 @@ static void on_play_pause_click(lv_event_t* e) {
|
|||||||
if (ctx->state == STATE_IDLE) {
|
if (ctx->state == STATE_IDLE) {
|
||||||
ctx->state = STATE_PLAYING;
|
ctx->state = STATE_PLAYING;
|
||||||
update_ui(ctx);
|
update_ui(ctx);
|
||||||
xTaskCreate(play_task, "voice_play", 4096, ctx, 5, &ctx->task_handle);
|
xTaskCreate(play_task, "voice_play", 8192, ctx, 5, &ctx->task_handle);
|
||||||
} else if (ctx->state == STATE_PLAYING) {
|
} else if (ctx->state == STATE_PLAYING) {
|
||||||
ctx->state = STATE_PAUSED;
|
ctx->state = STATE_PAUSED;
|
||||||
update_ui(ctx);
|
update_ui(ctx);
|
||||||
@@ -523,14 +486,12 @@ static void on_memo_selected(lv_event_t* e) {
|
|||||||
AppCtx* ctx = (AppCtx*)lv_event_get_user_data(e);
|
AppCtx* ctx = (AppCtx*)lv_event_get_user_data(e);
|
||||||
lv_obj_t* btn = lv_event_get_target(e);
|
lv_obj_t* btn = lv_event_get_target(e);
|
||||||
|
|
||||||
// Clear check states from other entries
|
|
||||||
uint32_t child_cnt = lv_obj_get_child_cnt(ctx->lst_memos);
|
uint32_t child_cnt = lv_obj_get_child_cnt(ctx->lst_memos);
|
||||||
for (uint32_t i = 0; i < child_cnt; i++) {
|
for (uint32_t i = 0; i < child_cnt; i++) {
|
||||||
lv_obj_t* child = lv_obj_get_child(ctx->lst_memos, i);
|
lv_obj_t* child = lv_obj_get_child(ctx->lst_memos, i);
|
||||||
lv_obj_clear_state(child, LV_STATE_CHECKED);
|
lv_obj_clear_state(child, LV_STATE_CHECKED);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Apply check state to the clicked memo
|
|
||||||
lv_obj_add_state(btn, LV_STATE_CHECKED);
|
lv_obj_add_state(btn, LV_STATE_CHECKED);
|
||||||
|
|
||||||
const char* text = lv_list_get_btn_text(ctx->lst_memos, btn);
|
const char* text = lv_list_get_btn_text(ctx->lst_memos, btn);
|
||||||
@@ -568,7 +529,6 @@ static void refresh_memo_list(AppCtx* ctx) {
|
|||||||
}
|
}
|
||||||
closedir(dir);
|
closedir(dir);
|
||||||
|
|
||||||
// Simple bubble sort
|
|
||||||
for (int i = 0; i < ctx->memo_count - 1; i++) {
|
for (int i = 0; i < ctx->memo_count - 1; i++) {
|
||||||
for (int j = 0; j < ctx->memo_count - i - 1; j++) {
|
for (int j = 0; j < ctx->memo_count - i - 1; j++) {
|
||||||
if (strcmp(ctx->memos[j], ctx->memos[j + 1]) > 0) {
|
if (strcmp(ctx->memos[j], ctx->memos[j + 1]) > 0) {
|
||||||
@@ -580,7 +540,6 @@ static void refresh_memo_list(AppCtx* ctx) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Populate UI List
|
|
||||||
for (int i = 0; i < ctx->memo_count; i++) {
|
for (int i = 0; i < ctx->memo_count; i++) {
|
||||||
lv_obj_t* btn = lv_list_add_btn(ctx->lst_memos, LV_SYMBOL_AUDIO, ctx->memos[i]);
|
lv_obj_t* btn = lv_list_add_btn(ctx->lst_memos, LV_SYMBOL_AUDIO, ctx->memos[i]);
|
||||||
lv_obj_add_event_cb(btn, on_memo_selected, LV_EVENT_CLICKED, ctx);
|
lv_obj_add_event_cb(btn, on_memo_selected, LV_EVENT_CLICKED, ctx);
|
||||||
@@ -624,7 +583,7 @@ static void update_ui(AppCtx* ctx) {
|
|||||||
if (ctx->selected_index >= 0 && ctx->selected_index < ctx->memo_count) {
|
if (ctx->selected_index >= 0 && ctx->selected_index < ctx->memo_count) {
|
||||||
lv_obj_clear_state(ctx->btn_play_pause, LV_STATE_DISABLED);
|
lv_obj_clear_state(ctx->btn_play_pause, LV_STATE_DISABLED);
|
||||||
lv_obj_clear_state(ctx->btn_delete, LV_STATE_DISABLED);
|
lv_obj_clear_state(ctx->btn_delete, LV_STATE_DISABLED);
|
||||||
|
|
||||||
char status_buf[128];
|
char status_buf[128];
|
||||||
snprintf(status_buf, sizeof(status_buf), "Selected: %s", ctx->memos[ctx->selected_index]);
|
snprintf(status_buf, sizeof(status_buf), "Selected: %s", ctx->memos[ctx->selected_index]);
|
||||||
lv_label_set_text(ctx->lbl_status, status_buf);
|
lv_label_set_text(ctx->lbl_status, status_buf);
|
||||||
@@ -647,115 +606,100 @@ static void onShowApp(AppHandle app, void* data, lv_obj_t* parent) {
|
|||||||
g_ctx.volume = 80;
|
g_ctx.volume = 80;
|
||||||
g_ctx.selected_index = -1;
|
g_ctx.selected_index = -1;
|
||||||
|
|
||||||
// Create the memos storage directory if missing
|
|
||||||
mkdir("/sdcard/memos", 0755);
|
mkdir("/sdcard/memos", 0755);
|
||||||
|
|
||||||
// Allocate audio buffer
|
|
||||||
g_ctx.audio_buf = (uint8_t*)malloc(AUDIO_BUF_SIZE);
|
g_ctx.audio_buf = (uint8_t*)malloc(AUDIO_BUF_SIZE);
|
||||||
if (g_ctx.audio_buf == NULL) {
|
if (g_ctx.audio_buf == NULL) {
|
||||||
ESP_LOGE(TAG, "Failed to allocate audio buffer");
|
ESP_LOGE(TAG, "Failed to allocate audio buffer");
|
||||||
}
|
}
|
||||||
|
|
||||||
// Locate I2S hardware channel
|
if (!find_audio_stream_device(&g_ctx)) {
|
||||||
g_ctx.i2s_dev = device_find_by_name("i2s0");
|
ESP_LOGE(TAG, "audio-stream device not found!");
|
||||||
if (g_ctx.i2s_dev == NULL) {
|
|
||||||
ESP_LOGE(TAG, "I2S device 'i2s0' not found!");
|
|
||||||
}
|
}
|
||||||
|
|
||||||
// ─── UI Setup ───
|
|
||||||
lv_obj_t* toolbar = tt_lvgl_toolbar_create_for_app(parent, app);
|
lv_obj_t* toolbar = tt_lvgl_toolbar_create_for_app(parent, app);
|
||||||
lv_obj_align(toolbar, LV_ALIGN_TOP_MID, 0, 0);
|
lv_obj_align(toolbar, LV_ALIGN_TOP_MID, 0, 0);
|
||||||
|
|
||||||
// Premium Player Card
|
|
||||||
lv_obj_t* card = lv_obj_create(parent);
|
lv_obj_t* card = lv_obj_create(parent);
|
||||||
lv_obj_set_size(card, lv_pct(95), lv_pct(88));
|
lv_obj_set_size(card, lv_pct(95), lv_pct(88));
|
||||||
lv_obj_align(card, LV_ALIGN_CENTER, 0, 12);
|
lv_obj_align(card, LV_ALIGN_CENTER, 0, 12);
|
||||||
lv_obj_set_style_radius(card, 15, 0);
|
lv_obj_set_style_radius(card, 15, 0);
|
||||||
lv_obj_set_style_bg_color(card, lv_color_hex(0x1E1E2E), 0); // mocha base
|
lv_obj_set_style_bg_color(card, lv_color_hex(0x1E1E2E), 0);
|
||||||
lv_obj_set_style_border_color(card, lv_color_hex(0x313244), 0); // mocha surface0
|
lv_obj_set_style_border_color(card, lv_color_hex(0x313244), 0);
|
||||||
lv_obj_set_style_border_width(card, 2, 0);
|
lv_obj_set_style_border_width(card, 2, 0);
|
||||||
lv_obj_set_flex_flow(card, LV_FLEX_FLOW_COLUMN);
|
lv_obj_set_flex_flow(card, LV_FLEX_FLOW_COLUMN);
|
||||||
lv_obj_set_flex_align(card, LV_FLEX_ALIGN_START, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_CENTER);
|
lv_obj_set_flex_align(card, LV_FLEX_ALIGN_START, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_CENTER);
|
||||||
lv_obj_set_style_pad_all(card, 10, 0);
|
lv_obj_set_style_pad_all(card, 10, 0);
|
||||||
lv_obj_set_style_pad_gap(card, 8, 0);
|
lv_obj_set_style_pad_gap(card, 8, 0);
|
||||||
|
|
||||||
// Status Area
|
|
||||||
g_ctx.lbl_status = lv_label_create(card);
|
g_ctx.lbl_status = lv_label_create(card);
|
||||||
lv_obj_set_width(g_ctx.lbl_status, lv_pct(95));
|
lv_obj_set_width(g_ctx.lbl_status, lv_pct(95));
|
||||||
lv_obj_set_style_text_align(g_ctx.lbl_status, LV_TEXT_ALIGN_CENTER, 0);
|
lv_obj_set_style_text_align(g_ctx.lbl_status, LV_TEXT_ALIGN_CENTER, 0);
|
||||||
lv_obj_set_style_text_color(g_ctx.lbl_status, lv_color_hex(0xCDD6F4), 0); // mocha text
|
lv_obj_set_style_text_color(g_ctx.lbl_status, lv_color_hex(0xCDD6F4), 0);
|
||||||
lv_label_set_text(g_ctx.lbl_status, "Scanning memos...");
|
lv_label_set_text(g_ctx.lbl_status, "Scanning memos...");
|
||||||
|
|
||||||
// Progress Bar
|
|
||||||
g_ctx.bar_progress = lv_bar_create(card);
|
g_ctx.bar_progress = lv_bar_create(card);
|
||||||
lv_obj_set_size(g_ctx.bar_progress, lv_pct(90), 8);
|
lv_obj_set_size(g_ctx.bar_progress, lv_pct(90), 8);
|
||||||
lv_bar_set_range(g_ctx.bar_progress, 0, 100);
|
lv_bar_set_range(g_ctx.bar_progress, 0, 100);
|
||||||
lv_bar_set_value(g_ctx.bar_progress, 0, LV_ANIM_OFF);
|
lv_bar_set_value(g_ctx.bar_progress, 0, LV_ANIM_OFF);
|
||||||
lv_obj_set_style_bg_color(g_ctx.bar_progress, lv_color_hex(0x45475A), LV_PART_MAIN); // mocha surface1
|
lv_obj_set_style_bg_color(g_ctx.bar_progress, lv_color_hex(0x45475A), LV_PART_MAIN);
|
||||||
lv_obj_set_style_bg_color(g_ctx.bar_progress, lv_color_hex(0x89B4FA), LV_PART_INDICATOR); // mocha blue
|
lv_obj_set_style_bg_color(g_ctx.bar_progress, lv_color_hex(0x89B4FA), LV_PART_INDICATOR);
|
||||||
|
|
||||||
// Memos List
|
|
||||||
g_ctx.lst_memos = lv_list_create(card);
|
g_ctx.lst_memos = lv_list_create(card);
|
||||||
lv_obj_set_size(g_ctx.lst_memos, lv_pct(95), 85);
|
lv_obj_set_size(g_ctx.lst_memos, lv_pct(95), 85);
|
||||||
lv_obj_set_style_bg_color(g_ctx.lst_memos, lv_color_hex(0x181825), 0); // mocha mantle
|
lv_obj_set_style_bg_color(g_ctx.lst_memos, lv_color_hex(0x181825), 0);
|
||||||
lv_obj_set_style_border_color(g_ctx.lst_memos, lv_color_hex(0x313244), 0);
|
lv_obj_set_style_border_color(g_ctx.lst_memos, lv_color_hex(0x313244), 0);
|
||||||
lv_obj_set_style_border_width(g_ctx.lst_memos, 1, 0);
|
lv_obj_set_style_border_width(g_ctx.lst_memos, 1, 0);
|
||||||
lv_obj_set_style_radius(g_ctx.lst_memos, 8, 0);
|
lv_obj_set_style_radius(g_ctx.lst_memos, 8, 0);
|
||||||
|
|
||||||
// Controls Box
|
|
||||||
lv_obj_t* ctrl_box = lv_obj_create(card);
|
lv_obj_t* ctrl_box = lv_obj_create(card);
|
||||||
lv_obj_remove_style_all(ctrl_box);
|
lv_obj_remove_style_all(ctrl_box);
|
||||||
lv_obj_set_size(ctrl_box, lv_pct(95), 40);
|
lv_obj_set_size(ctrl_box, lv_pct(95), 40);
|
||||||
lv_obj_set_flex_flow(ctrl_box, LV_FLEX_FLOW_ROW);
|
lv_obj_set_flex_flow(ctrl_box, LV_FLEX_FLOW_ROW);
|
||||||
lv_obj_set_flex_align(ctrl_box, LV_FLEX_ALIGN_SPACE_EVENLY, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_CENTER);
|
lv_obj_set_flex_align(ctrl_box, LV_FLEX_ALIGN_SPACE_EVENLY, LV_FLEX_ALIGN_CENTER, LV_FLEX_ALIGN_CENTER);
|
||||||
|
|
||||||
// Rec Button
|
|
||||||
g_ctx.btn_record = lv_btn_create(ctrl_box);
|
g_ctx.btn_record = lv_btn_create(ctrl_box);
|
||||||
lv_obj_set_size(g_ctx.btn_record, 45, 32);
|
lv_obj_set_size(g_ctx.btn_record, 45, 32);
|
||||||
lv_obj_set_style_radius(g_ctx.btn_record, 8, 0);
|
lv_obj_set_style_radius(g_ctx.btn_record, 8, 0);
|
||||||
lv_obj_set_style_bg_color(g_ctx.btn_record, lv_color_hex(0xF38BA8), 0); // mocha red
|
lv_obj_set_style_bg_color(g_ctx.btn_record, lv_color_hex(0xF38BA8), 0);
|
||||||
lv_obj_set_style_text_color(g_ctx.btn_record, lv_color_hex(0x11111B), 0);
|
lv_obj_set_style_text_color(g_ctx.btn_record, lv_color_hex(0x11111B), 0);
|
||||||
lv_obj_t* lbl_rec = lv_label_create(g_ctx.btn_record);
|
lv_obj_t* lbl_rec = lv_label_create(g_ctx.btn_record);
|
||||||
lv_label_set_text(lbl_rec, LV_SYMBOL_AUDIO);
|
lv_label_set_text(lbl_rec, LV_SYMBOL_AUDIO);
|
||||||
lv_obj_center(lbl_rec);
|
lv_obj_center(lbl_rec);
|
||||||
lv_obj_add_event_cb(g_ctx.btn_record, on_record_click, LV_EVENT_CLICKED, &g_ctx);
|
lv_obj_add_event_cb(g_ctx.btn_record, on_record_click, LV_EVENT_CLICKED, &g_ctx);
|
||||||
|
|
||||||
// Play/Pause Button
|
|
||||||
g_ctx.btn_play_pause = lv_btn_create(ctrl_box);
|
g_ctx.btn_play_pause = lv_btn_create(ctrl_box);
|
||||||
lv_obj_set_size(g_ctx.btn_play_pause, 45, 32);
|
lv_obj_set_size(g_ctx.btn_play_pause, 45, 32);
|
||||||
lv_obj_set_style_radius(g_ctx.btn_play_pause, 8, 0);
|
lv_obj_set_style_radius(g_ctx.btn_play_pause, 8, 0);
|
||||||
lv_obj_set_style_bg_color(g_ctx.btn_play_pause, lv_color_hex(0x89B4FA), 0); // mocha blue
|
lv_obj_set_style_bg_color(g_ctx.btn_play_pause, lv_color_hex(0x89B4FA), 0);
|
||||||
lv_obj_set_style_text_color(g_ctx.btn_play_pause, lv_color_hex(0x11111B), 0);
|
lv_obj_set_style_text_color(g_ctx.btn_play_pause, lv_color_hex(0x11111B), 0);
|
||||||
lv_obj_t* lbl_play = lv_label_create(g_ctx.btn_play_pause);
|
lv_obj_t* lbl_play = lv_label_create(g_ctx.btn_play_pause);
|
||||||
lv_label_set_text(lbl_play, LV_SYMBOL_PLAY);
|
lv_label_set_text(lbl_play, LV_SYMBOL_PLAY);
|
||||||
lv_obj_center(lbl_play);
|
lv_obj_center(lbl_play);
|
||||||
lv_obj_add_event_cb(g_ctx.btn_play_pause, on_play_pause_click, LV_EVENT_CLICKED, &g_ctx);
|
lv_obj_add_event_cb(g_ctx.btn_play_pause, on_play_pause_click, LV_EVENT_CLICKED, &g_ctx);
|
||||||
|
|
||||||
// Stop Button
|
|
||||||
g_ctx.btn_stop = lv_btn_create(ctrl_box);
|
g_ctx.btn_stop = lv_btn_create(ctrl_box);
|
||||||
lv_obj_set_size(g_ctx.btn_stop, 45, 32);
|
lv_obj_set_size(g_ctx.btn_stop, 45, 32);
|
||||||
lv_obj_set_style_radius(g_ctx.btn_stop, 8, 0);
|
lv_obj_set_style_radius(g_ctx.btn_stop, 8, 0);
|
||||||
lv_obj_set_style_bg_color(g_ctx.btn_stop, lv_color_hex(0xBAC2DE), 0); // mocha subtext1
|
lv_obj_set_style_bg_color(g_ctx.btn_stop, lv_color_hex(0xBAC2DE), 0);
|
||||||
lv_obj_set_style_text_color(g_ctx.btn_stop, lv_color_hex(0x11111B), 0);
|
lv_obj_set_style_text_color(g_ctx.btn_stop, lv_color_hex(0x11111B), 0);
|
||||||
lv_obj_t* lbl_stop = lv_label_create(g_ctx.btn_stop);
|
lv_obj_t* lbl_stop = lv_label_create(g_ctx.btn_stop);
|
||||||
lv_label_set_text(lbl_stop, LV_SYMBOL_STOP);
|
lv_label_set_text(lbl_stop, LV_SYMBOL_STOP);
|
||||||
lv_obj_center(lbl_stop);
|
lv_obj_center(lbl_stop);
|
||||||
lv_obj_add_event_cb(g_ctx.btn_stop, on_stop_click, LV_EVENT_CLICKED, &g_ctx);
|
lv_obj_add_event_cb(g_ctx.btn_stop, on_stop_click, LV_EVENT_CLICKED, &g_ctx);
|
||||||
|
|
||||||
// Delete Button
|
|
||||||
g_ctx.btn_delete = lv_btn_create(ctrl_box);
|
g_ctx.btn_delete = lv_btn_create(ctrl_box);
|
||||||
lv_obj_set_size(g_ctx.btn_delete, 45, 32);
|
lv_obj_set_size(g_ctx.btn_delete, 45, 32);
|
||||||
lv_obj_set_style_radius(g_ctx.btn_delete, 8, 0);
|
lv_obj_set_style_radius(g_ctx.btn_delete, 8, 0);
|
||||||
lv_obj_set_style_bg_color(g_ctx.btn_delete, lv_color_hex(0x74C7EC), 0); // mocha sapphire
|
lv_obj_set_style_bg_color(g_ctx.btn_delete, lv_color_hex(0x74C7EC), 0);
|
||||||
lv_obj_set_style_text_color(g_ctx.btn_delete, lv_color_hex(0x11111B), 0);
|
lv_obj_set_style_text_color(g_ctx.btn_delete, lv_color_hex(0x11111B), 0);
|
||||||
lv_obj_t* lbl_del = lv_label_create(g_ctx.btn_delete);
|
lv_obj_t* lbl_del = lv_label_create(g_ctx.btn_delete);
|
||||||
lv_label_set_text(lbl_del, LV_SYMBOL_TRASH);
|
lv_label_set_text(lbl_del, LV_SYMBOL_TRASH);
|
||||||
lv_obj_center(lbl_del);
|
lv_obj_center(lbl_del);
|
||||||
lv_obj_add_event_cb(g_ctx.btn_delete, on_delete_click, LV_EVENT_CLICKED, &g_ctx);
|
lv_obj_add_event_cb(g_ctx.btn_delete, on_delete_click, LV_EVENT_CLICKED, &g_ctx);
|
||||||
|
|
||||||
// Initialize list and control state
|
if (g_ctx.stream_dev == NULL) {
|
||||||
if (g_ctx.i2s_dev == NULL) {
|
lv_label_set_text(g_ctx.lbl_status, "ERROR: audio-stream missing");
|
||||||
lv_label_set_text(g_ctx.lbl_status, "ERROR: I2S 'i2s0' missing");
|
|
||||||
lv_obj_add_state(g_ctx.btn_record, LV_STATE_DISABLED);
|
lv_obj_add_state(g_ctx.btn_record, LV_STATE_DISABLED);
|
||||||
lv_obj_add_state(g_ctx.btn_play_pause, LV_STATE_DISABLED);
|
lv_obj_add_state(g_ctx.btn_play_pause, LV_STATE_DISABLED);
|
||||||
lv_obj_add_state(g_ctx.btn_stop, LV_STATE_DISABLED);
|
lv_obj_add_state(g_ctx.btn_stop, LV_STATE_DISABLED);
|
||||||
@@ -778,16 +722,17 @@ static void onHideApp(AppHandle app, void* data) {
|
|||||||
g_ctx.state = STATE_IDLE;
|
g_ctx.state = STATE_IDLE;
|
||||||
}
|
}
|
||||||
|
|
||||||
// Wait for task completion
|
|
||||||
while (g_ctx.task_handle != NULL) {
|
while (g_ctx.task_handle != NULL) {
|
||||||
vTaskDelay(pdMS_TO_TICKS(10));
|
vTaskDelay(pdMS_TO_TICKS(10));
|
||||||
}
|
}
|
||||||
|
|
||||||
// Reset I2S to ensure DMA channel is stopped
|
if (g_ctx.input_handle) {
|
||||||
if (g_ctx.i2s_dev != NULL) {
|
audio_stream_close(g_ctx.input_handle);
|
||||||
device_lock(g_ctx.i2s_dev);
|
g_ctx.input_handle = NULL;
|
||||||
i2s_controller_reset(g_ctx.i2s_dev);
|
}
|
||||||
device_unlock(g_ctx.i2s_dev);
|
if (g_ctx.output_handle) {
|
||||||
|
audio_stream_close(g_ctx.output_handle);
|
||||||
|
g_ctx.output_handle = NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (g_ctx.audio_buf != NULL) {
|
if (g_ctx.audio_buf != NULL) {
|
||||||
|
|||||||
Reference in New Issue
Block a user