Merged latest develop to nfapi

2020-11-19 22:33:39 +05:30
parent 7c110d7745 40141270e3
commit 87105d77cf
424 changed files with 26528 additions and 12403 deletions
@@ -957,7 +957,11 @@ if(!IS_SOFTMODEM_NOS1)
  // once all RUs are ready initialize the rest of the gNBs ((dependence on final RU parameters after configuration)
  printf("ALL RUs ready - init gNBs\n");
  if(IS_SOFTMODEM_DOFORMS) {
+<<<<<<< HEAD
  	
+=======
+    sleep(1);	
+>>>>>>> fork_develop_new
    scopeParms_t p;
    p.argc=&argc;
    p.argv=argv;