fix teensy compilation error using latest board version

added midi monitore feature to MIDI support and midi example

Author: marcel-licence

examples/ml_midi_monitor/ml_midi_monitor.ino

@@ -37,6 +37,8 @@
  *          Received short MIDI messages will be displayed and decoded
  */
 
+#define MIDI_MONITOR_ENABLED
+
 /*
  * The following configuration is for the RP2040, RP2350
  */
@@ -158,8 +160,6 @@ void setup(void)
     Serial.println("ml_midi_monitor");
 
     Midi_Setup();
-
-
 }
 
 void loop_1hz(void)
@@ -174,10 +174,8 @@ void loop_1hz(void)
 
 void loop(void)
 {
-
     uint32_t newCnt = millis();
 
-
     static uint32_t lastCnt = 0;
     static uint32_t cnt = 0;
     cnt += newCnt - lastCnt;
@@ -189,6 +187,4 @@ void loop(void)
     }
 
     Midi_Process();
-
-
 }

library.json

@@ -1,6 +1,6 @@
 {
   "name": "ML_SynthTools",
-  "version": "2.0.3",
+  "version": "2.0.4",
   "keywords": "ML_SynthTools, Synthesizer, Filter, Audio, ESP32, ESP32S2, ESP32S3, STM32, RP2040",
   "description": "Synthesizer Tools; contains waveform generators etc.",
   "repository":

library.properties

@@ -1,5 +1,5 @@
 name=ML SynthTools
-version=2.0.3
+version=2.0.4
 author=Marcel Licence <[email protected]>
 maintainer=Marcel Licence <[email protected]>
 sentence=Synthesizer Tools

src/audio_module.h

@@ -188,7 +188,6 @@ void Audio_Setup(void)
     }
 #endif
 
-
 #ifdef ESP32_AUDIO_KIT
 #ifdef ES8388_ENABLED
     ES8388_Setup();
@@ -302,10 +301,11 @@ static int16_t *queueTransmitBuffer2;
 void Teensy_Setup()
 {
     Serial.printf("Teensy Setup\n");
-    Serial.printf("\tBCK: 21\n");
-    Serial.printf("\tLRCK: 20\n");
-    Serial.printf("\tSDOUT: 7\n");
-    Serial.printf("AudoBlockSamples: %d\n", AUDIO_BLOCK_SAMPLES);
+    Serial.printf("BCLK1: 21 -> connect to BCLK\n");
+    Serial.printf("LRCLK1: 20 -> connect to WCLK/LRCLK\n");
+    Serial.printf("OUT1A: 7 -> connect to DIN\n");
+    Serial.printf("IN1: 8 (optional connect to DOUT)\n");
+
     Midi_Setup();
 }
 
@@ -393,6 +393,11 @@ void Audio_PrintStats()
 #endif
 #endif
 
+void Audio_Output(const Q1_14 *mono)
+{
+    Audio_Output((const int16_t *)mono, (const int16_t *)mono);
+}
+
 void Audio_OutputMono(const int32_t *samples)
 {
 #ifdef OUTPUT_SAW_TEST

src/caps_info.h

@@ -97,17 +97,21 @@ void CapsPrintInfo(void)
 #ifdef SOC_CPU_HAS_FPU
     Serial.printf("Cpu has FPU\n");
 #endif
+#if defined(RP2350_PSRAM_CS)
+    Serial.printf("PSRAM Size: %d\n", rp2040.getPSRAMSize());
+    Serial.printf(" total PSRAM heap: %d\navailable PSRAM heap: %d\n", rp2040.getTotalPSRAMHeap(), rp2040.getFreePSRAMHeap());
+#endif
 }
 
 void PrintMemoryInfo(void)
 {
 #ifdef ESP32
-    Serial.printf("ESP.getFreeHeap() %d\n", ESP.getFreeHeap());
-    Serial.printf("ESP.getMinFreeHeap() %d\n", ESP.getMinFreeHeap());
-    Serial.printf("ESP.getHeapSize() %d\n", ESP.getHeapSize());
-    Serial.printf("ESP.getMaxAllocHeap() %d\n", ESP.getMaxAllocHeap());
+    Serial.printf("ESP.getFreeHeap() %" PRIu32 "\n", ESP.getFreeHeap());
+    Serial.printf("ESP.getMinFreeHeap() %" PRIu32 "\n", ESP.getMinFreeHeap());
+    Serial.printf("ESP.getHeapSize() %" PRIu32 "\n", ESP.getHeapSize());
+    Serial.printf("ESP.getMaxAllocHeap() %" PRIu32 "\n", ESP.getMaxAllocHeap());
 
-    Serial.printf("Total PSRAM: %d\n", ESP.getPsramSize());
-    Serial.printf("Free PSRAM: %d\n", ESP.getFreePsram());
+    Serial.printf("Total PSRAM: %" PRIu32 "\n", ESP.getPsramSize());
+    Serial.printf("Free PSRAM: %" PRIu32 "\n", ESP.getFreePsram());
 #endif
 }

src/es8388.h

@@ -394,7 +394,7 @@ void ES8388_Setup()
     Serial.printf("Connect to ES8388 codec...\n");
     Serial.printf("  SDA: %d\n ", ES8388_PIN_SDA);
     Serial.printf("  SCL: %d\n", ES8388_PIN_SCL);
-    Serial.printf("  freq: %d\n", i2c_freq);
+    Serial.printf("  freq: %" PRIu32 "\n", i2c_freq);
 
     while (not ES8388_begin(ES8388_PIN_SDA, ES8388_PIN_SCL, i2c_freq))
     {

src/fs/fs_common.h

@@ -53,7 +53,7 @@
 
 
 #include <FS.h>
-#if (defined ARDUINO_RUNNING_CORE) || (defined ARDUINO_RASPBERRY_PI_PICO) || (defined ARDUINO_ARCH_RP2040) || (defined ESP8266) /* tested with arduino esp32 core version 2.0.2 */
+#if defined(ARDUINO_RUNNING_CORE) || defined(ARDUINO_RASPBERRY_PI_PICO) || defined(ARDUINO_ARCH_RP2040) || defined(ESP8266) /* tested with arduino esp32 core version 2.0.2 */
 #include <LittleFS.h> /* Using library LittleFS at version 2.0.0 from https://github.com/espressif/arduino-esp32 */
 #else
 #include <LITTLEFS.h> /* Using library LittleFS_esp32 at version 1.0.6 from https://github.com/lorol/LITTLEFS */

src/fs/fs_teensy.h

@@ -141,7 +141,7 @@ uint32_t getFileFromIdx(File dir, int numTabs, uint32_t idx, char *filename, cha
 
 bool getFileFromIdx(uint32_t idx, char *filename, char *filter)
 {
-    File dir = SD.open("/", "r");
+    File dir = SD.open("/", FILE_READ);
     char filename_clean[64];
 
     bool result = getFileFromIdx(dir, 0, idx, filename_clean, filter) == 0 ? true : false;

src/midi_interface.h

@@ -73,8 +73,10 @@ void Midi_HandleShortMsgEx(uint8_t *data, uint8_t cable __attribute__((unused)))
 void Midi_SendShortMessage(uint8_t *msg);
 #ifndef ARDUINO_SEEED_XIAO_M0
 #ifndef SWAP_SERIAL
+#ifdef MIDI_TX2_PIN
+void Midi_SendShortMessage(uint8_t *msg);
 void Midi_SendRaw(uint8_t *msg);
-#endif
+#endif /* MIDI_TX2_PIN */
 #endif
 #endif
 
@@ -136,7 +138,7 @@ struct midi_port_s
     uint8_t inMsgIndex ;
 };
 
-#ifdef ARDUINO_DAISY_SEED
+#if (defined ARDUINO_DAISY_SEED) || (defined STM32H7xx)
 HardwareSerial Serial2(USART1);
 #endif
 
@@ -567,16 +569,21 @@ void Midi_Setup()
     Serial2.begin(MIDI_SERIAL2_BAUDRATE);
 #endif /* MIDI_TX2_PIN */
 
-#else /* MIDI_RX2_PIN */
+#else /* ARDUINO_ARCH_RP2040 */
+
+#ifdef MIDI_RX2_PIN
 #ifdef MIDI_TX2_PIN
     Serial.printf("Setup Serial2 with %d baud with rx: %s%d and tx %s%d\n", MIDI_SERIAL2_BAUDRATE, PIN_CAPTION, MIDI_RX2_PIN, PIN_CAPTION, MIDI_TX2_PIN);
     Serial2.setTX(MIDI_TX2_PIN);
 #else /* MIDI_TX2_PIN */
     Serial.printf("Setup Serial2 with %d baud with rx: %s%d\n", MIDI_SERIAL2_BAUDRATE, PIN_CAPTION, MIDI_RX2_PIN);
 #endif /* MIDI_TX2_PIN */
     Serial2.setRX(MIDI_RX2_PIN);
-    Serial2.begin(MIDI_SERIAL2_BAUDRATE);
+#else
+    Serial.printf("Setup Serial2 with %d baud with rx: Serial2.rx\n", MIDI_SERIAL2_BAUDRATE, PIN_CAPTION);
 #endif /* MIDI_RX2_PIN */
+    Serial2.begin(MIDI_SERIAL2_BAUDRATE);
+#endif /* ARDUINO_ARCH_RP2040 */
 
     MidiPort2.serial = &Serial2;
     Midi_PortSetup(&MidiPort2);

src/ml_inline.h

@@ -36,6 +36,11 @@
  * @brief   This file includes all required header for inline build
  */
 
+#if !defined(ML_SYNTH_INLINE_DECLARATION) && !defined(ML_SYNTH_INLINE_DEFINITION)
+#define ML_SYNTH_INLINE_DECLARATION
+#define ML_SYNTH_INLINE_DEFINITION
+#endif
+
 #include <audio_module.h>
 #include <blink.h>
 #include <es8388.h>