YM channel muting fixed

AidanHockey5 · Feb 1, 2022 · 9df1588 · 9df1588
1 parent 880e6c2
commit 9df1588
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 2 deletions.
diff --git a/lib/VGMEngine/VGMEngine.cpp b/lib/VGMEngine/VGMEngine.cpp
@@ -411,7 +411,11 @@ uint16_t VGMEngineClass::parseVGM()
                 // check for an operator/channel key on/off write
                 if (addr == 0x28)
                 {
-                    uint8_t channel = (data & 0x07);
+                    const uint8_t chMap[7] = {0, 1, 2, 0xFF, 3, 4, 5}; //Yamaha doesn't know how to count in binary. Check register 0x28 key-on map.
+                    uint8_t channel = chMap[(data & 0x07)]; //Mask out 0x28 register to get key-on data
+
+                    if(channel == 0xFF) //Invalid channel
+                        break;
                     // if the channel is disabled then make it silent (force a key-off)
                     if (!ym2612CHControl[channel])
                     {

diff --git a/src/main.cpp b/src/main.cpp
@@ -37,7 +37,7 @@ extern "C" {
 #define DEBUG_LED A4
 bool commandFailed = false;
 uint8_t failedCmd = 0x00;
-#define DISABLE_IRQ_TEST true
+#define DISABLE_IRQ_TEST false
 
 //Structs
 enum FileStrategy {FIRST_START, NEXT, PREV, RND, REQUEST};

diff --git a/tools/UF2/firmware.bin b/tools/UF2/firmware.bin
diff --git a/tools/UF2/firmware.uf2 b/tools/UF2/firmware.uf2