keith/mustang-midi-bridge
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Correct counts for flushing reply packets

Browse source
This commit is contained in:
hirsch 2016-06-23 09:42:39 -04:00
parent e1e8305195
commit 2fa9314d01
2 changed files with 13 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

3
Makefile
View file

@ -7,7 +7,8 @@ DEP = $(subst .cpp,.d,$(SRC))
# The -M* switches automatically generate .d dependency files # The -M* switches automatically generate .d dependency files
CPPFLAGS += -MP -MMD $(INCDIRS) CPPFLAGS += -MP -MMD $(INCDIRS)
LDLIBS = -ljack -lrtmidi -lusb-1.0 # LDLIBS = -ljack -lrtmidi -lusb-1.0
LDLIBS = -lrtmidi -lusb-1.0
BIN = mustang_midi BIN = mustang_midi

17
mustang.cpp
View file

@ -109,13 +109,16 @@ int Mustang::start_amp(void)
// Request parameter dump from amplifier // Request parameter dump from amplifier
libusb_interrupt_transfer(amp_hand, 0x01, array, LENGTH, &received, TMOUT); libusb_interrupt_transfer(amp_hand, 0x01, array, LENGTH, &received, TMOUT);
for(i = 0; received; i++) // Count probably varies by model. Brute-force flush appears to create problems
// so we'll need to get this right case by case.
for(i = 0; i < 210; i++)
{ {
libusb_interrupt_transfer(amp_hand, 0x81, array, LENGTH, &received, TMOUT); int rc = libusb_interrupt_transfer(amp_hand, 0x81, array, LENGTH, &received, TMOUT);
if (rc) fprintf( stderr, "DEBUG: Timeout. i = %d, rc = %d\n", i, rc );
memcpy(received_data[i], array, LENGTH); memcpy(received_data[i], array, LENGTH);
} }
fprintf( stderr, "DEBUG: Packet count = %d\n", i ); // fprintf( stderr, "DEBUG: Packet count = %d\n", i );
int max_to_receive; int max_to_receive;
i > 143 ? max_to_receive = 200 : max_to_receive = 48; i > 143 ? max_to_receive = 200 : max_to_receive = 48;
@ -227,8 +230,9 @@ int Mustang::effect_toggle(int state_index, int state)
fprintf( stderr, "\n" ); fprintf( stderr, "\n" );
#endif #endif
ret = libusb_interrupt_transfer(amp_hand, 0x01, array, LENGTH, &received, TMOUT); ret = libusb_interrupt_transfer(amp_hand, 0x01, array, LENGTH, &received, TMOUT);
// flush reply data
for (int i=0; received; i++) { // Note: Toggle gets three response packets
for (int i=0; i < 3; i++) {
libusb_interrupt_transfer(amp_hand, 0x81, array, LENGTH, &received, TMOUT); libusb_interrupt_transfer(amp_hand, 0x81, array, LENGTH, &received, TMOUT);
} }
@ -416,7 +420,8 @@ int Mustang::load_memory_bank( int slot )
ret = libusb_interrupt_transfer(amp_hand, 0x01, array, LENGTH, &received, TMOUT); ret = libusb_interrupt_transfer(amp_hand, 0x01, array, LENGTH, &received, TMOUT);
for(int i = 0; received; i++) { // Mustang III has nine responses
for(int i=0; i < 9; i++) {
libusb_interrupt_transfer(amp_hand, 0x81, array, LENGTH, &received, TMOUT); libusb_interrupt_transfer(amp_hand, 0x81, array, LENGTH, &received, TMOUT);
if(i < 7) if(i < 7)
memcpy(curr_state[i], array, LENGTH); memcpy(curr_state[i], array, LENGTH);