Skip to content

feat(mic): add runtime-configurable microphone pins to brucePins.conf #2319

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
pfefferle wants to merge 1 commit into
base: dev
Choose a base branch
from
Draft

feat(mic): add runtime-configurable microphone pins to brucePins.conf #2319

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 25 additions & 0 deletions src/core/configPins.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,19 @@ void BruceConfigPins::fromJson(JsonObject obj) {
log_e("Fail");
}

if (!root["micClk"].isNull()) {
micClk = root["micClk"].as<int>();
} else {
count++;
log_e("Fail");
}
if (!root["micData"].isNull()) {
micData = root["micData"].as<int>();
} else {
count++;
log_e("Fail");
}

if (!root["CC1101_Pins"].isNull()) {
SPIPins def = CC1101_bus;
CC1101_bus.fromJson(root["CC1101_Pins"].as<JsonObject>());
Expand Down Expand Up @@ -213,6 +226,8 @@ void BruceConfigPins::toJson(JsonObject obj) const {
root["rfidModule"] = rfidModule;
root["gpsBaudrate"] = gpsBaudrate;
root["iButton"] = iButton;
root["micClk"] = micClk;
root["micData"] = micData;

JsonObject _CC1101 = root["CC1101_Pins"].to<JsonObject>();
CC1101_bus.toJson(_CC1101);
Expand Down Expand Up @@ -505,6 +520,16 @@ void BruceConfigPins::setiButtonPin(int value) {
saveFile();
} else log_e("iButton: Gpio pin not set, incompatible with this device\n");
}
void BruceConfigPins::setMicClkPin(int value) {
micClk = value;
saveFile();
}

void BruceConfigPins::setMicDataPin(int value) {
micData = value;
saveFile();
}

void BruceConfigPins::setGpsBaudrate(int value) {
gpsBaudrate = value;
validateGpsBaudrateValue();
Expand Down
8 changes: 8 additions & 0 deletions src/core/configPins.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,10 @@ class BruceConfigPins {
// RFID
int rfidModule = M5_RFID2_MODULE;

// Microphone
int micClk = PIN_CLK;
int micData = PIN_DATA;

// GPS
int gpsBaudrate = 9600;

Expand Down Expand Up @@ -258,6 +262,10 @@ class BruceConfigPins {
// iButton
void setiButtonPin(int value);

// Microphone
void setMicClkPin(int value);
void setMicDataPin(int value);

// RFID
void setRfidModule(RFIDModules value);
void validateRfidModuleValue();
Expand Down
1 change: 1 addition & 0 deletions src/core/menu_items/ConfigMenu.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,6 +271,7 @@ void ConfigMenu::devMenu() {
{"I2C Pins", [this]() { setI2CPinsMenu(bruceConfigPins.i2c_bus); } },
{"UART Pins", [this]() { setUARTPinsMenu(bruceConfigPins.uart_bus); } },
{"GPS Pins", [this]() { setUARTPinsMenu(bruceConfigPins.gps_bus); } },
{"Mic Pins", [this]() { setMicPinsMenu(); } },
{"Serial USB", [this]() { switchToUSBSerial(); } },
{"Serial UART", [this]() { switchToUARTSerial(); } },
{"Disable DevMode", [this]() { bruceConfig.setDevMode(false); } },
Expand Down
44 changes: 44 additions & 0 deletions src/core/settings.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1585,6 +1585,50 @@ void setI2CPinsMenu(BruceConfigPins::I2CPins &value) {
}
}

/*********************************************************************
** Function: setMicPinsMenu
** Menu to change Microphone I2S pins (CLK + DATA)
**********************************************************************/
void setMicPinsMenu() {
uint8_t opt = 0;
bool changed = false;
int clk = bruceConfigPins.micClk;
int data = bruceConfigPins.micData;

RELOAD_MIC:
options = {
{String("CLK = " + String(clk)).c_str(), [&]() { opt = 1; }},
{String("DATA = " + String(data)).c_str(), [&]() { opt = 2; }},
{"Save Config", [&]() { opt = 7; }, changed},
{"Main Menu", [&]() { opt = 0; }},
};

loopOptions(options);
if (opt == 0) return;
else if (opt == 7) {
if (changed) {
bruceConfigPins.setMicClkPin(clk);
bruceConfigPins.setMicDataPin(data);
}
} else {
options = {};
int sel = -1;
int index = 0;
if (opt == 1) index = clk + 1;
else if (opt == 2) index = data + 1;
for (int8_t i = -1; i <= GPIO_NUM_MAX; i++) {
String tmp = String(i);
options.push_back({tmp.c_str(), [i, &sel]() { sel = i; }});
}
loopOptions(options, index);
options.clear();
if (opt == 1) clk = sel;
else if (opt == 2) data = sel;
changed = true;
goto RELOAD_MIC;
}
}

/*********************************************************************
** Function: setTheme
** Menu to change Theme
Expand Down
2 changes: 2 additions & 0 deletions src/core/settings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@ void setUARTPinsMenu(BruceConfigPins::UARTPins &value);

void setI2CPinsMenu(BruceConfigPins::I2CPins &value);

void setMicPinsMenu();

void setTheme();

void setMacAddressMenu();
Expand Down
29 changes: 17 additions & 12 deletions src/modules/others/mic.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -134,6 +134,11 @@ bool deinitMicroPhone() {
bool InitI2SMicroPhone() {
// Enable codec, if exists
_setup_codec_mic(true);

// Use runtime-configurable pins from brucePins.conf
int mic_clk = bruceConfigPins.micClk;
int mic_data = bruceConfigPins.micData;

i2s_chan_config_t chan_cfg = I2S_CHANNEL_DEFAULT_CONFIG(I2S_NUM_0, I2S_ROLE_MASTER);
chan_cfg.dma_desc_num = 8;
chan_cfg.dma_frame_num = SPECTRUM_HEIGHT;
Expand All @@ -147,18 +152,18 @@ bool InitI2SMicroPhone() {
.slot_cfg = slot_cfg,
.gpio_cfg = {
.mclk = I2S_GPIO_UNUSED,
.bclk = (gpio_num_t)PIN_CLK,
.bclk = (gpio_num_t)mic_clk,
.ws = (gpio_num_t)PIN_WS,
.dout = I2S_GPIO_UNUSED,
.din = (gpio_num_t)PIN_DATA,
.din = (gpio_num_t)mic_data,
.invert_flags = {.mclk_inv = false, .bclk_inv = false, .ws_inv = false},
},
};
if (err == ESP_OK) err = i2s_channel_init_std_mode(i2s_chan, &std_cfg);
#else

if (mic_bclk_pin != I2S_PIN_NO_CHANGE) {
gpio_num_t mic_ws_pin = (gpio_num_t)PIN_CLK;
gpio_num_t mic_ws_pin = (gpio_num_t)mic_clk;
i2s_std_config_t i2s_config;
memset(&i2s_config, 0, sizeof(i2s_std_config_t));
#if defined(CONFIG_IDF_TARGET_ESP32P4)
Expand All @@ -185,7 +190,7 @@ bool InitI2SMicroPhone() {
i2s_config.gpio_cfg.ws = (gpio_num_t)mic_ws_pin;
i2s_config.gpio_cfg.dout = (gpio_num_t)I2S_PIN_NO_CHANGE;
i2s_config.gpio_cfg.mclk = (gpio_num_t)I2S_PIN_NO_CHANGE;
i2s_config.gpio_cfg.din = (gpio_num_t)PIN_DATA;
i2s_config.gpio_cfg.din = (gpio_num_t)mic_data;
err = i2s_channel_init_std_mode(i2s_chan, &i2s_config);
} else {

Expand All @@ -197,8 +202,8 @@ bool InitI2SMicroPhone() {
.clk_cfg = clk_cfg,
.slot_cfg = slot_cfg,
.gpio_cfg = {
.clk = (gpio_num_t)PIN_CLK,
.din = (gpio_num_t)PIN_DATA,
.clk = (gpio_num_t)mic_clk,
.din = (gpio_num_t)mic_data,
.invert_flags = {.clk_inv = false},
},
};
Expand Down Expand Up @@ -1006,18 +1011,18 @@ bool mic_capture_samples(
.slot_cfg = slot_cfg,
.gpio_cfg = {
.mclk = I2S_GPIO_UNUSED,
.bclk = (gpio_num_t)PIN_CLK,
.bclk = (gpio_num_t)bruceConfigPins.micClk,
.ws = (gpio_num_t)PIN_WS,
.dout = I2S_GPIO_UNUSED,
.din = (gpio_num_t)PIN_DATA,
.din = (gpio_num_t)bruceConfigPins.micData,
.invert_flags = {.mclk_inv = false, .bclk_inv = false, .ws_inv = false},
},
};
err = i2s_channel_init_std_mode(temp_i2s_chan, &std_cfg);
#else
if (mic_bclk_pin != I2S_PIN_NO_CHANGE) {
// Standard I2S mode
gpio_num_t mic_ws_pin = (gpio_num_t)PIN_CLK;
gpio_num_t mic_ws_pin = (gpio_num_t)bruceConfigPins.micClk;
i2s_std_config_t i2s_config;
memset(&i2s_config, 0, sizeof(i2s_std_config_t));
#if defined(CONFIG_IDF_TARGET_ESP32P4)
Expand All @@ -1044,7 +1049,7 @@ bool mic_capture_samples(
i2s_config.gpio_cfg.ws = (gpio_num_t)mic_ws_pin;
i2s_config.gpio_cfg.dout = (gpio_num_t)I2S_PIN_NO_CHANGE;
i2s_config.gpio_cfg.mclk = (gpio_num_t)I2S_PIN_NO_CHANGE;
i2s_config.gpio_cfg.din = (gpio_num_t)PIN_DATA;
i2s_config.gpio_cfg.din = (gpio_num_t)bruceConfigPins.micData;
err = i2s_channel_init_std_mode(temp_i2s_chan, &i2s_config);
} else {
// PDM mode
Expand All @@ -1057,8 +1062,8 @@ bool mic_capture_samples(
.clk_cfg = clk_cfg,
.slot_cfg = slot_cfg,
.gpio_cfg = {
.clk = (gpio_num_t)PIN_CLK,
.din = (gpio_num_t)PIN_DATA,
.clk = (gpio_num_t)bruceConfigPins.micClk,
.din = (gpio_num_t)bruceConfigPins.micData,
.invert_flags = {.clk_inv = false},
},
};
Expand Down