From 873e42612ad0dff8ca6f7f76a6e92041734e6674 Mon Sep 17 00:00:00 2001
From: Laurent Thomas <lts@open-cells.com>
Date: Tue, 6 Apr 2021 21:32:19 +0200
Subject: [PATCH] merge develop, documentation fix

---
 common/utils/threadPool/thread-pool.md                   | 6 +++---
 executables/nr-ru.c                                      | 2 +-
 .../CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf          | 9 ---------
 3 files changed, 4 insertions(+), 13 deletions(-)

diff --git a/common/utils/threadPool/thread-pool.md b/common/utils/threadPool/thread-pool.md
index a087b989fa..80f3b99446 100644
--- a/common/utils/threadPool/thread-pool.md
+++ b/common/utils/threadPool/thread-pool.md
@@ -210,8 +210,8 @@ time the worker finished the job
 time the client reads the result
 
 if you set the environement variable:
-thread-pool-measurements to a valid file name
+threadPoolMeasurements to a valid file name
 These measurements will be wrote to this Linux pipe.
 
-A tool to read the linux fifo and display it in ascii is provided:
-see the local directory Makefile for this tool and to compile the thread pool unitary tests.
+A tool to read the linux fifo and display it in ascii is provided; compute the binay:
+in cmake building directory: make/ninja measurement_display
\ No newline at end of file
diff --git a/executables/nr-ru.c b/executables/nr-ru.c
index b059c6f4e8..6aa21613da 100644
--- a/executables/nr-ru.c
+++ b/executables/nr-ru.c
@@ -1390,7 +1390,7 @@ void *ru_thread( void *param ) {
     syncMsg->frame_tx = proc->frame_tx;
     syncMsg->slot_tx = proc->tti_tx;
     syncMsg->timestamp_tx = proc->timestamp_tx;
-    res->key = proc->tti_rx;
+    res->key = 3000+proc->tti_rx;
     pushTpool(gNB->threadPool, res);
 
   }
diff --git a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
index 96df4a971f..535db82dfc 100644
--- a/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
+++ b/targets/PROJECTS/GENERIC-NR-5GC/CONF/gnb.sa.band78.fr1.106PRB.usrpb210.conf
@@ -282,15 +282,6 @@ THREAD_STRUCT = (
   }
 );
 
-rfsimulator :
-{
-    serveraddr = "server";
-    serverport = "4043";
-    options = (); #("saviq"); or/and "chanmod"
-    modelname = "AWGN";
-    IQfile = "/tmp/rfsimulator.iqs";
-};
-
      log_config :
      {
        global_log_level                      ="info";