From b94ceecad3382852353c2f0d9ea6a7be5a34806e Mon Sep 17 00:00:00 2001 From: bbond007 Date: Thu, 17 Jan 2019 20:55:05 -0500 Subject: [PATCH 1/4] hasmidi fix --- menu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/menu.cpp b/menu.cpp index 85206e4..1a142ab 100644 --- a/menu.cpp +++ b/menu.cpp @@ -1513,7 +1513,7 @@ void HandleUI(void) parentstate = MENU_UART1; struct stat filestat; - int hasmidi = !stat("/dev/midi", &filestat); + int hasmidi = (stat("/dev/midi", &filestat) == 0)?true:false; int mode = GetUARTMode(); int midilink = GetMidiLinkMode(); int m = (mode != 3 && mode != 4) || hasmidi; From 09c20fa78c21dcefa3ee9b743339cf8eed4653fa Mon Sep 17 00:00:00 2001 From: bbond007 Date: Thu, 17 Jan 2019 21:05:29 -0500 Subject: [PATCH 2/4] undo --- menu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/menu.cpp b/menu.cpp index 1a142ab..85206e4 100644 --- a/menu.cpp +++ b/menu.cpp @@ -1513,7 +1513,7 @@ void HandleUI(void) parentstate = MENU_UART1; struct stat filestat; - int hasmidi = (stat("/dev/midi", &filestat) == 0)?true:false; + int hasmidi = !stat("/dev/midi", &filestat); int mode = GetUARTMode(); int midilink = GetMidiLinkMode(); int m = (mode != 3 && mode != 4) || hasmidi; From 3e1d1c0fdf5f7ecf4772b14f44ef439a00281a91 Mon Sep 17 00:00:00 2001 From: bbond007 Date: Fri, 18 Jan 2019 00:17:14 -0500 Subject: [PATCH 3/4] change /dev/midi to /dev/midi1 and add option to reset without making change --- menu.cpp | 32 +++++++++++++++++++++++--------- 1 file changed, 23 insertions(+), 9 deletions(-) diff --git a/menu.cpp b/menu.cpp index 85206e4..d0e81b3 100644 --- a/menu.cpp +++ b/menu.cpp @@ -1506,14 +1506,14 @@ void HandleUI(void) case MENU_UART1: { helptext = 0; - menumask = 0x1F; + menumask = 0x3F; OsdSetTitle("UART mode"); menustate = MENU_UART2; parentstate = MENU_UART1; struct stat filestat; - int hasmidi = !stat("/dev/midi", &filestat); + int hasmidi = !stat("/dev/midi1", &filestat); int mode = GetUARTMode(); int midilink = GetMidiLinkMode(); int m = (mode != 3 && mode != 4) || hasmidi; @@ -1523,16 +1523,18 @@ void HandleUI(void) OsdWrite(1, s, menusub == 0, 0); OsdWrite(2); - sprintf(s, " MIDI link: %s", (midilink & 2) ? "Remote" : " Local"); + sprintf(s, " MIDI Link: %s", (midilink & 2) ? "Remote" : " Local"); OsdWrite(3, s, menusub == 1, m); sprintf(s, " Type: %s", (midilink & 2) ? ((midilink & 1) ? " UDP" : " TCP") : ((midilink & 1) ? " MUNT" : "FluidSynth")); OsdWrite(4, s, menusub == 2, m); - + OsdWrite(5); - OsdWrite(6, " Save", menusub == 3); + OsdWrite(6, " Reset UART Connection", menusub == 3, mode?0:1); + OsdWrite(7); + OsdWrite(8, " Save", menusub == 4); - for (int i = 7; i < 15; i++) OsdWrite(i); - OsdWrite(15, STD_EXIT, menusub == 4); + for (int i = 9; i < 15; i++) OsdWrite(i); + OsdWrite(15, STD_EXIT, menusub == 5); } break; @@ -1572,8 +1574,20 @@ void HandleUI(void) menustate = MENU_UART1; } break; - - case 3: + case 3: + { + int mode = GetUARTMode(); + if(mode != 0) + { + sprintf(s, "uartmode %d", 0); + system(s); + sprintf(s, "uartmode %d", mode); + system(s); + menustate = MENU_8BIT_SYSTEM1; + } + } + break; + case 4: { int mode = GetUARTMode() | (GetMidiLinkMode() << 8); sprintf(s, "uartmode.%s", user_io_get_core_name_ex()); From 67754d2a15ab3935e91ecd5d5fa69c0621d8de53 Mon Sep 17 00:00:00 2001 From: bbond007 Date: Fri, 18 Jan 2019 00:21:25 -0500 Subject: [PATCH 4/4] typo --- menu.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/menu.cpp b/menu.cpp index d0e81b3..b7951ca 100644 --- a/menu.cpp +++ b/menu.cpp @@ -1523,7 +1523,7 @@ void HandleUI(void) OsdWrite(1, s, menusub == 0, 0); OsdWrite(2); - sprintf(s, " MIDI Link: %s", (midilink & 2) ? "Remote" : " Local"); + sprintf(s, " MIDI link: %s", (midilink & 2) ? "Remote" : " Local"); OsdWrite(3, s, menusub == 1, m); sprintf(s, " Type: %s", (midilink & 2) ? ((midilink & 1) ? " UDP" : " TCP") : ((midilink & 1) ? " MUNT" : "FluidSynth")); OsdWrite(4, s, menusub == 2, m);