Skip to content

A Hardware Hacking Tool with Web-Based CLI That Speaks Every Protocol

correct samplerate for i2S play cmd

Geo4063901641cd
diff --git a/src/Controllers/I2sController.cpp b/src/Controllers/I2sController.cpp
index c21f3ca1..731cc788 100644
--- a/src/Controllers/I2sController.cpp
+++ b/src/Controllers/I2sController.cpp
@@ -44,7 +44,7 @@ void I2sController::handlePlay(const TerminalCommand& cmd) {
// Lecture infinie
terminalView.println("\nI2S Play: Tone @ " + std::to_string(freq) + " Hz (Press [ENTER] to stop)...\n");
- i2sService.playToneInterruptible(freq, 0xFFFF, [&]() -> bool {
+ i2sService.playToneInterruptible(state.getI2sSampleRate(), freq, 0xFFFF, [&]() -> bool {
char ch = terminalInput.readChar();
return ch == '\n' || ch == '\r';
});
@@ -54,7 +54,7 @@ void I2sController::handlePlay(const TerminalCommand& cmd) {
terminalView.println("\nI2S Play: Tone @ " + std::to_string(freq) + " Hz for " + std::to_string(duration) + " ms (or press [ENTER] to stop early)...\n");
- i2sService.playToneInterruptible(freq, duration, [&]() -> bool {
+ i2sService.playToneInterruptible(state.getI2sSampleRate(), freq, duration, [&]() -> bool {
char ch = terminalInput.readChar();
return ch == '\n' || ch == '\r';
});
@@ -177,11 +177,13 @@ void I2sController::handleTestSpeaker() {
terminalView.println(" DATA : " + std::to_string(state.getI2sDataPin()));
terminalView.println("");
+ auto rate = state.getI2sSampleRate();
+
// Melody
terminalView.println(" Melody...");
const uint16_t melody[] = {262, 294, 330, 349, 392, 440, 494, 523}; // C major
for (uint16_t f : melody) {
- i2sService.playTone(f, 200);
+ i2sService.playTone(rate, f, 200);
delay(50);
}
delay(400);
@@ -189,23 +191,23 @@ void I2sController::handleTestSpeaker() {
// Frequency Sweep
terminalView.println(" Frequency Sweep...");
for (uint16_t f = 100; f <= 2000; f += 200) {
- i2sService.playTone(f, 100);
+ i2sService.playTone(rate, f, 100);
}
delay(400);
// Beep Pattern
terminalView.println(" Beep Pattern (short/long)...");
- i2sService.playTone(800, 100);
+ i2sService.playTone(rate, 800, 100);
delay(100);
- i2sService.playTone(800, 400);
+ i2sService.playTone(rate, 800, 400);
delay(200);
- i2sService.playTone(800, 100);
+ i2sService.playTone(rate, 800, 100);
delay(600);
// Binary pattern (square wave)
terminalView.println(" Binary tone pattern...");
for (int i = 0; i < 5; ++i) {
- i2sService.playTone(1000, 50);
+ i2sService.playTone(rate, 1000, 50);
delay(50);
}
delay(800);
diff --git a/src/Services/I2sService.cpp b/src/Services/I2sService.cpp
index f52932b0..5b2fac66 100644
--- a/src/Services/I2sService.cpp
+++ b/src/Services/I2sService.cpp
@@ -61,10 +61,9 @@ void I2sService::configureInput(uint8_t bclk, uint8_t lrck, uint8_t din, uint32_
initialized = true;
}
-void I2sService::playTone(uint16_t freq, uint16_t durationMs) {
+void I2sService::playTone(uint32_t sampleRate, uint16_t freq, uint16_t durationMs) {
if (!initialized) return;
- const int sampleRate = 44100;
int samples = (sampleRate * durationMs) / 1000;
int16_t buffer[2];
@@ -78,8 +77,7 @@ void I2sService::playTone(uint16_t freq, uint16_t durationMs) {
}
}
-void I2sService::playToneInterruptible(uint16_t freq, uint32_t durationMs, std::function<bool()> shouldStop) {
- const int sampleRate = 44100;
+void I2sService::playToneInterruptible(uint32_t sampleRate, uint16_t freq, uint32_t durationMs, std::function<bool()> shouldStop) {
const int16_t amplitude = 32767;
const int chunkDurationMs = 20;
const int samplesPerChunk = (sampleRate * chunkDurationMs) / 1000;
diff --git a/src/Services/I2sService.h b/src/Services/I2sService.h
index d467eab9..6bdbfbb3 100644
--- a/src/Services/I2sService.h
+++ b/src/Services/I2sService.h
@@ -12,8 +12,8 @@ public:
void configureOutput(uint8_t bclk, uint8_t lrck, uint8_t dout, uint32_t sampleRate = 44100, uint8_t bits = 16);
void configureInput(uint8_t bclk, uint8_t lrck, uint8_t din, uint32_t sampleRate = 44100, uint8_t bits = 16);
- void playTone(uint16_t freq, uint16_t durationMs);
- void playToneInterruptible(uint16_t freq, uint32_t durationMs, std::function<bool()> shouldStop);
+ void playTone(uint32_t sampleRate, uint16_t freq, uint16_t durationMs);
+ void playToneInterruptible(uint32_t sampleRate, uint16_t freq, uint32_t durationMs, std::function<bool()> shouldStop);
void playPcm(const int16_t* data, size_t numBytes);
size_t recordSamples(int16_t* outBuffer, size_t sampleCount);
void end();