From 3181e58b19850c961ad9cf5c3db2f213bfaacc2f Mon Sep 17 00:00:00 2001 From: lwvmobile Date: Wed, 8 Mar 2023 02:25:51 -0500 Subject: [PATCH] Lite to Aero Rebrand; --- CMakeLists.txt | 16 ++++++++-------- src/dsd_main.c | 18 +++++++++--------- src/dsd_ncurses.c | 6 +++--- 3 files changed, 20 insertions(+), 20 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index f14888f..76d733f 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -project(dsd-fme-lite) +project(dsd-fme-aero) cmake_minimum_required(VERSION 2.8.11) SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/") @@ -38,24 +38,24 @@ list(APPEND SRCS "${CMAKE_CURRENT_BINARY_DIR}/git_ver.c") include_directories("${PROJECT_SOURCE_DIR}/include") -ADD_EXECUTABLE(dsd-fme-lite ${SRCS} ${HEADERS}) -TARGET_LINK_LIBRARIES(dsd-fme-lite ${LIBS}) +ADD_EXECUTABLE(dsd-fme-aero ${SRCS} ${HEADERS}) +TARGET_LINK_LIBRARIES(dsd-fme-aero ${LIBS}) include(GNUInstallDirs) -install(TARGETS dsd-fme-lite DESTINATION ${CMAKE_INSTALL_BINDIR}) +install(TARGETS dsd-fme-aero DESTINATION ${CMAKE_INSTALL_BINDIR}) # man page find_program(HELP2MAN_FOUND help2man) if (HELP2MAN_FOUND) - add_custom_command(TARGET dsd-fme-lite POST_BUILD + add_custom_command(TARGET dsd-fme-aero POST_BUILD COMMAND help2man ARGS -n "Digital Speech Decoder" --version-string=${GIT_TAG} - -o ${CMAKE_CURRENT_BINARY_DIR}/dsd-fme-lite.1 + -o ${CMAKE_CURRENT_BINARY_DIR}/dsd-fme-aero.1 --no-info - $ + $ ) - install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dsd-fme-lite.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) + install(FILES ${CMAKE_CURRENT_BINARY_DIR}/dsd-fme-aero.1 DESTINATION ${CMAKE_INSTALL_MANDIR}/man1) endif() # uninstall target diff --git a/src/dsd_main.c b/src/dsd_main.c index e509f97..8783c1a 100644 --- a/src/dsd_main.c +++ b/src/dsd_main.c @@ -52,7 +52,7 @@ char * FM_banner[9] = { " ██║ ██║ ╚═══██╗██║ ██║   ██╔══╝ ██║╚██╔╝██║██╔══╝ ", " ██████╔╝██████╔╝██████╔╝   ██║ ██║ ╚═╝ ██║███████╗", " ╚═════╝ ╚═════╝ ╚═════╝    ╚═╝ ╚═╝ ╚═╝╚══════╝", - " 'Lite' Edition v2.0.0-56-gfe46420 Windows 32-bit RC420" + " 'Aero' Edition v2.0.0-62-g432495c Windows 32-bit RC5 " }; int comp (const void *a, const void *b) @@ -947,13 +947,13 @@ usage () { printf ("\n"); - printf ("Usage: dsd-fme-lite [options] Decoder/Trunking Mode\n"); - printf (" or: dsd-fme-lite [options] -r Read/Play saved mbe data from file(s)\n"); - printf (" or: dsd-fme-lite -h Show help\n"); + printf ("Usage: dsd-fme-aero [options] Decoder/Trunking Mode\n"); + printf (" or: dsd-fme-aero [options] -r Read/Play saved mbe data from file(s)\n"); + printf (" or: dsd-fme-aero -h Show help\n"); printf ("\n"); printf ("Display Options:\n"); printf (" -N Use NCurses Terminal\n"); - printf (" dsd-fme-lite -N 2> log.ans \n"); + printf (" dsd-fme-aero -N 2> log.ans \n"); printf (" -Z Log MBE/PDU Payloads to console\n"); printf ("\n"); printf ("Input/Output options:\n"); @@ -998,7 +998,7 @@ usage () printf (" bw RTL-SDR VFO Bandwidth kHz (default = 12)(6, 8, 12, 24) \n"); printf (" sq RTL-SDR Squelch Level (0 - Open, 25 - Little, 50 - Higher)\n"); printf (" udp RTL-SDR UDP Remote Port (default = 6020)\n"); - printf (" Example: dsd-fme-lite -fp -i rtl:0:851.375M:22:-2:12:0:6021\n"); + printf (" Example: dsd-fme-aero -fp -i rtl:0:851.375M:22:-2:12:0:6021\n"); printf ("\n"); printf ("Decoder options:\n"); printf (" -fa Legacy Auto Detection (old methods default)\n"); @@ -1082,8 +1082,8 @@ usage () printf (" May vary based on system stregnth, etc.\n"); printf (" -t Set Trunking or Fast Scan VC/sync loss hangtime in seconds. (default = 1 second) (decimal values permitted) \n"); printf ("\n"); - printf (" Trunking Example TCP: dsd-fme-lite -fs -i tcp -U 4532 -T -C dmr_t3_chan.csv -G group.csv -N 2> log.ans\n"); - printf (" Trunking Example RTL: dsd-fme-lite -fs -i rtl:0:450M:26:-2:8:0:6020 -T -C connect_plus_chan.csv -G group.csv -N 2> log.ans\n"); + printf (" Trunking Example TCP: dsd-fme-aero -fs -i tcp -U 4532 -T -C dmr_t3_chan.csv -G group.csv -N 2> log.ans\n"); + printf (" Trunking Example RTL: dsd-fme-aero -fs -i rtl:0:450M:26:-2:8:0:6020 -T -C connect_plus_chan.csv -G group.csv -N 2> log.ans\n"); printf ("\n"); exit (0); } @@ -1568,7 +1568,7 @@ main (int argc, char **argv) // fprintf (stderr,"Writing mbe data temporarily disabled!\n"); break; - case 'c': //now is symbol capture bin output like FME Lite + case 'c': strncpy(opts.symbol_out_file, optarg, 1023); opts.symbol_out_file[1023] = '\0'; fprintf (stderr,"Writing + Appending symbol capture to file %s\n", opts.symbol_out_file); diff --git a/src/dsd_ncurses.c b/src/dsd_ncurses.c index 129f569..d2e104a 100644 --- a/src/dsd_ncurses.c +++ b/src/dsd_ncurses.c @@ -2061,7 +2061,7 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state) if (opts->ncurses_compact == 1) { printw ("------------------------------------------------------------------------------\n"); - printw ("| Digital Speech Decoder: Florida Man Edition - Win32 %s \n", "v2.0.0-56-gfe46420 RC420"); + printw ("| Digital Speech Decoder: Florida Man Edition - Aero %s \n", "v2.0.0-62-g432495c RC5"); } if (opts->ncurses_compact == 0) { @@ -2072,8 +2072,8 @@ ncursesPrinter (dsd_opts * opts, dsd_state * state) if (i == 1) printw (" ESC to Menu"); if (i == 2) printw (" 'q' to Quit "); if (i == 4) printw (" MBElib %s", versionstr); - if (i == 5) printw (" %s ", "Win32 RC420"); //printw (" %s \n", GIT_TAG); - if (i == 6) printw (" %s \n", "v2.0.0-56-gfe46420"); //printw (" %s \n", GIT_TAG); + if (i == 5) printw (" %s ", "Aero RC5"); //printw (" %s \n", GIT_TAG); + if (i == 6) printw (" %s \n", "v2.0.0-62-g432495c"); //printw (" %s \n", GIT_TAG); else printw ("\n"); } attroff(COLOR_PAIR(6)); //6