etoth/audio-synth
1
0
Fork 0
mirror of https://github.com/erik-toth/audio-synth.git synced 2025-12-06 18:40:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

Firmware MCU: Update sequencer block to support dynamic step count and enhance documentation

Browse Source
This commit is contained in:
Erik Tóth
2025-12-01 22:45:58 +01:00
parent b106859252
commit 855fd01821
6 changed files with 82 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
dev/digital/Firmware_TEST/src/FIRMWARE.cpp
View File

@@ -235,12 +235,12 @@ uint8_t CV::_getKeyToVoltageIndex(Key k)
/*!
* @param maxDurationMS maximum loop duration of recording in milliseconds
* @param minStepDurationMS minimum duration for a step to be recorded (prevents ultra-short steps)
* @param maxStepCount maximum number of steps that can be recorded
*/
SequencerBlock::SequencerBlock(uint16_t maxDurationMS, uint16_t minStepDurationMS)
SequencerBlock::SequencerBlock(uint16_t maxDurationMS, uint16_t maxStepCount)
{
_maxDurationMS = maxDurationMS;
_minStepDurationMS = minStepDurationMS;
_maxStepCount = maxStepCount;
_stepCount = 0;
_currentStep = 0;
_isRecording = false;
@@ -386,7 +386,7 @@ void SequencerBlock::clear()
_lastVoltageCh1 = 0;
_lastVoltageCh2 = 0;
for(uint8_t i = 0; i < N_MAX_SEQUENCE_STEPS; i++)
for(uint8_t i = 0; i < _MAX_SEQUENCE_STEPS; i++)
{
_sequence[i].voltage_ch1 = 0;
_sequence[i].voltage_ch2 = 0;
@@ -409,7 +409,12 @@ bool SequencerBlock::timeLimitReached()
return (elapsed >= _maxDurationMS);
}
uint8_t SequencerBlock::getStepCount()
bool SequencerBlock::stepLimitReached()
{
return (_stepCount >= _maxStepCount);
}
uint16_t SequencerBlock::getStepCount()
{
return _stepCount;
}
@@ -447,21 +452,13 @@ void SequencerBlock::_finishCurrentStep()
unsigned long now = millis();
uint16_t duration = now - _lastStepTime;
// Nur Steps mit ausreichender Dauer speichern
if(duration >= _minStepDurationMS)
{
_sequence[_stepCount - 1].duration = duration;
}
else
{
// Step war zu kurz, verwerfen
_stepCount--;
}
_sequence[_stepCount - 1].duration = duration;
}
bool SequencerBlock::_canAddStep()
{
if(_stepCount >= N_MAX_SEQUENCE_STEPS) return false;
if(_stepCount >= _maxStepCount) return false;
if(_stepCount >= _MAX_SEQUENCE_STEPS) return false;
if(timeLimitReached()) return false;
return true;

17
dev/digital/Firmware_TEST/src/main.cpp
View File

@@ -1,5 +1,8 @@
/*
* Example Code Three - Dual Channel Sequencer
* TODO:
- add predefined sequence of voltage (e.g. for usage as startup sound)
- implement INFO and MISC pins form file FIRMWARE_DEF.h
*/
#include "FIRMWARE_DEF.h"
#include "FIRMWARE.h"
@@ -12,17 +15,17 @@ Keyboard keyboard(N_KEYBOARD_ROW, N_KEYBOARD_COL, pins_keyboard_row, pins_keyboa
Adafruit_MCP4728 MCP4728;
MCP4728_channel_t cvMap[N_CV_GATES] = {MCP4728_CHANNEL_A, MCP4728_CHANNEL_B};
uint16_t keyToVoltage[N_KEYBOARD_ROW*N_KEYBOARD_COL] = { /* 83mV = 1/12V */
1*83, 5*83, 9*83,
2*83, 6*83, 10*83,
3*83, 7*83, 11*83,
4*83, 8*83, 12*83
1*83, 5*83, 9*83, /* ROW 1: B D Fis */
2*83, 6*83, 10*83, /* ROW 2: H Dis G */
3*83, 7*83, 11*83, /* ROW 3: C E Gis */
4*83, 8*83, 12*83 /* ROW 4: Cis F A' */
};
CV cv(&MCP4728, &Wire, N_CV_GATES, cvMap, keyToVoltage, N_KEYBOARD_ROW, N_KEYBOARD_COL);
// Sequencer mit 30s max, 50ms Mindest-Step-Dauer
SequencerBlock sb1(30000, 50);
SequencerBlock sb2(30000, 50);
// Sequencer 30s max, 512 max Steps
SequencerBlock sb1(30000, N_MAX_SEQ_STEPS);
SequencerBlock sb2(30000, N_MAX_SEQ_STEPS);
// Button States
struct ButtonState {