devsync 547958c

eh2k · Dec 3, 2023 · 794b568 · 794b568
1 parent 18116f2
commit 794b568
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -9,6 +9,9 @@
   <summary><b>ChangeLog</b></summary>
 
 ````
+== 2023-12-03 ==
+ * Bugfix: DxFM custom syx didnt work
+ * DevSync: DSM0 perf+wdt
 == 2023-11-19 ==
  * Refactoring CV-Engines (based on modulations)
    - CV-Output Scope-View

diff --git a/platformio.ini b/platformio.ini
@@ -9,7 +9,7 @@
 
 [env]
 extra_scripts = pre:.pre_build.py
-lib_machine = 8c402be
+lib_machine = 547958c
 
 ;upload_protocol = teensy-cli
 

diff --git a/src/dxfm.cxx b/src/dxfm.cxx
@@ -186,8 +186,6 @@ struct DxFMEngine : public MidiEngine
         if (_bnkNum < 0)
         {
             sysexData = machine::flash_read(DXFM_PATCH);
-            if (sysexData)
-                sysexData -= 128; // start with index 1
         }
         else
         {
@@ -202,6 +200,9 @@ struct DxFMEngine : public MidiEngine
 
             if (valid)
             {
+                if (_bnkNum < 0)
+                    sysexData -= 128;
+
                 memcpy(patch, (const char *)sysexData + (prog * 128), sizeof(patch));
                 UnpackPatch(patch, (char *)data);
                 sprintf(patch_name, "%.10s", NAME());

diff --git a/src/main.cxx b/src/main.cxx
@@ -24,6 +24,9 @@
 //
 
 #include "machine.h"
+#include "plaits/resources.h"
+
+void init_engines();
 
 void init_engines2()
 {
@@ -32,6 +35,15 @@ void init_engines2()
     void init_fun() __attribute__((weak)); \
     init_fun();
 
+    static uint32_t p[5];
+    p[0] = (uint32_t)plaits::fm_patches_table[0];
+    p[1] = (uint32_t)plaits::fm_patches_table[1];
+    p[2] = (uint32_t)plaits::fm_patches_table[2];
+    p[3] = (uint32_t)machine::flash_read("DXFMSYX0");
+    p[4] = 0;
+
+    machine::register_symbol("fm_patches_table", p);
+
     MACHINE_INIT(init_modulations);
     MACHINE_INIT(init_quantizer);
 
@@ -62,7 +74,7 @@ void init_engines2()
     MACHINE_INIT(init_aux);
     MACHINE_INIT(init_juno60_chorus);
     MACHINE_INIT(init_plaits2);
-
+    init_engines();
 }
 
 int main()