Delay-fix

.gitignore

@@ -2,7 +2,8 @@
 autom4te.cache
 src/*.o
 stamp-h1
-src/.deps
+.deps
+.dirstamp
 lib/kiss_fft129
 **/Makefile
 Makefile.in
@@ -11,9 +12,12 @@ build-aux
 configure
 config.log
 config.h
+config.h.in
 config.status
-src/odr-dabmod
+odr-dabmod
 .clang_complete
+build/
+import/
 
 .*.swp
 *~

.travis.yml

@@ -0,0 +1,29 @@
+language: c++
+sudo: required
+dist: trusty
+
+addons: &addons
+  apt:
+    packages: &packages
+      - libzmq3-dev
+      - libzmq3
+      - automake
+      - libtool
+      - libboost1.55-all-dev
+      - libcurl4-openssl-dev
+      - libfftw3-dev
+      # libuhd-dev is not allowed
+
+compiler:
+  - clang
+
+script:
+  - |
+    ./bootstrap.sh
+    CC=clang CXX=clang++ ./configure --disable-zeromq --disable-output-uhd
+    make
+  - |
+    ./bootstrap.sh
+    CC=clang CXX=clang++ ./configure --disable-output-uhd
+    make
+

AUTHORS

@@ -10,3 +10,12 @@ Matthias P. Braendli <matthias [at] mpb [dot] li>
     - Improvements in logging (log to file, to syslog)
     - ZeroMQ ETI input
     - Telnet remote-control
+    - ZeroMQ I/Q output
+    - I/Q conversion to signed 8-bit
+    - ARM support
+    - GPSDO monitoring on USRPs
+    - TII
+
+Jörgen Scott
+    - ZeroMQ remote control
+    - Static delay offset

CMAKE_INSTALL

@@ -0,0 +1,67 @@
+General:
+======================
+	The CMake build of the odr-dabmod provides an alternative to the auto make tools build system (described in INSTALL) and provides:
+	* Static linking of boost and zeromq, avoiding version conflicts in case the system contains other version of these libraries
+	* Enables cross platform builds
+
+Required dependencies:
+======================
+	See INSTALL.
+
+Prerequisites
+======================
+	CMake
+	=====
+	Make sure CMake is installed in your system.
+
+	Boost
+	=====
+	Boost is statically linked into the odr-dabmod, and because of that it needs a little special attention.
+
+	Download desired version of boost from www.boost.org and extract to any directory, e.g. /home/user/thirdpart/boost/
+
+	A one-time build of the tool b2/bjam is also needed. Run bootstrap within the BOOST_ROOT-folder.
+
+	Configure the BOOST_ROOT environment variable to point to the root folder of the Boost file tree.
+
+	E.g. Linux
+	Add the variable in the ~/.bash_profile file.
+
+	TEMPLATE_BOOST_ROOT="/home/user/thirdpart/boost/boost_1_59_0"
+	export TEMPLATE_BOOST_ROOT
+
+	ZeroMQ
+	=====
+	ZeroMQ is statically linked into the odr-dabmod, and because of that it needs a little special attention.
+	Download desired version of ZeroMQ from https://github.com/zeromq (either by git clone or download the zip file).
+	It's recommended that the stable release branch is used e.g. https://github.com/zeromq/zeromq4-x.
+
+	NOTE: The archive files from http://download.zeromq.org/ cannot be used as they do not contain CMake build projects.
+
+	We also need to configure the ZMQ_ROOT environment variable to point to the root folder of the ZeroMQ file tree.
+
+	E.g. Linux
+	Add the variable in the ~/.bash_profile file.
+
+	ZMQ_ROOT="/home/user/thirdpart/zeromq4-x
+	export ZMQ_ROOT
+
+Build procedure:
+=========================
+	Download the odr-dabmod (see INSTALL)
+	Within the odr-dabmod root directory do:
+	$ mkdir build && cd build
+	$ cmake ..
+	$ make
+	$ make install
+
+Configure options
+=================
+	Some options can be given to cmake command:
+	# common options
+	Provide an install directory: -DCMAKE_INSTALL_PREFIX=/my/install/dir
+	Release or debug builds: -DCMAKE_BUILD_TYPE=Release|Debug
+
+	# odr-dabmod options
+	Use FFTW3 library (default=off, kiss_fft is used by default): -DFFTW3=on
+	Support UHD output (defailt=on): -DUHD=off

CMakeLists.txt

@@ -0,0 +1,116 @@
+cmake_minimum_required (VERSION 2.8)
+set(APP_NAME odr-dabmod)
+project(${APP_NAME})
+
+message("Current configuration: ${CMAKE_BUILD_TYPE}")
+
+set(CMAKE_BINARY_DIR ${CMAKE_SOURCE_DIR}/build)
+set(EXECUTABLE_OUTPUT_PATH ${CMAKE_BINARY_DIR})
+set(LIBRARY_OUTPUT_PATH ${CMAKE_BINARY_DIR})
+set(CMAKE_INCLUDE_DIR ${PROJECT_SOURCE_DIR}/cmake)
+
+### Boost ###
+option(BOOST_STATIC "Static linking of boost libraries" OFF)
+if (BOOST_STATIC)
+	message(STATUS "Static linking of boost libraries from " $ENV{BOOST_ROOT})
+endif()
+
+if (BOOST_STATIC)
+	# Boost libs to use, must be set before including boost.txt.
+	set(project_boost_libs 
+		system 
+		thread
+	)
+	include(${CMAKE_INCLUDE_DIR}/boost.txt) 
+	set(PROJECT_INCLUDE_DIR
+		${PROJECT_INCLUDE_DIR}
+		$ENV{BOOST_ROOT}
+		)
+else()
+	set(BOOST_USE_STATIC_LIBS OFF)
+	set(BOOST_USE_MULTITHREADED ON)
+	set(BOOST_MIN_VERSION 1.55)
+	find_package(Boost ${BOOST_MIN_VERSION} REQUIRED 
+		thread 
+		system 
+	)
+	set(LIBBOOST_LIBS ${Boost_LIBRARIES})
+		set(PROJECT_INCLUDE_DIR
+			${PROJECT_INCLUDE_DIR}
+			${Boost_INCLUDE_DIRS}
+			)
+endif()
+### Boost ###
+
+message ("")
+
+### ZeroMQ ###
+option(ZMQ "Support ZeroMQ" ON)
+option(ZMQ_STATIC "Static linking of ZeroMQ" ON)
+if (ZMQ)
+	message(STATUS "Supports ZeroMQ")
+	add_definitions(-DHAVE_ZEROMQ)
+	if (ZMQ_STATIC)
+		message(STATUS "Static linking of ZeroMQ from " $ENV{ZMQ_ROOT})
+		# A trick to force CMAKE to look here first, before any system-path like /usr/lib/ which otherwise would have precedence.
+		set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -I$ENV{ZMQ_ROOT}/include -I$ENV{ZMQ_ROOT}/cppzmq")
+		set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -I$ENV{ZMQ_ROOT}/include -I$ENV{ZMQ_ROOT}/cppzmq")
+		include(${CMAKE_INCLUDE_DIR}/zeromq.txt)
+		set(PROJECT_INCLUDE_DIR
+			${PROJECT_INCLUDE_DIR}
+			$ENV{ZMQ_ROOT})
+		add_definitions(-DZMQ_STATIC)
+	else()
+		set(ZEROMQ zmq)
+	endif()
+endif()
+### ZeroMQ ###
+
+message ("")
+
+### FFT ###
+# defaults to kiss_fft in case of off
+include(${CMAKE_INCLUDE_DIR}/kissfft.txt)
+option(FFTW3 "Uses FFTW3 fft library" ON)
+if (FFTW3)
+	message(STATUS "Uses FFTW3")
+	include(${CMAKE_INCLUDE_DIR}/fftw.txt) 
+endif()
+### FFT ###
+
+message ("")
+
+### UHD ###
+option(UHD "Support uhd output" ON)
+if (UHD)
+	message(STATUS "Supports uhd output")
+	include(${CMAKE_INCLUDE_DIR}/uhd.txt) 
+endif()
+### UHD ###
+
+# get version from git describe
+exec_program(
+    "git"
+    ${CMAKE_CURRENT_SOURCE_DIR}
+    ARGS "describe"
+    OUTPUT_VARIABLE VERSION )
+
+message ("")
+message(STATUS "App name:  ${APP_NAME}")
+message(STATUS "Building version:  ${VERSION}")
+
+# some common definitions
+add_definitions(
+	-D_SCL_SECURE_NO_WARNINGS
+	-DHAVE_BZERO
+	-DHAVE_GETTIMEOFDAY
+	-DPACKAGE="odrdabmod"
+	-DGITVERSION="${VERSION}"
+	-UNDEBUG
+)
+
+include_directories("${PROJECT_INCLUDE_DIR}")
+include_directories("${PROJECT_SOURCE_DIR}")
+
+add_subdirectory(src)
+

ChangeLog

@@ -1,5 +1,50 @@
 This file contains information about the changes done to
-the ODR-DabMod in this repository
+ODR-DabMod in this repository
+
+2016-07-30: Matthias P. Braendli <[email protected]>
+	(v0.6.0):
+	* odr-dabmod:
+		Remove the broken KISS FFT support.
+		Replace FCT discontinuity check by verification of
+		the timestamps.
+		Change DSP thread priorities to realtime.
+		Quite some internal refactoring.
+		Fix segfault on quit due to incorrect teardown of FFTW.
+		Add Travis CI build instructions.
+
+2015-11-27: Matthias P. Braendli <[email protected]>
+	(v0.5.5):
+	* odr-dabmod:
+		Fix compile errors with recent C++ standard library.
+		Correct command line options when using UHD and ZMQ input.
+		Enable ZeroMQ be default in ./configure
+
+2015-09-18: Matthias P. Braendli <[email protected]>
+	(v0.5.4)
+	* odr-dabmod:
+		Better GPSDO handling, both for Ettus GPSDO
+		and ODR LEA-M8F board.
+		Add (experimental) TII support.
+		Improve thread priority definition.
+		Simplify handling of TIST offset, and add to RC.
+		Switch projecet to C++11.
+
+2015-07-24: Matthias P. Braendli <[email protected]>
+	(v0.5.3)
+	* odr-dabmod:
+		Replace zmq.hpp to support version 4.1.x
+
+2015-04-10: Matthias P. Braendli <[email protected]>
+	(v0.5.2)
+	* odr-dabmod:
+		Merge static delay parameter and ZeroMQ remote control.
+		Add max_frames_queued option for ZeroMQ input.
+		Restart modulator on FCT discontinuity or ZeroMQ input
+		buffer overrun.
+		Improve error messages and documentation.
+		Add ZeroMQ output REP socket type for interconnection with
+		GNURadio.
+		Fix license text in usage view.
 
 2015-01-24: Matthias P. Braendli <[email protected]>
 	(v0.5.1)

INSTALL

@@ -1,17 +1,18 @@
 Required dependencies:
 ======================
 
+    * A C++11 capable compiler
     * Boost 1.41 or later
+    * FFTW 3.x
     * Optional UHD for USRP
     * Optional ZeroMQ http://www.zeromq.org
-    * Optional FFTW 3.x (included KISS FFT is used as fallback)
 
 Simple install procedure:
 =========================
 
     % tar xjf odr-dabmod-X.Y.Z.tar.bz2      # Unpack the source
     % cd odr-dabmod-X.Y.Z                   # Change to the source directory
-    % ./configure --enable-zeromq --enable-output-uhd
+    % ./configure
                                             # Run the configure script
     % make                                  # Build ODR-DabMod
     [ as root ]
@@ -21,17 +22,9 @@ Configure options
 =================
 The configure script can be launch with a variety of options:
 
- --enable-zeromq        Enable ZeroMQ input (to be used with ODR-DabMux),
+ --disable-zeromq       Disable ZeroMQ input (to be used with ODR-DabMux),
                         output and remotecontrol.
- --enable-output-uhd    Includes the binding to the UHD driver for USRPs
-
-You have the choice between two FFT libraries: KISS FFT and FFTW. KISS FFT is a
-proven library, but it's performance is worse than with the new FFTW. With KISS
-FFT, you have the choice between using the normal version, or the SIMD
-accelerated version, which is a bit faster. The corresponding options are:
-
- --enable-kiss-fft      Prefer KISS FFT over FFTW
- --enable-fft-simd      Enable SIMD instructions for KISS FFT
+ --disable-output-uhd   Disable the binding to the UHD driver for USRPs
 
 Debugging options: You should not enable debug if you need good performance.
 By default, debug is disabled.