Merge branch 'develop' into feature-34-test_framework

cmake_targets/tools/build_helper

@@ -163,33 +163,22 @@ install_gnutls_from_source(){
 
 
 check_install_usrp_uhd_driver(){
-        log_file=$OPENAIR_DIR/cmake_targets/log/check_install_usrp_uhd_driver_log.txt
-        echo_info "\nIn function: check_install_usrp_uhd_driver(). Installing USRP Drivers : The logfile for the installation is located here: $log_file "
-        (
         v=$(lsb_release -cs)
         $SUDO apt-add-repository "deb http://files.ettus.com/binaries/uhd/repo/uhd/ubuntu/$v $v main"
         $SUDO apt-get update
         $SUDO apt-get -y install  python python-tk libboost-all-dev libusb-1.0-0-dev
         $SUDO apt-get -y install -t `lsb_release -cs` uhd --force-yes
-        ) >& $log_file
 }
 check_install_bladerf_driver(){
-        log_file=$OPENAIR_DIR/cmake_targets/log/check_install_bladerf_driver_log.txt
-        echo_info "\nIn function: check_install_bladerf_driver(). Install BLADERF drivers : The logfile for the installation is located here: $log_file "
-        (
 	$SUDO add-apt-repository -y ppa:bladerf/bladerf
 	$SUDO apt-get update
 	$SUDO apt-get install -y bladerf libbladerf-dev
 	$SUDO apt-get install -y bladerf-firmware-fx3
 	$SUDO apt-get install -y bladerf-fpga-hostedx40	
 	bladeRF-cli --flash-firmware /usr/share/Nuand/bladeRF/bladeRF_fw.img	
-        ) >& $log_file
 }
 
 check_install_additional_tools (){
-    log_file=$OPENAIR_DIR/cmake_targets/log/check_install_additional_tools_log.txt
-    echo_info "\nIn function: check_install_oai_software(). Installing optional OAI packages : The logfile for the installation is located here: $log_file "
-    (
     $SUDO apt-get update
     $SUDO apt-get install -y \
 	check \
@@ -199,7 +188,6 @@ check_install_additional_tools (){
 	libboost-all-dev \
 	libpthread-stubs0-dev \
 	openvpn \
-	phpmyadmin \
 	pkg-config \
 	python-dev  \
 	python-pexpect \
@@ -212,14 +200,9 @@ check_install_additional_tools (){
 	vlan	  \
 	ctags \
         ntpdate
-      ) >& $log_file
 }
 
 check_install_oai_software() {
-    
-    log_file=$OPENAIR_DIR/cmake_targets/log/check_install_oai_software_log.txt
-    echo_info "\nIn function: check_install_oai_software(). Installing mandatory OAI packages : The logfile for the installation is located here: $log_file "
-    (
     $SUDO apt-get update
     $SUDO apt-get install -y \
 	autoconf  \
@@ -291,7 +274,6 @@ check_install_oai_software() {
     fi
     $SUDO pip install paramiko
     $SUDO pip install pyroute2
-    ) > $log_file 2>&1
     install_asn1c_from_source
     $SUDO rm -fr /opt/ssh
     $SUDO git clone https://gist.github.com/2190472.git /opt/ssh

openair1/SIMULATION/LTE_PHY/mbmssim.c

@@ -47,8 +47,7 @@
 #include "LAYER2/MAC/vars.h"
 
 #ifdef XFORMS
-#include <forms.h>
-#include "../../USERSPACE_TOOLS/SCOPE/lte_scope.h"
+#include "PHY/TOOLS/lte_phy_scope.h"
 #endif //XFORMS
 
 
@@ -176,13 +175,13 @@ int main(int argc, char **argv)
 
 
 #ifdef XFORMS
-  FD_lte_scope *form_dl;
+  FD_lte_phy_scope_ue *form_ue;
   char title[255];
 
   fl_initialize (&argc, argv, NULL, 0, 0);
-  form_dl = create_form_lte_scope();
+  form_ue = create_lte_phy_scope_ue();
   sprintf (title, "LTE DL SCOPE UE");
-  fl_show_form (form_dl->lte_scope, FL_PLACE_HOTSPOT, FL_FULLBORDER, title);
+  fl_show_form (form_ue->lte_phy_scope_ue, FL_PLACE_HOTSPOT, FL_FULLBORDER, title);
 #endif
 
   logInit();