From 9205dc1677d6d0de996f5c65775b83cf62a0a731 Mon Sep 17 00:00:00 2001 From: marchingband Date: Tue, 9 Nov 2021 10:45:52 -0800 Subject: [PATCH] fix audio engine, correct numbering for midi channels in UI --- compile_mkr_boards.sh | 15 +++++++++++++++ src/WVR.cpp | 5 +++++ src/WVR.h | 2 +- src/wav_player.c | 4 ++-- src/wvr_0.3.h | 2 +- src/wvr_ui.h | 2 +- 6 files changed, 25 insertions(+), 5 deletions(-) create mode 100755 compile_mkr_boards.sh diff --git a/compile_mkr_boards.sh b/compile_mkr_boards.sh new file mode 100755 index 0000000..93f8333 --- /dev/null +++ b/compile_mkr_boards.sh @@ -0,0 +1,15 @@ +#!/bin/bash + +VERSION=1.0.5 +echo $VERSION + +cd ../ && \ + +cd ../wvr_makers_board && \ +./wvr.sh compile && \ +mkdir /Users/temporary/wvr_binaries/wvr_makers_board/$VERSION && \ +cp ./build/esp32.esp32.esp32wrover/wvr_makers_board.ino.bin /Users/temporary/wvr_binaries/wvr_makers_board/$VERSION && \ +cd ../wvr_makers_board_usb && \ +./wvr.sh compile && \ +mkdir /Users/temporary/wvr_binaries/wvr_makers_board_usb/$VERSION && \ +cp ./build/esp32.esp32.esp32wrover/wvr_makers_board_usb.ino.bin /Users/temporary/wvr_binaries/wvr_makers_board_usb/$VERSION diff --git a/src/WVR.cpp b/src/WVR.cpp index b4d0a47..1abafa1 100644 --- a/src/WVR.cpp +++ b/src/WVR.cpp @@ -77,4 +77,9 @@ void WVR::encoderInit(int encA, int encB) void WVR::onEncoder(void (*handleEncoder)(bool up)) { on_encoder = handleEncoder; +} + +void WVR::resetPin(int pin) +{ + gpio_reset_pin(gpioNumToGpioNum_T(pin)); } \ No newline at end of file diff --git a/src/WVR.h b/src/WVR.h index b53c76a..5b68b95 100644 --- a/src/WVR.h +++ b/src/WVR.h @@ -23,7 +23,7 @@ class WVR { void setMidiHook(uint8_t*(*fn)(uint8_t *in)); void encoderInit(int encA, int encB); void onEncoder(void (*handleEncoder)(bool up)); - + void resetPin(int pin); // int globalVolume; // bool mute; // bool autoConfigPins; diff --git a/src/wav_player.c b/src/wav_player.c index a8e9d7d..20ff88a 100644 --- a/src/wav_player.c +++ b/src/wav_player.c @@ -40,8 +40,8 @@ static const char* TAG = "wav_player"; #define MAX_READS_PER_LOOP 4 // #define MAX_READS_PER_LOOP 3 -#define USE_EQ 1 -#define USE_PAN 1 +#define USE_EQ 0 +#define USE_PAN 0 // from midi.c uint8_t channel_lut[16]; diff --git a/src/wvr_0.3.h b/src/wvr_0.3.h index 7a80c8f..9921729 100644 --- a/src/wvr_0.3.h +++ b/src/wvr_0.3.h @@ -3,7 +3,7 @@ // #include "WVR.h" -#define VERSION_CODE "1.0.4" +#define VERSION_CODE "1.0.5" void wvr_init(bool useFTDI, bool useUsbMidi, bool checkRecoveryModePin); diff --git a/src/wvr_ui.h b/src/wvr_ui.h index 83aa2a2..bb2c1aa 100644 --- a/src/wvr_ui.h +++ b/src/wvr_ui.h @@ -1,3 +1,3 @@ const char MAIN_page[] PROGMEM = R"=====( -Waver UI
+Waver UI
)====="; \ No newline at end of file