Merge remote-tracking branch 'origin/develop' into fhg-fdd-custom-if

2020-11-10 10:41:10 +01:00
parent 5903467849 3d60e95387
commit 7e1ac1fa49
84 changed files with 5137 additions and 2081 deletions
@@ -554,6 +554,14 @@ int main( int argc, char **argv ) {
    init_symbol_rotation(&UE[CC_id]->frame_parms, UE[CC_id]->frame_parms.dl_CarrierFreq);
    init_nr_ue_vars(UE[CC_id], 0, abstraction_flag);

+    #ifdef FR2_TEST
+    // Overwrite DL frequency (for FR2 testing)
+    if (downlink_frequency[0][0]!=0){
+      frame_parms[CC_id]->dl_CarrierFreq = downlink_frequency[0][0];
+      if (frame_parms[CC_id]->frame_type == TDD)
+        frame_parms[CC_id]->ul_CarrierFreq = downlink_frequency[0][0];
+    }
+    #endif
  }

  init_openair0();