CHANGES.md

@@ -2,8 +2,29 @@
 # Revision History #
 
 
-## Version 1.6  --  October 2020 ##
+## Version 1.7  --  Under Development ('dev' branch) ##
+
+
+### New Features: ###
+
+- Improved Layer 2 Protocol [(IL2P)](https://en.wikipedia.org/wiki/FX.25_Forward_Error_Correction).  Use "-I 1" on command line to enable transmit for first channel.  Compatible with Nino TNC for 1200 and 9600 bps.
+
+- Limited support for CM109/CM119 GPIO PTT on Windows.
+
+- Dire Wolf now advertises itself using DNS Service Discovery.  This allows suitable APRS / Packet Radio applications to find a network KISS TNC without knowing the IP address or TCP port.    Thanks to Hessu for providing this.  Currently available only for Linux and Mac OSX.  [Read all about it here.](https://github.com/hessu/aprs-specs/blob/master/TCP-KISS-DNS-SD.md)
 
+- The transmit calibration tone (-x) command line option now accepts a radio channel number and/or a single letter mode:  a = alternate tones, m = mark tone, s = space tone, p = PTT only no sound.
+
+- The BEACON configuration now recognizes the SOURCE= option.  This replaces the AX.25 source address rather than using the MYCALL value for the channel.  This is useful for sending more than 5 analog telemetry channels.  Use two, or more, source addresses with up to 5 analog channels each.
+
+- For more flexibility, the FX.25 transmit property can now be set individually by channel, rather than having a global setting for all channels.  The -X on the command line applies only to channel 0.  For other channels you need to add a new line to the configuration file.
+
+    > After:   "CHANNEL 1"   (or other channel)
+    >
+    > Add:     "FX25TX 1" (or 16 or 32 or 64)
+
+
+## Version 1.6  --  October 2020 ##
 
 ### New Build Procedure: ###
 

CMakeLists.txt

@@ -4,12 +4,13 @@ project(direwolf)
 
 # configure version
 set(direwolf_VERSION_MAJOR "1")
-set(direwolf_VERSION_MINOR "6")
+set(direwolf_VERSION_MINOR "7")
 set(direwolf_VERSION_PATCH "0")
-set(direwolf_VERSION_SUFFIX "")
+set(direwolf_VERSION_SUFFIX "Development")
 
 # options
-option(FORCE_SSE "Compile with SSE instruction only" OFF)
+# See Issue 297.
+option(FORCE_SSE "Compile with SSE instruction only" ON)
 option(FORCE_SSSE3 "Compile with SSSE3 instruction only" OFF)
 option(FORCE_SSE41 "Compile with SSE4.1 instruction only" OFF)
 option(OPTIONAL_TEST "Compile optional test (might be broken)" OFF)
@@ -31,15 +32,6 @@ set(COPYRIGHT "Copyright (c) 2019 John Langner, WB2OSZ. All rights reserved.")
 add_definitions("-DCOPYRIGHT=\"${COPYRIGHT}\"")
 set(IDENTIFIER "com.${COMPANY}.${APPLICATION_NAME}")
 add_definitions("-DIDENTIFIER=\"${IDENTIFIER}\"")
-# raspberry as only lxterminal not xterm
-if(NOT (WIN32 OR CYGWIN))
-  find_program(BINARY_TERMINAL_BIN lxterminal)
-  if(BINARY_TERMINAL_BIN)
-    set(APPLICATION_DESKTOP_EXEC "${BINARY_TERMINAL_BIN} -e ${CMAKE_PROJECT_NAME}")
-  else()
-    set(APPLICATION_DESKTOP_EXEC "xterm -e ${CMAKE_PROJECT_NAME}")
-  endif()
-endif()
 
 find_package(Git)
 if(GIT_FOUND AND EXISTS "${CMAKE_SOURCE_DIR}/.git/")
@@ -71,6 +63,7 @@ set(CUSTOM_SRC_DIR "${CMAKE_SOURCE_DIR}/src")
 set(CUSTOM_EXTERNAL_DIR "${CMAKE_SOURCE_DIR}/external")
 set(CUSTOM_MISC_DIR "${CUSTOM_EXTERNAL_DIR}/misc")
 set(CUSTOM_REGEX_DIR "${CUSTOM_EXTERNAL_DIR}/regex")
+set(CUSTOM_HIDAPI_DIR "${CUSTOM_EXTERNAL_DIR}/hidapi")
 set(CUSTOM_GEOTRANZ_DIR "${CUSTOM_EXTERNAL_DIR}/geotranz")
 set(CUSTOM_DATA_DIR "${CMAKE_SOURCE_DIR}/data")
 set(CUSTOM_SCRIPTS_DIR "${CMAKE_SOURCE_DIR}/scripts")
@@ -131,7 +124,7 @@ endif()
 # auto include current directory
 set(CMAKE_INCLUDE_CURRENT_DIR ON)
 
-# set OS dependant variables
+# set OS dependent variables
 if(${CMAKE_SYSTEM_NAME} STREQUAL "Linux")
   set(LINUX TRUE)
 
@@ -143,6 +136,10 @@ elseif(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD")
   configure_file("${CMAKE_SOURCE_DIR}/cmake/cpack/${CMAKE_PROJECT_NAME}.desktop.in"
     "${CMAKE_BINARY_DIR}/${CMAKE_PROJECT_NAME}.desktop" @ONLY)
 
+elseif(${CMAKE_SYSTEM_NAME} STREQUAL "OpenBSD")
+  set(OPENBSD TRUE)
+  set(HAVE_SNDIO TRUE)
+
 elseif(APPLE)
   if("${CMAKE_OSX_DEPLOYMENT_TARGET}" STREQUAL "")
     message(STATUS "Build for macOS target: local version")
@@ -156,6 +153,10 @@ elseif(APPLE)
   set(CMAKE_MACOSX_RPATH ON)
   message(STATUS "RPATH support: ${CMAKE_MACOSX_RPATH}")
 
+  # just blindly enable dns-sd
+  set(USE_MACOS_DNSSD ON)
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUSE_MACOS_DNSSD")
+
 elseif (WIN32)
   if(NOT VS2015 AND NOT VS2017)
     message(FATAL_ERROR "You must use Microsoft Visual Studio 2015 or 2017 as compiler")
@@ -195,10 +196,16 @@ if (C_CLANG OR C_GCC)
   # I also took out -Wextra because it spews out so much noise a serious problem was not noticed.
   # It might go back in someday when I have more patience to clean up all the warnings.
   #
+
+  # TODO:
+  # Try error checking -fsanitize=bounds-strict -fsanitize=leak
+  # Requires libubsan and liblsan, respectively.
+
   ###set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wvla -ffast-math -ftree-vectorize -D_XOPEN_SOURCE=600 -D_DEFAULT_SOURCE ${EXTRA_FLAGS}")
   if(FREEBSD)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wextra -Wvla -ffast-math -ftree-vectorize -D_DEFAULT_SOURCE ${EXTRA_FLAGS}")
   else()
+    #set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wvla -ffast-math -ftree-vectorize -D_GNU_SOURCE -fsanitize=bounds-strict ${EXTRA_FLAGS}")
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -Wall -Wvla -ffast-math -ftree-vectorize -D_GNU_SOURCE ${EXTRA_FLAGS}")
   endif()
   #
@@ -246,6 +253,20 @@ else()
 endif(WIN32 OR CYGWIN)
 
 # requirements
+
+include(CheckSymbolExists)
+# Some platforms provide their own strlcpy & strlcat. (BSD, MacOSX)
+# Others don't so we provide our own. (Most, but not all Linux)
+# Define the preprocessor macro so libgps does not supply its own version.
+check_symbol_exists(strlcpy string.h HAVE_STRLCPY)
+if(HAVE_STRLCPY)
+    add_compile_options(-DHAVE_STRLCPY)
+endif()
+check_symbol_exists(strlcat string.h HAVE_STRLCAT)
+if(HAVE_STRLCAT)
+    add_compile_options(-DHAVE_STRLCAT)
+endif()
+
 set(THREADS_PREFER_PTHREAD_FLAG ON)
 find_package(Threads REQUIRED)
 
@@ -276,6 +297,17 @@ if(LINUX)
     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUSE_CM108")
   endif()
 
+  find_package(Avahi)
+  if(AVAHI_CLIENT_FOUND)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUSE_AVAHI_CLIENT")
+  endif()
+
+elseif (HAVE_SNDIO)
+  find_package(sndio REQUIRED)
+  if(SNDIO_FOUND)
+    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUSE_SNDIO")
+  endif()
+
 elseif (NOT WIN32 AND NOT CYGWIN)
   find_package(Portaudio REQUIRED)
   if(PORTAUDIO_FOUND)
@@ -287,8 +319,12 @@ else()
   set(ALSA_LIBRARIES "")
   set(UDEV_INCLUDE_DIRS "")
   set(UDEV_LIBRARIES "")
+  # Version 1.7 supports CM108/CM119 GPIO PTT for Windows.
+  set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -DUSE_CM108")
   set(PORTAUDIO_INCLUDE_DIRS "")
   set(PORTAUDIO_LIBRARIES "")
+  set(SNDIO_INCLUDE_DIRS "")
+  set(SNDIO_LIBRARIES "")
 endif()
 
 # manage and fetch new data
@@ -297,6 +333,7 @@ add_subdirectory(data)
 # external libraries
 add_subdirectory(${CUSTOM_GEOTRANZ_DIR})
 add_subdirectory(${CUSTOM_REGEX_DIR})
+add_subdirectory(${CUSTOM_HIDAPI_DIR})
 add_subdirectory(${CUSTOM_MISC_DIR})
 
 # direwolf source code and utilities

README.md

@@ -1,4 +1,4 @@
-
+
 # Dire Wolf #
 
 ### Decoded Information from Radio Emissions for Windows Or Linux Fans ###
@@ -9,11 +9,15 @@ Why waste $200 and settle for mediocre receive performance from a 1980's technol
 
 ![](tnc-test-cd-results.png)
 
-Dire Wolf now includes [FX.25](https://en.wikipedia.org/wiki/FX.25_Forward_Error_Correction/) which adds Forward Error Correction (FEC) in a way that is completely compatible with existing systems.  If both ends are capable of FX.25, your information will continue to get through under conditions where regular AX.25 is completely useless.
+Dire Wolf now includes [FX.25](https://en.wikipedia.org/wiki/FX.25_Forward_Error_Correction) which adds Forward Error Correction (FEC) in a way that is completely compatible with existing systems.  If both ends are capable of FX.25, your information will continue to get through under conditions where regular AX.25 is completely useless.
 
 ![](fx25.png)
 
-Dire Wolf is a modern software replacement for the old 1980's style TNC built with special hardware.
+Version 1.7 adds [IL2P](https://en.wikipedia.org/wiki/Improved_Layer_2_Protocol), a different method of FEC with less overhead.
+
+
+
+### Dire Wolf is a modern software replacement for the old 1980's style TNC built with special hardware. ###
 
 Without any additional software, it can perform as:
 
@@ -131,15 +135,17 @@ On Debian / Ubuntu / Raspbian / Raspberry Pi OS:
     sudo apt-get install cmake
     sudo apt-get install libasound2-dev
     sudo apt-get install libudev-dev
+    sudo apt-get install libavahi-client-dev
 
 Or on Red Hat / Fedora / CentOS:
 
-	sudo yum install git
-	sudo yum install gcc
-	sudo yum install gcc-c++
-	sudo yum install make
+    sudo yum install git
+    sudo yum install gcc
+    sudo yum install gcc-c++
+    sudo yum install make
     sudo yum install alsa-lib-devel
     sudo yum install libudev-devel
+    sudo yum install avahi-devel
 
 CentOS 6 & 7 currently have cmake 2.8 but we need 3.1 or later.
 First you need to enable the EPEL repository.  Add a symlink if you don't already have the older version and want to type cmake rather than cmake3.
@@ -190,6 +196,9 @@ Read the **User Guide** in the [**doc** directory](https://github.com/wb2osz/dir
 
 If you have problems,  post them to the [Dire Wolf packet TNC](https://groups.io/g/direwolf) discussion group.
 
+You can also install a pre-built version from Mac Ports.  Keeping this up to date depends on volunteers who perform the packaging. This version could lag behind development.
+
+	sudo port install direwolf
 
 
 ## Join the conversation  ##

cmake/cpack/direwolf.desktop.in

@@ -1,10 +1,10 @@
 [Desktop Entry]
 Name=@APPLICATION_NAME@
 Comment=APRS Soundcard TNC
-Exec=@APPLICATION_DESKTOP_EXEC@
-Icon=@CMAKE_PROJECT_NAME@_icon.png
+Exec=@CMAKE_PROJECT_NAME@
+Icon=@CMAKE_PROJECT_NAME@_icon
 StartupNotify=true
-Terminal=false
+Terminal=true
 Type=Application
 Categories=HamRadio
 Keywords=Ham Radio;APRS;Soundcard TNC;KISS;AGWPE;AX.25

cmake/modules/FindAvahi.cmake

@@ -0,0 +1,19 @@
+
+find_library(AVAHI_COMMON_LIBRARY NAMES avahi-common PATHS ${PC_AVAHI_CLIENT_LIBRARY_DIRS})
+if(AVAHI_COMMON_LIBRARY)
+    set(AVAHI_COMMON_FOUND TRUE)
+endif()
+
+find_library(AVAHI_CLIENT_LIBRARY NAMES avahi-client PATHS ${PC_AVAHI_CLIENT_LIBRARY_DIRS})
+if(AVAHI_CLIENT_LIBRARY)
+    set(AVAHI_CLIENT_FOUND TRUE)
+endif()
+
+FIND_PACKAGE_HANDLE_STANDARD_ARGS(AVAHI DEFAULT_MSG AVAHI_COMMON_FOUND AVAHI_CLIENT_FOUND)
+
+if (AVAHI_FOUND)
+    set(AVAHI_INCLUDE_DIRS ${AVAHI_UI_INCLUDE_DIR})
+    set(AVAHI_LIBRARIES ${AVAHI_COMMON_LIBRARY} ${AVAHI_CLIENT_LIBRARY})
+endif()
+
+mark_as_advanced(AVAHI_INCLUDE_DIRS AVAHI_LIBRARIES)

cmake/modules/FindCPUflags.cmake

@@ -78,7 +78,6 @@ endfunction()
 # The default will be set for maximum portability so packagers won't need to
 # to anything special.
 #
-set(FORCE_SSE 1)
 #
 # While ENABLE_GENERIC also had the desired result (for x86_64), I don't think
 # it is the right approach.  It prevents the detection of the architecture,
@@ -354,7 +353,12 @@ elseif(ARCHITECTURE_ARM)
     if(C_MSVC)
         try_run(RUN_NEON COMPILE_NEON "${CMAKE_BINARY_DIR}/tmp" "${TEST_DIR}/test_arm_neon.cxx" COMPILE_DEFINITIONS /O0)
     else()
-        try_run(RUN_NEON COMPILE_NEON "${CMAKE_BINARY_DIR}/tmp" "${TEST_DIR}/test_arm_neon.cxx" COMPILE_DEFINITIONS -mfpu=neon -O0)
+        if(${CMAKE_HOST_SYSTEM_PROCESSOR} STREQUAL ${CMAKE_SYSTEM_PROCESSOR})
+          try_run(RUN_NEON COMPILE_NEON "${CMAKE_BINARY_DIR}/tmp" "${TEST_DIR}/test_arm_neon.cxx" COMPILE_DEFINITIONS -mfpu=neon -O0)
+        else()  
+          try_compile(COMPILE_NEON "${CMAKE_BINARY_DIR}/tmp" "${TEST_DIR}/test_arm_neon.cxx" COMPILE_DEFINITIONS -mfpu=neon -O0)
+          set(RUN_NEON  0)
+        endif()
     endif()
     if(COMPILE_NEON AND RUN_NEON EQUAL 0)
        set(HAS_NEON ON CACHE BOOL "Architecture has NEON SIMD enabled")

cmake/modules/Findsndio.cmake

@@ -0,0 +1,42 @@
+# - Try to find sndio
+#
+#  SNDIO_FOUND - system has sndio
+#  SNDIO_LIBRARIES - location of the library for sndio
+#  SNDIO_INCLUDE_DIRS - location of the include files for sndio
+
+set(SNDIO_ROOT_DIR
+  "${SNDIO_ROOT_DIR}"
+  CACHE
+  PATH
+  "Directory to search for sndio")
+
+# no need to check pkg-config
+
+find_path(SNDIO_INCLUDE_DIRS
+  NAMES
+  sndio.h
+  PATHS
+  /usr/local/include
+  /usr/include
+  /opt/local/include
+  HINTS
+  ${SNDIO_ROOT_DIR}
+  )
+
+find_library(SNDIO_LIBRARIES
+  NAMES
+  sndio
+  PATHS
+  /usr/local/lib
+  /usr/lib
+  /usr/lib64
+  /opt/local/lib
+  HINTS
+  ${SNDIIO_ROOT_DIR}
+  )
+
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(SNDIO DEFAULT_MSG SNDIO_INCLUDE_DIRS SNDIO_LIBRARIES)
+
+mark_as_advanced(SNDIO_INCLUDE_DIRS SNDIO_LIBRARIES)

conf/99-direwolf-cmedia.rules

@@ -3,7 +3,7 @@
 #	$ ls -l /dev/hidraw*
 #	crw------- 1 root root 247, 0 Sep 24 09:40 /dev/hidraw0
 #
-# An ordinary user, trying to acccess it will be denied.
+# An ordinary user, trying to access it will be denied.
 #
 # Unnecessarily running applications as root is generally a bad idea because it makes it too easy
 # to accidentally trash your system.  We need to relax the restrictions so ordinary users can use these devices.

conf/generic.conf

@@ -263,10 +263,22 @@
 %C%
 %C%#DTMF
 %C%
-%C%#
-%C%# If not using a VOX circuit, the transmitter Push to Talk (PTT)
-%C%# control is usually wired to a serial port with a suitable interface circuit.
-%C%# DON'T connect it directly!
+%L%# If using a C-Media CM108/CM119 or similar USB Audio Adapter,
+%L%# you can use a GPIO pin for PTT control. This is very convenient
+%L%# because a single USB connection is used for both audio and PTT.
+%L%# Example:
+%L%
+%L%#PTT CM108
+%L%
+%W%# If using a C-Media CM108/CM119 or similar USB Audio Adapter,
+%W%# you can use a GPIO pin for PTT control. This is very convenient
+%W%# because a single USB connection is used for both audio and PTT.
+%W%# Example:
+%W%
+%W%#PTT CM108
+%W%%C%#
+%C%# The transmitter Push to Talk (PTT) control can be wired to a serial port
+%C%# with a suitable interface circuit.  DON'T connect it directly!
 %C%#
 %C%# For the PTT command, specify the device and either RTS or DTR.
 %C%# RTS or DTR may be preceded by "-" to invert the signal.