devsync 6d501ea

Author: eh2k

CHANGELOG.txt

@@ -2,6 +2,13 @@
 
 All notable changes to this project will be documented in this file.
 
+== 2026-02-24
+   * Enhancements:
+     * Merged TR-909-Ride into TR-909-HiHat engine
+     * IO-Page: Indent on MultiTrigs level/pan
+   * Bugfix:
+     * SYNTH/DxFM - Stereo parameter fix
+     * Midi cc to an unexisting parameter crashes s&c #152
 == 2026-02-21
    * New Engines
      * SEQ/303-Patterns
@@ -10,7 +17,7 @@ All notable changes to this project will be documented in this file.
       * Trig Gates "inverted" fix
       * Output designation according to the latest rev3 panel.
       * Patches are stored end of 8MB flash range (T40 2MB)
-   * Enchancement:
+   * Enhancements:
      * Default IO config - (reset on load empty patch)
      * Named Output/Inputs (outputBuffer_f32(name)/inputBuffer_f32(name))
      * M-OSC/Waveforms - Attack removed, Stereo parameter added
@@ -26,15 +33,15 @@ All notable changes to this project will be documented in this file.
    * Bugfix:
      * Modulation Clock disabled (except clocked engines) -> global clock default for non clocked engines #118
 == 2025-12-14
-   * Enchancement
+   * Enhancements
      * SEQ engines: support any input for clock-source #118
      * Midi+Clock+Timing: Tigger-Input-Delay setting #150
 == 2025-12-07
    * Bugfix
      * IO-page/Stereo control not allways visible (depends on output settings)
      * IO-page/Input level not visible for CV-Engines (now allways visible, scope usecase etc)
      * GND/Scope performance issue (range limit)
-   * Enchancement
+   * Enhancements
      * Modulation CV - Attenuverter min/max = ±2 #149
      * Scope/FFT stereo signal pass through
      * WhitePink noise stereo (+BROWN mode)
@@ -48,7 +55,7 @@ All notable changes to this project will be documented in this file.
      * FX/Delay - patch restore allways default control values
      * FX/Delay - dynamic time parameter by internal clock (general bpm == 0 case)
      * FX/Delay - heap corruption (cause DelayLine array)
-   * Enchancement
+   * Enhancements
      * FX/Delay - Dry/Wet control #101
      * UsbHid - remote display (https://eh2k.github.io/%E2%96%A1%E2%97%8F/remote/)
      * DrumSynth - MidiNote mapping implemented
@@ -64,7 +71,7 @@ All notable changes to this project will be documented in this file.
      * Glitch/Noise caused in some cases by drawing x > 128 (TR707 sample visualization)
      * TR707: fixed TOM samplerate from 25000 to 12500
      * MIDI CC doesn't reach last step of a parameter #139
-   * Enchancement
+   * Enhancements
      * TR707 
       - optional crash & ride crymbals added
       - Midi CC04 (Footcontroller) support for Closed/OpenHihat
@@ -144,7 +151,7 @@ All notable changes to this project will be documented in this file.
    * Enhancements
      * DrumSynth ...
 == 2024-12-17
-   * Bugfix/Enchancement #117
+   * Bugfix/Enhancements #117
      * Parameter value was not visualized when modulations set (Bug since 2024-12-16)
      * Midi pitch was added before quantizer
      * V_OCT parameter value was added before quantized
@@ -153,10 +160,10 @@ All notable changes to this project will be documented in this file.
    * New paramters io-page
      * Quantizer-Root
      * Transpose-Finetune
-   * Bugfix/Enchancement
+   * Bugfix/Enhancements
      * tanspose offset was quantized
 == 2024-12-14
-   * Bugfix/Enchancement
+   * Bugfix/Enhancements
      * SEQ triggered & trig-input triggered engines were not in sync
      * V_OCT/Scale parameter, semitones from active quantizer (#117)
      * Claps less RAM usage

README.md

@@ -79,7 +79,7 @@ The available engine types include drums, synthesizers, oscillators, sequencers,
   * [Analog-HH2](https://github.com/eh2k/squares-and-circles/wiki/Analog-HH2),
   * [909ish-BD](https://github.com/eh2k/squares-and-circles/wiki/909ish-BD),
   * [909ish-SD](https://github.com/eh2k/squares-and-circles/wiki/909ish-SD),
-  * [TR909-HiHat, TR909-Ride](https://github.com/eh2k/squares-and-circles/wiki/TR909_HiHats)
+  * [TR909-HiHat](https://github.com/eh2k/squares-and-circles/wiki/TR909_HiHats)
   * [808ish-BD](https://github.com/eh2k/squares-and-circles/wiki/808ish-BD),
   * [808ish-SD](https://github.com/eh2k/squares-and-circles/wiki/808ish-SD),
   * [808ish-HiHat](https://github.com/eh2k/squares-and-circles/wiki/808ish-HiHat),

app/DRUMS/TR909-HiHat.bin

@@ -13,7 +13,6 @@
     "DRUMS/FM-Drum.bin",
     "DRUMS/TR707.bin",
     "DRUMS/TR909-HiHat.bin",
-    "DRUMS/TR909-Ride.bin",
     "FILTER/MoogLadder.bin",
     "FILTER/SVF.bin",
     "FILTER/TeeBee.bin",

app/DRUMS/TR909-Ride.bin

@@ -1 +1 @@
-85b3d76
+6d501ea

app/SYNTH/DxFM.bin

@@ -2,49 +2,94 @@
 
 static float _ch_vol = 1.f;
 static float _ch_dec = 0.2f;
+static float _oh_vol = 1.f;
 static float _oh_dec = 0.5f;
+static float _rd_vol = 1.f;
+static float _rd_dec = 0.5f;
 
-int32_t _select = 0;
+int32_t _select;
+const char *sample_names[] = {"CH", "OH", "RD"};
+// void *_samples[3] = {};
 void *_ch = nullptr;
 void *_oh = nullptr;
+void *_rd = nullptr;
+
+static std::pair<uint8_t, uint8_t> midi_key_map[] = {
+    {42, 0}, // HH - Closed
+    {44, 0}, // HH - Pedal
+    {46, 1}, // HH - Open
+    {51, 2}, // RD - Ride
+    {59, 2}, // RD - Ride Edge
+    {53, 2}, // RD - Ride Bell
+    // {49, 3},  // CR - Crash
+    // {55, 3},  // CR - Crash Edge
+    // {57, 3},  // CR - Crash Bow
+    {0xFF, 0}, // END
+};
+
+float *_outputL = nullptr;
+float *_outputR = nullptr;
 
 void engine::setup()
 {
     const uint8_t *HiHats_bin = machine::fs_read("909_HIGH");
+    const uint8_t *Ride_bin = machine::fs_read("909_RIDE");
 
-    if (HiHats_bin == nullptr)
+    if (HiHats_bin == nullptr || Ride_bin == nullptr)
         return;
 
-    _oh = dsp_sample_u8(HiHats_bin, 24576, 32000, 0);
     const int ch_start = 24576;
     _ch = dsp_sample_u8(HiHats_bin + ch_start, 32768 - ch_start, 32000, 0);
+    _oh = dsp_sample_u8(HiHats_bin, 24576, 32000, 0);
+    _rd = dsp_sample_u8(Ride_bin, 32768, 32000, 0);
 
-    engine::addParam("", &_select, 0, 0); // . = hidden
     engine::addParam("CH-Lev", &_ch_vol);
     engine::addParam("CH-Dec", &_ch_dec);
+    engine::addParam("OH-Lev", &_oh_vol);
     engine::addParam("OH-Dec", &_oh_dec);
+    engine::addParam("RD-Lev", &_rd_vol);
+    engine::addParam("RD-Dec", &_rd_dec);
+
+    _outputL = engine::outputBuffer_f32(OUT_AUDIO_L);
+    _outputR = engine::outputBuffer_f32(OUT_AUDIO_R);
+    engine::setupMultiTrigs(3, sample_names, midi_key_map);
 }
 
 void engine::process()
 {
     if (_oh == nullptr)
         return;
 
-    auto outputL = engine::outputBuffer<0>();
-    memset(outputL, 0, sizeof(float) * FRAME_BUFFER_SIZE);
-
-    if (engine::accent()) // OH
+    if (engine::trig() & (1 << 1)) // OH
     {
-        dsp_set_sample_pos(_oh, 0, 1.f, _oh_dec);
+        dsp_set_sample_pos(_oh, 0, _oh_vol, _oh_dec);
     }
-    else if (engine::trig()) // CH
+    else if (engine::trig() & (1 << 0)) // CH
     {
         dsp_set_sample_pos(_ch, 0, _ch_vol, _ch_dec);
         dsp_set_sample_pos(_oh, 0, 0, _oh_dec);
     }
 
-    dsp_process_sample(_ch, 0, 1, engine::cv(), outputL);
-    dsp_process_sample(_oh, 0, 1, engine::cv(), outputL);
+    if (engine::trig() & (1 << 2)) // RD
+    {
+        dsp_set_sample_pos(_rd, 0, _rd_vol, _rd_dec);
+    }
+
+    memset(_outputL, 0, sizeof(float) * FRAME_BUFFER_SIZE);
+    memset(_outputR, 0, sizeof(float) * FRAME_BUFFER_SIZE);
+    void *_samples[] = {_ch, _oh, _rd};
+    for (size_t i = 0; i < LEN_OF(_samples) && _samples[i] != nullptr; i++)
+    {
+        float tmp[FRAME_BUFFER_SIZE] = {};
+        dsp_process_sample(_samples[i], 0, 1, engine::cv(), tmp);
+        float levelL = engine::mixLevelL(i);
+        float levelR = engine::mixLevelR(i);
+        for (size_t j = 0; j < FRAME_BUFFER_SIZE; j++)
+        {
+            _outputL[j] += tmp[j] * levelL;
+            _outputR[j] += tmp[j] * levelR;
+        }
+    }
 }
 
 void engine::draw()