From 727782a04a6dedd00b35b581db3ed120543f518b Mon Sep 17 00:00:00 2001
From: Elena_Lukashova <elena.lukashova@eurecom.fr>
Date: Thu, 15 Jun 2017 12:05:32 +0200
Subject: [PATCH] Setting default use_sic_receiver, otherwise it was working
properly only with XFORMS enabled.
---
openair1/SIMULATION/LTE_PHY/dlsim_tm4.c | 21 +++++++++++++++------
1 file changed, 15 insertions(+), 6 deletions(-)
diff --git a/openair1/SIMULATION/LTE_PHY/dlsim_tm4.c b/openair1/SIMULATION/LTE_PHY/dlsim_tm4.c
index 16910580a8..64ddd9ac31 100644
--- a/openair1/SIMULATION/LTE_PHY/dlsim_tm4.c
+++ b/openair1/SIMULATION/LTE_PHY/dlsim_tm4.c
@@ -717,6 +717,11 @@ int main(int argc, char **argv)
exit(-1);
}
+ if (transmission_mode==4 && rx_type == rx_SIC_dual_stream )
+ use_sic_receiver = 1;
+ else if (transmission_mode==4 && rx_type == rx_IC_dual_stream )
+ use_sic_receiver = 0;
+
if (xforms==1) {
fl_initialize (&argc, argv, NULL, 0, 0);
@@ -725,15 +730,15 @@ int main(int argc, char **argv)
fl_show_form (form_ue->lte_phy_scope_ue, FL_PLACE_HOTSPOT, FL_FULLBORDER, title);
- if (transmission_mode==4 && rx_type == rx_SIC_dual_stream ) {
+ if (transmission_mode==4 && use_sic_receiver == 1) {
use_sic_receiver = 1;
fl_set_button(form_ue->button_0, use_sic_receiver);
fl_set_object_label(form_ue->button_0, "SIC Receiver ON");
- fl_set_object_color(form_ue->button_0, FL_RED, FL_RED);
- }else if (transmission_mode==4 && rx_type == rx_IC_dual_stream ){
+ fl_set_object_color(form_ue->button_0, FL_GREEN, FL_GREEN);
+ }else if (transmission_mode==4 && use_sic_receiver == 0 ){
use_sic_receiver = 0;
fl_set_button(form_ue->button_0, use_sic_receiver);
- fl_set_object_label(form_ue->button_0, "SIC Receiver ON");
+ fl_set_object_label(form_ue->button_0, "SIC Receiver OFF");
fl_set_object_color(form_ue->button_0, FL_RED, FL_RED);
}
@@ -3902,10 +3907,14 @@ int main(int argc, char **argv)
printf("[DLSIM 3 ] UE->dlsch[subframe&0x1][0][1]->pmi_alloc %d \n", UE->dlsch[subframe&0x1][0][1]->pmi_alloc);
#endif
- if (transmission_mode==4 && use_sic_receiver==1)
+ if (transmission_mode==4 && use_sic_receiver==1){
rx_type=rx_SIC_dual_stream;
- else if (transmission_mode==4 && use_sic_receiver==0)
+ //printf("I am using SIC!\n");
+ }
+ else if (transmission_mode==4 && use_sic_receiver==0){
rx_type=rx_IC_dual_stream;
+ //printf("I am using PIA!\n");
+ }
switch (transmission_mode) {
case 1:
--
GitLab