Merge branch 'next_memless' into next

2 files changed, 23 insertions, 3 deletions

diff --git a/doc/example.ini b/doc/example.ini
index 1b4a2b4..425dfa4 100644
--- a/doc/example.ini
+++ b/doc/example.ini
@@ -136,6 +136,21 @@ enabled=1
 ; If filtertapsfile is not given, the default taps are used.
 ;filtertapsfile=simple_taps.txt
 
+[poly]
+;Predistortion using memoryless polynom
+enabled=1
+polycoeffile=polyCoefs
+;eg:
+;echo "8
+;0.1
+;0
+;0
+;0
+;0
+;0
+;0
+;0" > polyCoefs
+
 [output]
 ; choose output: possible values: uhd, file, zmq, soapysdr
 output=uhd
@@ -245,6 +260,11 @@ behaviour_refclk_lock_lost=ignore
 ; default value: 0
 max_gps_holdover_time=600
 
+; Enable the TCP server to communicate TX and RX feedback for
+; digital predistortion.
+; Set to 0 to disable
+dpd_port=50055
+
 ; section defining ZeroMQ output properties
 [zmqoutput]
 
diff --git a/doc/zmq-ctrl/zmq_remote.py b/doc/zmq-ctrl/zmq_remote.py
index dffe53e..3a54b20 100755
--- a/doc/zmq-ctrl/zmq_remote.py
+++ b/doc/zmq-ctrl/zmq_remote.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python2
+#!/usr/bin/env python
 
 import sys
 import zmq
@@ -18,7 +18,7 @@ message_parts = sys.argv[2:]
 # first do a ping test
 
 print("ping")
-sock.send("ping")
+sock.send(b"ping")
 data = sock.recv_multipart()
 print("Received: {}".format(len(data)))
 for i,part in enumerate(data):
@@ -32,7 +32,7 @@ for i, part in enumerate(message_parts):
 
     print("Send {}({}): '{}'".format(i, f, part))
 
-    sock.send(part, flags=f)
+    sock.send(part.encode(), flags=f)
 
 data = sock.recv_multipart()