try to fix midi issues

YeonV · Oct 4, 2024 · 8cf6a79 · 8cf6a79
1 parent 096d33b
commit 8cf6a79
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 5 deletions.
diff --git a/src/components/Gamepad/Assign.tsx b/src/components/Gamepad/Assign.tsx
@@ -103,7 +103,10 @@ const Assign = ({
                       ...mapping,
                       [padIndex]: {
                         ...mapping[padIndex],
-                        [index]: { command: e.target.value }
+                        [index]: { 
+                          ...mapping[padIndex]?.[index],
+                          command: e.target.value 
+                        }
                       }
                     })
                   }

diff --git a/src/components/Midi/MidiListener.tsx b/src/components/Midi/MidiListener.tsx
@@ -224,7 +224,7 @@ const MIDIListener = () => {
 
       Object.entries(midiMapping[0]).forEach(([key, value]) => {
         const buttonNumber = value.buttonNumber
-        if (value.command !== 'scene' && value.command && value.command !== 'none') {
+        if (value.command !== 'scene' && value.command && value.command !== 'none' && buttonNumber !== -1) {
           if (output) {
             try {
               output.send([parseInt(`0x${value.typeCommand}`) || 0x90, buttonNumber, parseInt(value.colorCommand, 16) || 99])
@@ -233,7 +233,7 @@ const MIDIListener = () => {
             }
           }
         } else if (value.command === 'scene') {
-          if (output) {
+          if (output && buttonNumber !== -1) {
             try {
               output.send([parseInt(`0x${value.typeSceneInactive}`) || 0x90, buttonNumber, parseInt(value.colorSceneInactive, 16) || 60])
             } catch (error) {
@@ -250,15 +250,15 @@ const MIDIListener = () => {
             const scene = scenes[key]
             const buttonNumber = parseInt(scene.scene_midiactivate.split('buttonNumber: ')[1], 10)
             if (key === scene_id) {
-              if (output) {
+              if (output && buttonNumber !== -1) {
                 if (!Number.isNaN(buttonNumber)) {
                   output.send([parseInt(`0x${midiMapping[0][buttonNumber]?.typeSceneActive}`) || 0x90, buttonNumber, parseInt(midiMapping[0][buttonNumber]?.colorSceneActive || '1E', 16)])
                 }
               } else {
                 console.error('No MIDI output devices found')
               }
             } else {
-              if (output) {
+              if (output && buttonNumber !== -1) {
                 if (!Number.isNaN(buttonNumber)) {
                   output.send([parseInt(`0x${midiMapping[0][buttonNumber]?.typeSceneInactive}`) || 0x90, buttonNumber, parseInt(midiMapping[0][buttonNumber]?.colorSceneInactive || '3C', 16)])
                 }