mirror of
https://github.com/lwvmobile/dsd-fme.git
synced 2026-11-20 12:45:40 -05:00
Cygwin:
Cmake -DNOCOLORSLOGS=OFF for Cygwin Builds (or user option) Tweak cygwin scripts to include touch.exe in portable release builder. Rework original 1aa bat file to be a simplified / unified .bat file (old bat files still available in examples folder);
This commit is contained in:
@@ -10,13 +10,20 @@ SET(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${PROJECT_SOURCE_DIR}/cmake/")
|
|||||||
set(CURSES_NEED_NCURSES TRUE)
|
set(CURSES_NEED_NCURSES TRUE)
|
||||||
set(CURSES_NEED_WIDE TRUE)
|
set(CURSES_NEED_WIDE TRUE)
|
||||||
|
|
||||||
#use cmake option -DCOLORS=OFF to disable color output
|
#use cmake option -DCOLORS=OFF to disable color output (ncurses)
|
||||||
option(COLORS
|
option(COLORS
|
||||||
"Build with Colors Enabled" ON)
|
"Build with Colors Enabled" ON)
|
||||||
if (COLORS)
|
if (COLORS)
|
||||||
add_definitions(-DPRETTY_COLORS)
|
add_definitions(-DPRETTY_COLORS)
|
||||||
endif ()
|
endif ()
|
||||||
|
|
||||||
|
#use cmake option -DCOLORSLOGS=OFF to disable color output (terminal/logs)
|
||||||
|
option(COLORSLOGS
|
||||||
|
"Build with Colors Enabled" ON)
|
||||||
|
if (COLORSLOGS)
|
||||||
|
add_definitions(-DPRETTY_COLORS_LOGS)
|
||||||
|
endif ()
|
||||||
|
|
||||||
#use cmake option -DPVC=ON to enable Provoice Conventional Frame Sync
|
#use cmake option -DPVC=ON to enable Provoice Conventional Frame Sync
|
||||||
option(PVC
|
option(PVC
|
||||||
"Build with Provoice Conventional Frame Sync Enabled" OFF)
|
"Build with Provoice Conventional Frame Sync Enabled" OFF)
|
||||||
|
|||||||
@@ -22,6 +22,8 @@ if [ "$RELEASE" = "y" ]; then
|
|||||||
mkdir shm
|
mkdir shm
|
||||||
cd ..
|
cd ..
|
||||||
mkdir dsd-fme
|
mkdir dsd-fme
|
||||||
|
mkdir logs
|
||||||
|
mkdir WAV
|
||||||
mkdir etc
|
mkdir etc
|
||||||
mkdir home
|
mkdir home
|
||||||
mkdir lib
|
mkdir lib
|
||||||
@@ -236,6 +238,7 @@ if [ "$RELEASE" = "y" ]; then
|
|||||||
cp /bin/parec dsd-fme-portable/dsd-fme/
|
cp /bin/parec dsd-fme-portable/dsd-fme/
|
||||||
cp /bin/pulseaudio.exe dsd-fme-portable/dsd-fme/
|
cp /bin/pulseaudio.exe dsd-fme-portable/dsd-fme/
|
||||||
cp /bin/tail.exe dsd-fme-portable/dsd-fme/
|
cp /bin/tail.exe dsd-fme-portable/dsd-fme/
|
||||||
|
cp /bin/touch.exe dsd-fme-portable/dsd-fme/
|
||||||
cp /bin/tty.exe dsd-fme-portable/dsd-fme/
|
cp /bin/tty.exe dsd-fme-portable/dsd-fme/
|
||||||
|
|
||||||
zip -r dsd-fme-x86-64-cygwin-portable.zip dsd-fme-portable
|
zip -r dsd-fme-x86-64-cygwin-portable.zip dsd-fme-portable
|
||||||
|
|||||||
@@ -74,7 +74,7 @@ if [ "$ANSWER" = "y" ]; then
|
|||||||
#git checkout aw_dev
|
#git checkout aw_dev
|
||||||
mkdir build
|
mkdir build
|
||||||
cd build
|
cd build
|
||||||
cmake ..
|
cmake -DCOLORSLOGS=OFF ..
|
||||||
make -j $(nproc)
|
make -j $(nproc)
|
||||||
make install
|
make install
|
||||||
cd $cdir
|
cd $cdir
|
||||||
@@ -96,6 +96,8 @@ if [ "$ANSWER" = "y" ]; then
|
|||||||
mkdir shm
|
mkdir shm
|
||||||
cd ..
|
cd ..
|
||||||
mkdir dsd-fme
|
mkdir dsd-fme
|
||||||
|
mkdir logs
|
||||||
|
mkdir WAV
|
||||||
mkdir etc
|
mkdir etc
|
||||||
mkdir home
|
mkdir home
|
||||||
mkdir lib
|
mkdir lib
|
||||||
@@ -310,6 +312,7 @@ if [ "$ANSWER" = "y" ]; then
|
|||||||
cp /bin/parec dsd-fme-portable/dsd-fme/
|
cp /bin/parec dsd-fme-portable/dsd-fme/
|
||||||
cp /bin/pulseaudio.exe dsd-fme-portable/dsd-fme/
|
cp /bin/pulseaudio.exe dsd-fme-portable/dsd-fme/
|
||||||
cp /bin/tail.exe dsd-fme-portable/dsd-fme/
|
cp /bin/tail.exe dsd-fme-portable/dsd-fme/
|
||||||
|
cp /bin/touch.exe dsd-fme-portable/dsd-fme/
|
||||||
cp /bin/tty.exe dsd-fme-portable/dsd-fme/
|
cp /bin/tty.exe dsd-fme-portable/dsd-fme/
|
||||||
|
|
||||||
zip -r dsd-fme-x86-64-cygwin-portable.zip dsd-fme-portable
|
zip -r dsd-fme-x86-64-cygwin-portable.zip dsd-fme-portable
|
||||||
|
|||||||
@@ -1,13 +1,7 @@
|
|||||||
@REM Set the console / terminal to 90 columns, 50 lines
|
|
||||||
@REM mode con: cols=90 lines=50
|
|
||||||
|
|
||||||
@REM change directory into the dsd-fme folder
|
|
||||||
cd dsd-fme
|
|
||||||
|
|
||||||
@REM Digital Speech Decoder: Florida Man Edition
|
@REM Digital Speech Decoder: Florida Man Edition
|
||||||
@REM DSD-FME Cygwin Windows Portable Builds
|
@REM DSD-FME Cygwin Windows Portable Builds
|
||||||
@REM
|
@REM
|
||||||
@REM The source code of this software can be donwloaded here:
|
@REM The source code of this software can be downloaded here:
|
||||||
@REM https://github.com/lwvmobile/dsd-fme
|
@REM https://github.com/lwvmobile/dsd-fme
|
||||||
@REM
|
@REM
|
||||||
@REM If you paid for, or were otherwise fleeced for this software, DEMAND YOUR MONEY BACK!
|
@REM If you paid for, or were otherwise fleeced for this software, DEMAND YOUR MONEY BACK!
|
||||||
@@ -15,102 +9,63 @@ cd dsd-fme
|
|||||||
@REM This software is designed to be used with an SDR receiver (like SDR++ or SDR#) with TCP input,
|
@REM This software is designed to be used with an SDR receiver (like SDR++ or SDR#) with TCP input,
|
||||||
@REM RTL Input, media file playback over virtual cables or null-sinks, or a Discriminator Tap input
|
@REM RTL Input, media file playback over virtual cables or null-sinks, or a Discriminator Tap input
|
||||||
@REM
|
@REM
|
||||||
@REM The complete option list can be seen by entering the following command:
|
@REM The complete options list can be seen by entering the following command:
|
||||||
@REM dsd-fme.exe -h
|
@REM dsd-fme.exe -h
|
||||||
@REM
|
@REM
|
||||||
@REM Enjoy !
|
@REM Enjoy!
|
||||||
@REM
|
|
||||||
@REM Important! Make sure to route audio in with volume mixer after opening!
|
|
||||||
@REM You may need to restart the software after setting it up to monitor input
|
|
||||||
@REM of VB-Cables, or allowing the network traffic for TCP or RIGCTL
|
|
||||||
@REM See the 'source code\examples\Audio_Plumbing.md' file for more information
|
|
||||||
@REM
|
|
||||||
@REM Notice: DSD-FME will not auto-detect NXDN48/96, Provoice, M17, or dPMR signals,
|
|
||||||
@REM you will need to manually switch them on with the correct command.
|
|
||||||
@REM
|
|
||||||
@REM Notice: This .bat file contains numerous examples, it is recommended to find an
|
|
||||||
@REM an example that matches your use case, and use the @REM to disable the default
|
|
||||||
@REM or make your own .bat files with the examples provided here
|
|
||||||
|
|
||||||
|
@REM Regarding the options string (or any string in .bat files)
|
||||||
|
@REM If your string may contain spaces, set the first '"' before options, and then an ending '"'
|
||||||
|
@REM Incorrect: set options="-fs -N -Z"
|
||||||
|
@REM Correct: set "options=-fs -N -Z"
|
||||||
|
|
||||||
@REM Default Decoders (DMR, P25, X2, DSTAR, YSF):
|
@REM set options to pass to dsd-fme
|
||||||
@REM -i /dev/dsp, -o /dev/dsp, and -fa are implied
|
set "options= -fs -N -Z "
|
||||||
|
|
||||||
@REM dsd-fme.exe
|
@REM Set Date Time for log (sourced from: https://stackoverflow.com/questions/1192476/format-date-and-time-in-a-windows-batch-script)
|
||||||
dsd-fme.exe -N 2> log.ans
|
@echo off
|
||||||
|
REM "%date: =0%" replaces spaces with zeros
|
||||||
|
set d=%date: =0%
|
||||||
|
REM "set yyyy=%d:~-4%" pulls the last 4 characters
|
||||||
|
set yyyy=%d:~-4%
|
||||||
|
set mm=%d:~4,2%
|
||||||
|
set dd=%d:~7,2%
|
||||||
|
set dow=%d:~0,3%
|
||||||
|
set d=%yyyy%%mm%%dd%
|
||||||
|
|
||||||
@REM DMR
|
set t=%TIME: =0%
|
||||||
|
REM "%t::=%" removes semi-colons
|
||||||
|
REM Instead of above, you could use "%t::=-%" to
|
||||||
|
REM replace semi-colons with hyphens (or any
|
||||||
|
REM non-special character)
|
||||||
|
set t=%t::=%
|
||||||
|
set t=%t:.=%
|
||||||
|
|
||||||
@REM dsd-fme.exe -fs
|
set datetimestr=%d%_%t%
|
||||||
@REM dsd-fme.exe -fs -N 2> log.ans
|
@REM @echo Long date time str = %datetimestr%
|
||||||
@REM dsd-fme.exe -fs -xr #(inverted polarity)
|
|
||||||
|
|
||||||
@REM P25
|
@REM random number is used so that two log files don't share the same name
|
||||||
|
set rnd=%RANDOM%
|
||||||
|
|
||||||
@REM dsd-fme.exe -ft
|
@REM set log file relative filepath
|
||||||
@REM dsd-fme.exe -ft -N 2> log.ans
|
set "log=.\logs\log_%datetimestr%_%rnd%.txt"
|
||||||
|
|
||||||
|
@REM create the log file now with touch
|
||||||
|
.\dsd-fme\touch.exe %log%
|
||||||
|
|
||||||
@REM P25 (Phase 2 Only, specify WACN/SYS/CC value, if not control channel)
|
@REM Launch Tail to display the log in a seperate console window
|
||||||
|
start .\dsd-fme\tail.exe -n 40 -f %log%
|
||||||
|
|
||||||
@REM dsd-fme.exe -f2 -X BEE00ABC123
|
@REM start dsd-fme with options and log
|
||||||
@REM dsd-fme.exe -f2 -X BEE00ABC123 -N 2> log.ans
|
.\dsd-fme\dsd-fme.exe %options% 2> %log%
|
||||||
|
|
||||||
@REM X2-TDMA
|
echo ----------------------------------------------------------------------------------
|
||||||
|
echo ----------------------------------------------------------------------------------
|
||||||
|
echo For any errors, see: %log%
|
||||||
|
echo Forward %log% and Options: "%options%"
|
||||||
|
echo to developer on Github or Radio Reference for troubleshooting.
|
||||||
|
echo ----------------------------------------------------------------------------------
|
||||||
|
echo ----------------------------------------------------------------------------------
|
||||||
|
|
||||||
@REM dsd-fme.exe -fx
|
@REM Set pause to diplay above message
|
||||||
@REM dsd-fme.exe -fx -N 2> log.ans
|
PAUSE
|
||||||
@REM dsd-fme.exe -fx -xx #(inverted polarity)
|
|
||||||
|
|
||||||
|
|
||||||
@REM NXDN48
|
|
||||||
|
|
||||||
@REM dsd-fme.exe -fi
|
|
||||||
@REM dsd-fme.exe -fi -N 2> log.ans
|
|
||||||
|
|
||||||
|
|
||||||
@REM NXDN96
|
|
||||||
|
|
||||||
@REM dsd-fme.exe -fn
|
|
||||||
@REM dsd-fme.exe -fn -N 2> log.ans
|
|
||||||
|
|
||||||
|
|
||||||
@REM YSF
|
|
||||||
|
|
||||||
@REM dsd-fme.exe -fy
|
|
||||||
@REM dsd-fme.exe -fy -N 2> log.ans
|
|
||||||
|
|
||||||
|
|
||||||
@REM DSTAR
|
|
||||||
|
|
||||||
@REM dsd-fme.exe -fd
|
|
||||||
@REM dsd-fme.exe -fd -N 2> log.ans
|
|
||||||
|
|
||||||
|
|
||||||
@REM dPMR
|
|
||||||
|
|
||||||
@REM dsd-fme.exe -fm
|
|
||||||
@REM dsd-fme.exe -fm -N 2> log.ans
|
|
||||||
@REM dsd-fme.exe -fm -xd #(inverted polarity)
|
|
||||||
|
|
||||||
|
|
||||||
@REM M17
|
|
||||||
|
|
||||||
@REM dsd-fme.exe -fz
|
|
||||||
@REM dsd-fme.exe -fz -N 2> log.ans
|
|
||||||
@REM dsd-fme.exe -fz -xz #(inverted polarity)
|
|
||||||
|
|
||||||
|
|
||||||
@REM ProVoice
|
|
||||||
|
|
||||||
@REM dsd-fme.exe -fp
|
|
||||||
@REM dsd-fme.exe -fp -N 2> log.ans
|
|
||||||
|
|
||||||
|
|
||||||
@REM ProVoice (Conventional / Simplex)
|
|
||||||
|
|
||||||
@REM dsd-fme-pvc.exe -ft
|
|
||||||
@REM dsd-fme-pvc.exe -ft -N 2> log.ans
|
|
||||||
|
|
||||||
|
|
||||||
@REM PAUSE
|
|
||||||
|
|||||||
@@ -17,8 +17,8 @@
|
|||||||
* PERFORMANCE OF THIS SOFTWARE.
|
* PERFORMANCE OF THIS SOFTWARE.
|
||||||
*/
|
*/
|
||||||
|
|
||||||
//defined by CMakeLists.txt -- Disable by using cmake -DCOLORS=OFF ..
|
//ANSII Color Characters in Terminal -- Disable by using cmake -DCOLORSLOGS=OFF ..
|
||||||
#ifdef PRETTY_COLORS
|
#ifdef PRETTY_COLORS_LOGS
|
||||||
#define KNRM "\x1B[0m"
|
#define KNRM "\x1B[0m"
|
||||||
#define KRED "\x1B[31m"
|
#define KRED "\x1B[31m"
|
||||||
#define KGRN "\x1B[32m"
|
#define KGRN "\x1B[32m"
|
||||||
|
|||||||
Reference in New Issue
Block a user