From 432cb0faa29e6768de81674868fd78eabe472af5 Mon Sep 17 00:00:00 2001
From: eh2k <eh2k@gmx.de>
Date: Tue, 29 Oct 2024 20:13:03 +0100
Subject: [PATCH] devsyncv 8f20be2 #99 #29

---
 README.md                     |   5 +++++
 app/DRUMS/TR707.bin           | Bin 3012 -> 3480 bytes
 app/DRUMS/TR707.cpp           |  24 +++++++++++++++++++++---
 app/squares-and-circles-api.h |   8 ++++++++
 platformio.ini                |   2 +-
 5 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/README.md b/README.md
index cbb44c1..f3a8787 100644
--- a/README.md
+++ b/README.md
@@ -9,6 +9,11 @@
   <summary><b>ChangeLog</b></summary>
   
 ````
+== 2024-10-29
+   * Enhancement:
+     * TR707 - dynamic level/pan params in io-page/mixer section #29
+   * Bugfix:
+     * setPixel missing (scope app not working) #99
 == 2024-10-28
    * Enhancement:
      * Mod/SEQ - 4-step sequencer modulation #91
diff --git a/app/DRUMS/TR707.bin b/app/DRUMS/TR707.bin
index 366a5fe396cfac1f007d6b6c9b4b608adc43db67..e493825bf394842d6b06cbdba3a693b62dbef3aa 100644
GIT binary patch
literal 3480
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
F_8%Ft$<Y7+

delta 1536
zcmZvcZ){Ul6u{4YeSNQcZlMq(tQ&4!H!E(_2Sr+fVV#)Qu5V&NNL)}`Ln~b}MrDg4
zk+kAJGQ?mWn94LX3|NU0OVD793rPGlT>|mXhiSy<2XV8_hE84(gXgq&L?<`-^>^<*
z=e%?8OI|ZIpD%Q7e5mu`W@v`*1pu22kOY7i5E{4y@lEG&ssSg95f^eN(umX{O-McB
zMx4mq2<0w8DEA(Oav4Io*aPlDEC|(D5vs8vRO3LXrWR>NsAmg6s?@X<7u57#q#n5s
zp{6QA4_%5ZLk_Ug7GxQO4@v+h(M{;{=nC{V=;zVn=qJ!Wq1(|k==L<|Ks0VI{Tg=&
z>r=tf6rhtk%ss0OeDXMVjJv07|0!&7nSq^JT<2aOl-Dk94EayeOF^IFK2i1-|7Rk=
z3ZZm$Xy;zby@`7>_cPpS?l-s(a_6`|;6BeiCY<iI$gDcnmy9I0Z`&O2>x=X~wKdrj
zhe)J<d-oROoLE;CiEQnTbw}dQ#(Vq0_)~m3{$A*Py~`A!%e44k$!7y6bXmhWWCOWS
zjv{_ssYepx<Zk6yXw<A!aW5=sFawV<mv$w$;E_Ml>wH=+Fq9ZI{lGlp<V(s>bP#JT
zD&;emX^dH`n~j@0RK;9WC(l55ZsmY38}lW1Yx)-X(#$#k-2CTs+%?WfbxX^gdv95n
z{$E{OmyC}jcWTpr@`0a=^65S@b{tMTsx$9!RGfTGrd$0Lr5ltp=`_BWsy$h&>&G$U
zRf#fwpOc}+O7BG)imoYj`&Zo9C07JzqpNt-ufffCOC45(4i{XC8gpyR6EJOU9?TP>
z*a?>D`wA8XXW^?wP>h^hSL+&zF45mD?}9kp&nS`$G|`^%v)sh2MulxxO5D3T)JD&#
zrxPzs94`0{T`Kqn&;z^k(FSn(v`oMo@=;FK8}xNhUY7~^E|W#UP^KTSLZkCX+))n|
z7AuLwRIy#j1jfxBs%ye#8AZQUfSunKm_qT5rZ^7<r;D)j<03eQQ$@F9rN)+L0#z+7
z7rw)XR41sEH3-*4vwgw>_6gg(A1>V1QWHFb1z%ho6~Fp=w%NGZ1I)-5I~-HR1U6-Z
z)MDIB!c;M+P=5I!pZp@^M}8Ccj$EGF2WQ8=>|E{fc-rVQT}hvFKh1FLK<K}d{tD8F
zRhL5L+Y0q>CoGdMS{C)#18^2Y@bc*qWfg1OgVWcM{m22N^;dXM`0$cxw_h}2zwqge
zt5>cY$x4TCtt{zpTCqLGw#phoxj_r#c;#9(gSGD<S>z~^LvY|3(`{bW8|hf%Sxy^#
Ke!sD(YQsPD=A|Y8

diff --git a/app/DRUMS/TR707.cpp b/app/DRUMS/TR707.cpp
index dac4991..4fb0151 100644
--- a/app/DRUMS/TR707.cpp
+++ b/app/DRUMS/TR707.cpp
@@ -23,6 +23,9 @@ void engine::setup()
     auto IC34_TR707_SNDROM_bin = machine::fs_read("707_IC34");
     auto IC35_TR707_SNDROM_bin = machine::fs_read("707_IC35");
 
+    if(IC34_TR707_SNDROM_bin == nullptr || IC35_TR707_SNDROM_bin == nullptr )
+        return;
+
     auto BD0 = &IC34_TR707_SNDROM_bin[0x0000];
     auto BD1 = &IC34_TR707_SNDROM_bin[0x0001];
     auto SD0 = &IC34_TR707_SNDROM_bin[0x2000];
@@ -64,8 +67,13 @@ void engine::setup()
 
 void engine::process()
 {
+    if(sample_ptr[0] == nullptr)
+        return;
+
     auto outputL = engine::outputBuffer<0>();
     memset(outputL, 0, sizeof(float) * FRAME_BUFFER_SIZE);
+    auto outputR = engine::outputBuffer<1>();
+    memset(outputR, 0, sizeof(float) * FRAME_BUFFER_SIZE);
 
     for (uint32_t i = 0; i < LEN_OF(sample_ptr); i++)
     {
@@ -86,14 +94,24 @@ void engine::process()
 
             _midi_trigs &= ~(1 << i);
         }
-
-        dsp_process_sample(sample_ptr[i], _start, _end, -2.f + (_pitch * 4), outputL);
+        float tmp[FRAME_BUFFER_SIZE] = {};
+        dsp_process_sample(sample_ptr[i], _start, _end, -2.f + (_pitch * 4), tmp);
+        float levelL = engine::mixLevelL(i);
+        float levelR = engine::mixLevelR(i);
+        for(size_t i = 0; i < FRAME_BUFFER_SIZE; i++)
+        {
+            outputL[i] += tmp[i] * levelL;
+            outputR[i] += tmp[i] * levelR;
+        }
     }
 }
 
 void engine::draw()
 {
-    gfx::drawSample(sample_ptr[_select]);
+    if(sample_ptr[0] == nullptr)
+        gfx::drawString(20, 20, "ROMS NOT FOUND\n \n   707_IC34\n   707_IC35");
+    else
+        gfx::drawSample(sample_ptr[_select]);
 }
 
 void engine::onMidiNote(uint8_t key, uint8_t velocity) // NoteOff: velocity == 0
diff --git a/app/squares-and-circles-api.h b/app/squares-and-circles-api.h
index fceaffc..9c42d15 100644
--- a/app/squares-and-circles-api.h
+++ b/app/squares-and-circles-api.h
@@ -34,6 +34,7 @@
 #include <stddef.h>
 #include <stdio.h>
 #include <string.h>
+#include <math.h>
 
 #define V_OCT "V_OCT"
 #define V_QTZ "V_QTZ"
@@ -110,6 +111,9 @@ EXTERN_C
     extern int16_t *__output_l_i16p;
     extern int16_t *__output_r_i16p;
 
+    extern uint8_t *__mixer_level;
+    extern uint8_t *__mixer_pan;
+
     extern float **__audio_in_l_fpp;
     extern float **__audio_in_r_fpp;
 
@@ -213,6 +217,10 @@ namespace engine
     template <>
     inline float *inputBuffer<1>() { return *__audio_in_r_fpp; }
 
+    inline float mixLevel(int ch) { return ((4.f / UINT16_MAX) * __mixer_level[ch]) * __mixer_level[ch]; } // exp range 0 - 4
+    inline float mixLevelL(int ch) { return cosf((float)__mixer_pan[ch] / 255.f * (float)M_PI_2) * mixLevel(ch); }
+    inline float mixLevelR(int ch) { return sinf((float)__mixer_pan[ch] / 255.f * (float)M_PI_2) * mixLevel(ch); }
+
     EXTERN_C void setup();
     EXTERN_C void process();
     EXTERN_C void draw();
diff --git a/platformio.ini b/platformio.ini
index eafc9ba..a51078a 100644
--- a/platformio.ini
+++ b/platformio.ini
@@ -10,6 +10,6 @@
 [env:squares-and-circles]
 apps_json = ./app/index.json
 extra_scripts = build.py
-squares_and_circles_loader = a2a6378 ; minimum loader version
+squares_and_circles_loader = 8f20be2 ; minimum loader version
 platform = teensy@5.0.0         ; https://github.com/platformio/platform-teensy/releases
 board = teensy41                ; fake setting - the engines are compatibe with all targets