From 14284c3cf1ef959b07078247e7ed719717878c87 Mon Sep 17 00:00:00 2001 From: lwvmobile Date: Fri, 11 Aug 2023 14:59:14 -0400 Subject: [PATCH] More Cygwin M17 Related Bandaids; --- src/dsd_main.c | 6 +++--- src/dsd_ncurses.c | 4 ++-- src/m17.c | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/dsd_main.c b/src/dsd_main.c index 46c7254..e754b3a 100644 --- a/src/dsd_main.c +++ b/src/dsd_main.c @@ -1324,8 +1324,8 @@ if (opts->audio_out_type == 0) } #ifdef AERO_BUILD -//TODO: Investigate why getSymbol needs to be run first in this context...truly confused here -if(opts->frame_m17 == 1 && opts->audio_in_type != 0 && opts->audio_out_type != 0) // +//TODO: More Random Cygwin Related M17 Bugs to sort out +if(opts->frame_m17 == 1 && opts->audio_in_type != 0) for (int i = 0; i < 960; i++) getSymbol(opts, state, 1); //I think this is actually just framesync being a pain #endif @@ -1461,7 +1461,7 @@ main (int argc, char **argv) } #ifdef AERO_BUILD - fprintf (stderr, "Build Version: v2.1b (20230726)\n"); + fprintf (stderr, "Build Version: v2.1b (20230811)\n"); #else fprintf (stderr, "Build Version: %s \n", GIT_TAG); #endif diff --git a/src/dsd_ncurses.c b/src/dsd_ncurses.c index 8978d81..cff8635 100644 --- a/src/dsd_ncurses.c +++ b/src/dsd_ncurses.c @@ -2229,7 +2229,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state) if (opts->ncurses_compact == 1) { printw ("------------------------------------------------------------------------------\n"); - printw ("| Digital Speech Decoder: Florida Man Edition - Aero %s \n", "v2.1b (20230726)"); + printw ("| Digital Speech Decoder: Florida Man Edition - Aero %s \n", "v2.1b (20230811)"); printw ("------------------------------------------------------------------------------\n"); } #elif LIMAZULUTWEAKS @@ -2261,7 +2261,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state) #endif #ifdef AERO_BUILD if (i == 5) printw (" %s ", "Aero Build"); - if (i == 6) printw (" v2.1b (20230726) \n"); + if (i == 6) printw (" v2.1b (20230811) \n"); #else if (i == 5) printw (" %s ", "Main Build"); if (i == 6) printw (" %s \n", GIT_TAG); diff --git a/src/m17.c b/src/m17.c index 522791c..322da41 100644 --- a/src/m17.c +++ b/src/m17.c @@ -619,8 +619,8 @@ void processM17STR(dsd_opts * opts, dsd_state * state) { int i, x; - - uint8_t dbuf[184]; //384-bit frame - 16-bit (8 symbol) sync pattern (184 dibits) + //overflow/memory issue returns in Cygwin for...reasons... + uint8_t dbuf[384]; //384-bit frame - 16-bit (8 symbol) sync pattern (184 dibits) uint8_t m17_rnd_bits[368]; //368 bits that are still scrambled (randomized) uint8_t m17_int_bits[368]; //368 bits that are still interleaved uint8_t m17_bits[368]; //368 bits that have been de-interleaved and de-scramble