Skip to content

Commit

Permalink
fix audio engine, correct numbering for midi channels in UI
Browse files Browse the repository at this point in the history
  • Loading branch information
marchingband committed Nov 9, 2021
1 parent 602b021 commit 9205dc1
Show file tree
Hide file tree
Showing 6 changed files with 25 additions and 5 deletions.
15 changes: 15 additions & 0 deletions compile_mkr_boards.sh
Original file line number Diff line number Diff line change
@@ -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
5 changes: 5 additions & 0 deletions src/WVR.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -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));
}
2 changes: 1 addition & 1 deletion src/WVR.h
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down
4 changes: 2 additions & 2 deletions src/wav_player.c
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down
2 changes: 1 addition & 1 deletion src/wvr_0.3.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion src/wvr_ui.h

Large diffs are not rendered by default.

0 comments on commit 9205dc1

Please sign in to comment.