Fix redefinition error in midi module

marcel-licence · marcel-licence · commit df07391d240d · 2025-07-14T22:34:19.000+02:00
diff --git a/src/midi_interface.h b/src/midi_interface.h
@@ -44,7 +44,6 @@
 #endif
 
 
-
 #if defined(ML_SYNTH_INLINE_DECLARATION) || defined(ML_SYNTH_INLINE_DEFINITION)
 #ifndef MIDI_INTERFACE_H
 #define MIDI_INTERFACE_H
@@ -60,7 +59,6 @@
 #endif
 
 
-
 /*
  * structure is used to build the mapping table
  */
@@ -727,7 +725,7 @@ void Midi_SendRaw(uint8_t *msg)
         MidiPort2.serial->write(msg, 3);
     }
 }
-#endif /* MIDI_TX2_PIN */
+#else /* MIDI_TX2_PIN */
 
 #ifdef MIDI_TX1_PIN
 void Midi_SendShortMessage(uint8_t *msg)
@@ -765,6 +763,7 @@ void Midi_SendRaw(uint8_t *msg)
     }
 }
 #endif /* MIDI_TX1_PIN */
+#endif /* MIDI_TX2_PIN */
 #endif
 #endif
 

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,6 @@`
`44`	`44`	`#endif`
`45`	`45`
`46`	`46`
`47`		`-`
`48`	`47`	`#if defined(ML_SYNTH_INLINE_DECLARATION) \|\| defined(ML_SYNTH_INLINE_DEFINITION)`
`49`	`48`	`#ifndef MIDI_INTERFACE_H`
`50`	`49`	`#define MIDI_INTERFACE_H`
`@@ -60,7 +59,6 @@`
`60`	`59`	`#endif`
`61`	`60`
`62`	`61`
`63`		`-`
`64`	`62`	`/*`
`65`	`63`	`* structure is used to build the mapping table`
`66`	`64`	`*/`
`@@ -727,7 +725,7 @@ void Midi_SendRaw(uint8_t *msg)`
`727`	`725`	`MidiPort2.serial->write(msg, 3);`
`728`	`726`	`}`
`729`	`727`	`}`
`730`		`-#endif /* MIDI_TX2_PIN */`
	`728`	`+#else /* MIDI_TX2_PIN */`
`731`	`729`
`732`	`730`	`#ifdef MIDI_TX1_PIN`
`733`	`731`	`void Midi_SendShortMessage(uint8_t *msg)`
`@@ -765,6 +763,7 @@ void Midi_SendRaw(uint8_t *msg)`
`765`	`763`	`}`
`766`	`764`	`}`
`767`	`765`	`#endif /* MIDI_TX1_PIN */`
	`766`	`+#endif /* MIDI_TX2_PIN */`
`768`	`767`	`#endif`
`769`	`768`	`#endif`
`770`	`769`