diff --git a/apps/generator/forms.py b/apps/generator/forms.py
index a7345a1..f94336d 100644
--- a/apps/generator/forms.py
+++ b/apps/generator/forms.py
@@ -24,10 +24,10 @@ class GeneratorConfigurationForm(forms.ModelForm):
         if instance and instance.pk:
 
             devices = Device.objects.filter(device_type__name='generator')
-            if instance.experiment:
-                self.fields['experiment'].widget.attrs['read_only'] = True
+            #if instance.experiment:
+                #self.fields['experiment'].widget.attrs['read_only'] = True
                 #self.fields['experiment'].widget.choices = [(instance.experiment.id, instance.experiment)]
-            self.fields['device'].widget.choices = [(device.id, device) for device in devices]
+            #self.fields['device'].widget.choices = [(device.id, device) for device in devices]
 
         if 'initial' in kwargs and 'experiment' in kwargs['initial'] and kwargs['initial']['experiment'] not in (0, '0'):
             self.fields['experiment'].widget.attrs['readonly'] = True
diff --git a/apps/main/forms.py b/apps/main/forms.py
index a097190..a1c4194 100644
--- a/apps/main/forms.py
+++ b/apps/main/forms.py
@@ -79,6 +79,23 @@ class ExperimentForm(forms.ModelForm):
     class Meta:
         model = Experiment
         exclude = ['task', 'status', 'author', 'hash']
+    
+class ExperimentEditionForm(forms.ModelForm):
+
+    def __init__(self, *args, **kwargs):
+        super(ExperimentEditionForm, self).__init__(*args, **kwargs)
+        #self.fields['start_time'].widget = TimepickerWidget(self.fields['start_time'].widget.attrs)
+        #self.fields['end_time'].widget   = TimepickerWidget(self.fields['end_time'].widget.attrs)
+
+    def save(self, *args, **kwargs):
+        exp      = super(ExperimentEditionForm, self).save(*args, **kwargs)
+        exp.name = exp.name.replace(' ', '')
+        exp.save()
+        return exp
+
+    class Meta:
+        model = Experiment
+        exclude = ['pedestal', 'generator', 'task', 'status', 'author', 'hash']
 
 class LocationForm(forms.ModelForm):
     class Meta:
@@ -111,7 +128,7 @@ class DownloadFileForm(forms.Form):
     format = forms.ChoiceField(choices= ((0, 'json'),) )
 
     def __init__(self, device_type, *args, **kwargs):
-
+        
         super(DownloadFileForm, self).__init__(*args, **kwargs)
 
         self.fields['format'].choices = FILE_FORMAT
diff --git a/apps/main/models.py b/apps/main/models.py
index 010ed62..ae45928 100644
--- a/apps/main/models.py
+++ b/apps/main/models.py
@@ -152,7 +152,7 @@ class Device(models.Model):
         if self.status == 0:
             color = "danger"
         elif self.status == 1:
-            color = "warning"
+            color = "primary"
         elif self.status == 2:
             color = "info"
         elif self.status == 3:
@@ -328,7 +328,7 @@ class RunningExperiment(models.Model):
     status             = models.PositiveSmallIntegerField(default=0, choices=RADAR_STATES)
 
 
-class Experiment(models.Model):
+class Experiment(PolymorphicModel):
     
     template   = models.BooleanField(default=False)
     name       = models.CharField(max_length=40, default='', unique=True)
@@ -336,10 +336,13 @@ class Experiment(models.Model):
     #freq       = models.FloatField(verbose_name='Operating Freq. (MHz)', validators=[MinValueValidator(1), MaxValueValidator(10000)], default=49.9200)
     #start_time = models.TimeField(default='00:00:00')
     #end_time   = models.TimeField(default='23:59:59')
-    pedestal   = models.ForeignKey('pedestal.PedestalConfiguration', null=False, blank=False, on_delete=models.CASCADE, default=None, related_name = "pedestal_conf")
+    pedestal   = models.ForeignKey('pedestal.PedestalConfiguration', null=False, blank=False, on_delete=models.PROTECT, default=None, related_name = "pedestal_conf")
+    generator = models.ForeignKey('Device', null=False, blank=False, on_delete=models.PROTECT, default=None, limit_choices_to={'device_type__name': 'generator'}, related_name = "generator_conf")
+    reception_rx    = models.ForeignKey('usrp_rx.USRPRXConfiguration', null=False, blank=False, on_delete=models.PROTECT, default=None, related_name = "usrp_rx_CONF")
+    transmission_tx = models.ForeignKey('usrp_tx.USRPTXConfiguration', null=False, blank=False, on_delete=models.PROTECT, default=None, related_name = "usrp_tx")
     task       = models.CharField(max_length=36, default='', blank=True, null=True)
     status     = models.PositiveSmallIntegerField(default=4, choices=EXP_STATES)
-    author     = models.ForeignKey(User, null=True, blank=True,on_delete=models.CASCADE)
+    author     = models.ForeignKey(User, null=True, blank=True, on_delete=models.CASCADE)
     hash       = models.CharField(default='', max_length=64, null=True, blank=True)
 
     class Meta:
@@ -394,21 +397,33 @@ class Experiment(models.Model):
         '''
         Configure and start experiments's devices
         '''
-
-        confs = []
-        allconfs = Configuration.objects.filter(experiment=self, type = 0).order_by('-device__device_type__sequence')
-        confs = allconfs
+        #confs = []
+        #allconfs = Configuration.objects.filter(experiment=self, type = 0).order_by('-device__device_type__sequence')
+        #confs = allconfs
+        experiment = get_object_or_404(Experiment, pk=self.id)
+        id_p = experiment.pedestal_id
+        id_rx = experiment.reception_rx_id
+        id_tx = experiment.transmission_tx_id
+        generator_periode = 1 /experiment.transmission_tx.frequency
+        generator_delay = experiment.transmission_tx.delay_1
+        generator_width = int((experiment.transmission_tx.ipp * 2 / 300000) * 1000000) * experiment.transmission_tx.pulse_1 / 100
+        print(generator_width)
+        generator_selector = 1
 
         try:
-            for conf in confs:
-                conf.stop_device()
-                print("OK")
-                #conf.write_device()
-                conf.device.conf_active = conf.pk
-                conf.device.save()
-                conf.start_device()
-                print("OK")
-                time.sleep(1)
+            print("Hola")
+            #Configuration.objects.get(id = id_rx).start_device()
+            #Configuration.objects.get(id = id_p).start_device()
+            #Configuration.objects.get(id = id_tx).start_device()
+            # for conf in confs:
+            #     conf.stop_device()
+            #     print("OK")
+            #     #conf.write_device()
+            #     conf.device.conf_active = conf.pk
+            #     conf.device.save()
+            #     conf.start_device()
+            #     print("OK")
+            #     time.sleep(1)
         except:
             return 0
         return 2
@@ -420,10 +435,18 @@ class Experiment(models.Model):
         PEDESTAL, PULSE GENERATOR & USRP's
         '''
 
-        confs = Configuration.objects.filter(experiment=self, type = 0).order_by('device__device_type__sequence')
+        #confs = Configuration.objects.filter(experiment=self, type = 0).order_by('device__device_type__sequence')
+        experiment = get_object_or_404(Experiment, pk=self.id)
+        id_p = experiment.pedestal_id
+        id_rx = experiment.reception_rx_id
+        id_tx = experiment.transmission_tx_id
+
         try:
-            for conf in confs:
-                conf.stop_device()
+            Configuration.objects.get(id = id_rx).stop_device()
+            Configuration.objects.get(id = id_p).stop_device()
+            Configuration.objects.get(id = id_tx).stop_device()
+        #   for conf in confs:
+        #       conf.stop_device()
         except:
             return 0
         return 1
@@ -537,7 +560,6 @@ class Configuration(PolymorphicModel):
     # name          = models.CharField(verbose_name="Configuration Name", max_length=40, default='')
     device          = models.ForeignKey('Device', verbose_name='Device', null=True, on_delete=models.CASCADE)
     label           = models.CharField(verbose_name="Label", max_length=40, default='', blank=False, null=False)
-    experiment      = models.ForeignKey('Experiment', verbose_name='Experiment', null=True, blank=True, on_delete=models.CASCADE)
     type            = models.PositiveSmallIntegerField(default=0, choices=CONF_TYPES)
     created_date    = models.DateTimeField(auto_now_add=True)
     programmed_date = models.DateTimeField(auto_now=True)
@@ -577,7 +599,7 @@ class Configuration(PolymorphicModel):
 
         ignored = ('type', 'polymorphic_ctype', 'configuration_ptr',
                    'created_date', 'programmed_date', 'template', 'device',
-                   'experiment')
+                   'experiment', 'author')
 
         for field in self._meta.fields:
             if field.name in ignored:
@@ -653,6 +675,7 @@ class Configuration(PolymorphicModel):
             content_type = 'application/json'
             filename = '%s_%s.json' %(self.device.device_type.name, self.name)
             content = json.dumps(self.parms_to_dict(), indent=2)
+            print(content)
 
         fields = {'content_type':content_type,
                   'filename':filename,
@@ -674,31 +697,31 @@ class Configuration(PolymorphicModel):
 
     def status_device(self):
 
-        self.message = 'Function not implemented'
+        self.message = 'Function not supported'
         return False
 
 
     def stop_device(self):
 
-        self.message = 'Function not implemented'
+        self.message = 'Function not supported'
         return False
 
 
     def start_device(self):
-
-        self.message = 'Function not implemented'
+        
+        self.message = 'Function not supported'
         return False
 
 
     def write_device(self):
 
-        self.message = 'Function not implemented'
+        self.message = 'Function not supported'
         return False
 
 
     def read_device(self):
 
-        self.message = 'Function not implemented'
+        self.message = 'Function not supported'
         return False
 
 
diff --git a/apps/main/templates/base.html b/apps/main/templates/base.html
index 0c9a0f8..bdaf4c8 100644
--- a/apps/main/templates/base.html
+++ b/apps/main/templates/base.html
@@ -77,6 +77,7 @@
 
       <div class="page-header">
         <h1>{% block content-title %}{% endblock %} <small>{% block content-suptitle %}{% endblock %}</small></h1>
+        <br>
         </div>
         {% block messages %}
           {% if messages %}
diff --git a/apps/main/templates/base_edit.html b/apps/main/templates/base_edit.html
index 637f9bf..4129a38 100644
--- a/apps/main/templates/base_edit.html
+++ b/apps/main/templates/base_edit.html
@@ -19,6 +19,20 @@
     {% endblock %}
   {% else %}
     {% bootstrap_form form layout='horizontal' size='medium' %}
+      {% if form_pedestal %}
+        <br>
+        <h1>Pedestal</h1> 
+        <br>
+        {% bootstrap_form form_pedestal layout='horizontal' size='medium' %}
+        <br>
+        <h1>RX</h1> 
+        <br>
+        {% bootstrap_form form_rx layout='horizontal' size='medium' %}
+        <br>
+        <h1>TX</h1> 
+        <br>
+        {% bootstrap_form form_tx layout='horizontal' size='medium' %}
+      {% endif %}
   {% endif %}
   
   <div style="clear: both;"></div>
diff --git a/apps/main/templates/experiment_edit.html b/apps/main/templates/experiment_edit.html
index 9d7ec2f..2e26863 100644
--- a/apps/main/templates/experiment_edit.html
+++ b/apps/main/templates/experiment_edit.html
@@ -7,6 +7,7 @@
 {% endblock %}
 
 {% block extra-js%}
+
 <script src="{% static 'js/bootstrap-datetimepicker.min.js' %}"></script>
 <script type="text/javascript">
 
diff --git a/apps/main/views.py b/apps/main/views.py
index 87f3c93..7e06217 100644
--- a/apps/main/views.py
+++ b/apps/main/views.py
@@ -20,14 +20,14 @@ try:
 except ImportError:
     from urllib import urlencode
 
-from .forms import CampaignForm, ExperimentForm, DeviceForm, ConfigurationForm, LocationForm, UploadFileForm, DownloadFileForm, OperationForm, NewForm
+from .forms import CampaignForm, ExperimentForm, ExperimentEditionForm, DeviceForm, ConfigurationForm, LocationForm, UploadFileForm, DownloadFileForm, OperationForm, NewForm
 from .forms import OperationSearchForm, FilterForm, ChangeIpForm
 
-from apps.pedestal.forms import PedestalConfigurationForm
+from apps.pedestal.forms import PedestalConfigurationForm, PedestalEditionForm
 from apps.pedestal_dev.forms import PedestalDevConfigurationForm
 from apps.generator.forms import GeneratorConfigurationForm
-from apps.usrp_rx.forms import USRPRXConfigurationForm
-from apps.usrp_tx.forms import USRPTXConfigurationForm
+from apps.usrp_rx.forms import USRPRXConfigurationForm, USRPRXEditionForm
+from apps.usrp_tx.forms import USRPTXConfigurationForm, USRPTXEditionForm
 from .utils import Params
 
 from .models              import Campaign, Experiment, Device, Configuration, Location, RunningExperiment, DEV_STATES
@@ -259,7 +259,7 @@ def device_new(request):
 
 @login_required
 def device_edit(request, id_dev):
-
+    
     device = get_object_or_404(Device, pk=id_dev)
 
     if request.method == 'GET':
@@ -576,7 +576,7 @@ def experiments(request):
 
     form = FilterForm(initial=request.GET, extra_fields=fields)
 
-    kwargs['keys'] = ['name', 'radar_system', 'actions']
+    kwargs['keys'] = ['name', 'radar_system', 'pedestal', 'generator', 'reception_rx', 'transmission_tx', 'actions']
     kwargs['title'] = 'Experiment'
     kwargs['suptitle'] = 'List'
     kwargs['no_sidebar'] = True
@@ -593,13 +593,12 @@ def experiments(request):
 def experiment(request, id_exp):
 
     experiment = get_object_or_404(Experiment, pk=id_exp)
-    
-    configurations = Configuration.objects.filter(
-        experiment=experiment, type=0)
 
+    #experiment = Experiment.objects.select_related('pedestal').get(pk=id_exp)
+    configurations = PedestalConfiguration.objects.filter(id = experiment.pedestal_id)
     kwargs = {}
 
-    kwargs['experiment_keys'] = ['template', 'radar_system', 'name']
+    kwargs['experiment_keys'] = ['template', 'radar_system', 'name', 'pedestal', 'generator', 'reception_rx', 'transmission_tx']
     kwargs['experiment'] = experiment
     kwargs['configuration_keys'] = ['name', 'device__ip_address',
                                     'device__port_address', 'device__status']
@@ -608,7 +607,7 @@ def experiment(request, id_exp):
     kwargs['suptitle'] = 'Details'
     kwargs['button'] = 'Add Configuration'
     kwargs['menu_experiments'] = 'active'
-
+    #print(kwargs)
     ###### SIDEBAR ######
     kwargs.update(sidebar(experiment=experiment))
 
@@ -617,7 +616,7 @@ def experiment(request, id_exp):
 
 @login_required
 def experiment_new(request, id_camp=None):
-
+    
     if not is_developer(request.user):
         messages.error(
             request, 'Developer required, to create new Experiments')
@@ -672,19 +671,39 @@ def experiment_new(request, id_camp=None):
 def experiment_edit(request, id_exp):
 
     experiment = get_object_or_404(Experiment, pk=id_exp)
+    id_p = experiment.pedestal_id
+    id_rx = experiment.reception_rx_id
+    id_tx = experiment.transmission_tx_id
+    #print(id_p)
+    #configurations = get_object_or_404(PedestalConfiguration, id = id_p)
+    conf_pedestal = PedestalConfiguration.objects.get(id = id_p)
+    conf_rx = USRPRXConfiguration.objects.get(id = id_rx)
+    conf_tx = USRPTXConfiguration.objects.get(id = id_tx)
 
     if request.method == 'GET':
-        form = ExperimentForm(instance=experiment)
+        form = ExperimentEditionForm(instance=experiment)
+        form_pedestal = PedestalEditionForm(instance=conf_pedestal)
+        form_rx = USRPRXEditionForm(instance=conf_rx)
+        form_tx = USRPTXEditionForm(instance=conf_tx)
 
     if request.method == 'POST':
-        form = ExperimentForm(request.POST, instance=experiment)
+        form = ExperimentEditionForm(request.POST, instance=experiment)
+        form_pedestal = PedestalEditionForm(request.POST, instance=conf_pedestal)
+        form_rx = USRPRXEditionForm(request.POST, instance=conf_rx)
+        form_tx = USRPTXEditionForm(request.POST, instance=conf_tx)
 
         if form.is_valid():
             experiment = form.save()
+            form_pedestal.save()
+            form_rx.save()
+            form_tx.save()
             return redirect('url_experiment', id_exp=experiment.id)
 
     kwargs                     = {}
     kwargs['form']             = form
+    kwargs['form_pedestal']    = form_pedestal
+    kwargs['form_rx']          = form_rx
+    kwargs['form_tx']          = form_tx
     kwargs['title']            = 'Experiment'
     kwargs['suptitle']         = 'Edit'
     kwargs['button']           = 'Update'
@@ -700,8 +719,8 @@ def experiment_delete(request, id_exp):
 
     if request.method == 'POST':
         if is_developer(request.user):
-            for conf in Configuration.objects.filter(experiment=experiment):
-                conf.delete()
+            #for conf in Configuration.objects.filter(experiment=experiment):
+                #conf.delete()
             experiment.delete()
             return redirect('url_experiments')
 
@@ -770,7 +789,7 @@ def experiment_import(request, id_exp):
 def experiment_start(request, id_exp):
 
     exp = get_object_or_404(Experiment, pk=id_exp)
-
+    exp.status = 0
     if exp.status == 2:
         messages.warning(request, 'Experiment {} already runnnig'.format(exp))
     else:
@@ -1266,7 +1285,7 @@ def dev_confs(request):
     if request.user.is_authenticated:
         fields.append('my configurations')
     form = FilterForm(initial=request.GET, extra_fields=fields)
-    kwargs['keys'] = ['name', 'device', 'experiment',
+    kwargs['keys'] = ['name', 'device',
                       'type', 'programmed_date', 'actions']
     kwargs['title'] = 'Configuration'
     kwargs['suptitle'] = 'List'
@@ -1363,7 +1382,7 @@ def dev_conf_new(request, id_exp=0, id_dev=0):
 
 @login_required
 def dev_conf_edit(request, id_conf):
-
+    
     conf = get_object_or_404(Configuration, pk=id_conf)
 
     DevConfForm = CONF_FORMS[conf.device.device_type.name]
@@ -1597,6 +1616,7 @@ def dev_conf_export(request, id_conf):
         if file_form.is_valid():
             fields = conf.export_to_file(
                 format=file_form.cleaned_data['format'])
+            
             if not fields['content']:
                 messages.error(request, conf.message)
                 return redirect(conf.get_absolute_url_export())
@@ -1621,12 +1641,15 @@ def dev_conf_export(request, id_conf):
 
 @login_required
 def dev_conf_delete(request, id_conf):
-
+    print("Está aquí")
     conf = get_object_or_404(Configuration, pk=id_conf)
 
     if request.method == 'POST':
         if is_developer(request.user):
-            conf.delete()
+            try:
+                conf.delete()
+            except Exception as e:
+                messages.error(request, "The device configuration is protected")
             return redirect('url_dev_confs')
 
         messages.error(request, 'Not enough permission to delete this object')
@@ -1650,8 +1673,8 @@ def sidebar(**kwargs):
     conf = kwargs.get('conf', None)
     experiment = kwargs.get('experiment', None)
 
-    if not experiment:
-        experiment = conf.experiment
+    #if not experiment:
+       #experiment = conf.experiment
 
     if experiment:
         side_data['experiment'] = experiment
@@ -1661,10 +1684,9 @@ def sidebar(**kwargs):
             experiments = campaign[0].experiments.all().order_by('name')
         else:
             experiments = [experiment]
-        configurations = experiment.configuration_set.filter(type=0)
+        #configurations = experiment.configuration_set.filter(type=0)
         side_data['side_experiments'] = experiments
-        side_data['side_configurations'] = configurations.order_by(
-            'device__device_type__name')
+        #side_data['side_configurations'] = configurations.order_by('device__device_type__name')
 
     return side_data
 
diff --git a/apps/pedestal/forms.py b/apps/pedestal/forms.py
index ac877e0..63c6f86 100644
--- a/apps/pedestal/forms.py
+++ b/apps/pedestal/forms.py
@@ -24,17 +24,17 @@ class PedestalConfigurationForm(forms.ModelForm):
         if instance and instance.pk:
 
             devices = Device.objects.filter(device_type__name='pedestal')
-            if instance.experiment:
-                self.fields['experiment'].widget.attrs['read_only'] = True
+            #if instance.experiment:
+                #self.fields['experiment'].widget.attrs['read_only'] = True
                 #self.fields['experiment'].widget.choices = [(instance.experiment.id, instance.experiment)]
-            self.fields['device'].widget.choices = [(device.id, device) for device in devices]
+            #self.fields['device'].widget.choices = [(device.id, device) for device in devices]
 
         if 'initial' in kwargs and 'experiment' in kwargs['initial'] and kwargs['initial']['experiment'] not in (0, '0'):
             self.fields['experiment'].widget.attrs['readonly'] = True
 
     class Meta:
         model = PedestalConfiguration
-        exclude = ('type', 'parameters', 'status', 'total_units', 'author', 'hash')
+        exclude = ('template', 'type', 'parameters', 'status', 'total_units', 'author', 'hash')
 
     def clean(self):
         form_data = super(PedestalConfigurationForm, self).clean()
@@ -45,6 +45,37 @@ class PedestalConfigurationForm(forms.ModelForm):
         conf.save()
         return conf
 
+class PedestalEditionForm(forms.ModelForm):
+
+    def __init__(self, *args, **kwargs):
+        super(PedestalEditionForm, self).__init__(*args, **kwargs)
+
+        instance = getattr(self, 'instance', None)
+
+        if instance and instance.pk:
+
+            devices = Device.objects.filter(device_type__name='pedestal')
+            #if instance.experiment:
+                #self.fields['experiment'].widget.attrs['read_only'] = True
+                #self.fields['experiment'].widget.choices = [(instance.experiment.id, instance.experiment)]
+            #self.fields['device'].widget.choices = [(device.id, device) for device in devices]
+
+        if 'initial' in kwargs and 'experiment' in kwargs['initial'] and kwargs['initial']['experiment'] not in (0, '0'):
+            self.fields['experiment'].widget.attrs['readonly'] = True
+
+    class Meta:
+        model = PedestalConfiguration
+        exclude = ('device', 'label', 'template', 'type', 'parameters', 'status', 'total_units', 'author', 'hash')
+
+    def clean(self):
+        form_data = super(PedestalEditionForm, self).clean()
+        return form_data
+
+    def save(self, *args, **kwargs):
+        conf = super(PedestalEditionForm, self).save(*args, **kwargs)
+        conf.save()
+        return conf
+
 class ExtFileField(forms.FileField):
     """
     Same as forms.FileField, but you can specify a file extension whitelist.
diff --git a/apps/pedestal/models.py b/apps/pedestal/models.py
index ce10968..ca3e9ee 100644
--- a/apps/pedestal/models.py
+++ b/apps/pedestal/models.py
@@ -13,15 +13,15 @@ from django.core.validators import MinValueValidator, MaxValueValidator
 from apps.main.models import Configuration
 
 AXIS_VALUE = (
-        ('AZI', 'azimuth'),
-        ('ELE', 'elevation')
+        ('azimuth', 'PPI'),
+        ('elevation', 'RHI')
     )
 
 class PedestalConfiguration(Configuration):
 
     axis = models.CharField(
         verbose_name='Axis',
-        max_length=3,
+        max_length=10,
         choices=AXIS_VALUE,
         null=False,
         blank=False
@@ -133,9 +133,9 @@ class PedestalConfiguration(Configuration):
         try:
             pedestal = PedestalConfiguration.objects.get(pk=self)
             print(pedestal)
-            pedestal_axis = pedestal.get_axis_display()
+            #pedestal_axis = pedestal.get_axis_display()
             print(pedestal)
-            print(pedestal_axis)
+            #print(pedestal_axis)
             table = pedestal.table
             print(table)
             li = list(table.split(","))
@@ -155,13 +155,13 @@ class PedestalConfiguration(Configuration):
             coded_table = base64.standard_b64encode(bytes(byte_table))
             coded_table_ascii = coded_table.decode('ascii')
             print(coded_table_ascii)
-            data = {'axis': pedestal_axis, 'speed': pedestal.speed, 'table': coded_table_ascii}
+            data = {'axis': pedestal.axis, 'speed': pedestal.speed, 'table': coded_table_ascii}
             print(data)
             json_data = json.dumps(data)
             print(json_data)
             first_position = table[0]
 
-            if pedestal.axis=='azimuth':
+            if pedestal.axis=='PPI':
                 json_az = json.dumps({"axis": 'azimuth', "position": 0.0})
                 json_el = json.dumps({"axis": 'elevation', "position": first_position})
             else:
diff --git a/apps/pedestal/templates/pedestal_conf_edit.html b/apps/pedestal/templates/pedestal_conf_edit.html
index 23ea79f..dfcfb87 100644
--- a/apps/pedestal/templates/pedestal_conf_edit.html
+++ b/apps/pedestal/templates/pedestal_conf_edit.html
@@ -14,7 +14,6 @@
 {% block content %}
 <form class="form" method="post">
   {% csrf_token %}
-  <h2>Pedestal</h2>
   {% bootstrap_form form layout='horizontal' size='medium' %}
   <div style="clear: both;"></div>
   <br>
diff --git a/apps/pedestal/views.py b/apps/pedestal/views.py
index 24f2e4d..9f366ee 100644
--- a/apps/pedestal/views.py
+++ b/apps/pedestal/views.py
@@ -35,7 +35,7 @@ def conf(request, conf_id):
 
 @login_required
 def conf_edit(request, conf_id):
-
+    
     conf = get_object_or_404(PedestalConfiguration, pk=conf_id)
     print(conf)
     #print("fin de carga de params")
diff --git a/apps/usrp_rx/forms.py b/apps/usrp_rx/forms.py
index fe3bf8f..cfbd427 100644
--- a/apps/usrp_rx/forms.py
+++ b/apps/usrp_rx/forms.py
@@ -24,10 +24,10 @@ class USRPRXConfigurationForm(forms.ModelForm):
         if instance and instance.pk:
 
             devices = Device.objects.filter(device_type__name='usrp_rx')
-            if instance.experiment:
-                self.fields['experiment'].widget.attrs['read_only'] = True
+            #if instance.experiment:
+                #self.fields['experiment'].widget.attrs['read_only'] = True
                 #self.fields['experiment'].widget.choices = [(instance.experiment.id, instance.experiment)]
-            self.fields['device'].widget.choices = [(device.id, device) for device in devices]
+            #self.fields['device'].widget.choices = [(device.id, device) for device in devices]
 
         if 'initial' in kwargs and 'experiment' in kwargs['initial'] and kwargs['initial']['experiment'] not in (0, '0'):
             self.fields['experiment'].widget.attrs['readonly'] = True
@@ -45,6 +45,37 @@ class USRPRXConfigurationForm(forms.ModelForm):
         conf.save()
         return conf
 
+class USRPRXEditionForm(forms.ModelForm):
+
+    def __init__(self, *args, **kwargs):
+        super(USRPRXEditionForm, self).__init__(*args, **kwargs)
+
+        instance = getattr(self, 'instance', None)
+
+        if instance and instance.pk:
+
+            devices = Device.objects.filter(device_type__name='usrp_rx')
+            #if instance.experiment:
+                #self.fields['experiment'].widget.attrs['read_only'] = True
+                #self.fields['experiment'].widget.choices = [(instance.experiment.id, instance.experiment)]
+            #self.fields['device'].widget.choices = [(device.id, device) for device in devices]
+
+        if 'initial' in kwargs and 'experiment' in kwargs['initial'] and kwargs['initial']['experiment'] not in (0, '0'):
+            self.fields['experiment'].widget.attrs['readonly'] = True
+
+    class Meta:
+        model = USRPRXConfiguration
+        exclude = ('template', 'device', 'label', 'ip_address', 'daughterboard', 'antenna', 'type', 'parameters', 'status', 'total_units', 'author', 'hash')
+
+    def clean(self):
+        form_data = super(USRPRXEditionForm, self).clean()
+        return form_data
+
+    def save(self, *args, **kwargs):
+        conf = super(USRPRXEditionForm, self).save(*args, **kwargs)
+        conf.save()
+        return conf
+
 class ExtFileField(forms.FileField):
     """
     Same as forms.FileField, but you can specify a file extension whitelist.
diff --git a/apps/usrp_rx/models.py b/apps/usrp_rx/models.py
index b890c42..034f0da 100644
--- a/apps/usrp_rx/models.py
+++ b/apps/usrp_rx/models.py
@@ -162,7 +162,7 @@ class USRPRXConfiguration(Configuration):
     def stop_device(self):
 
         try:
-            command = self.device.url() + "stop"
+            command = self.device.url() + "stoprx"
             r = requests.get(command)
             if r:
                 self.device.status = 4
diff --git a/apps/usrp_tx/forms.py b/apps/usrp_tx/forms.py
index c568c3b..dd2c547 100644
--- a/apps/usrp_tx/forms.py
+++ b/apps/usrp_tx/forms.py
@@ -24,10 +24,10 @@ class USRPTXConfigurationForm(forms.ModelForm):
         if instance and instance.pk:
 
             devices = Device.objects.filter(device_type__name='usrp_tx')
-            if instance.experiment:
-                self.fields['experiment'].widget.attrs['read_only'] = True
+            #if instance.experiment:
+                #self.fields['experiment'].widget.attrs['read_only'] = True
                 #self.fields['experiment'].widget.choices = [(instance.experiment.id, instance.experiment)]
-            self.fields['device'].widget.choices = [(device.id, device) for device in devices]
+            #self.fields['device'].widget.choices = [(device.id, device) for device in devices]
 
         if 'initial' in kwargs and 'experiment' in kwargs['initial'] and kwargs['initial']['experiment'] not in (0, '0'):
             self.fields['experiment'].widget.attrs['readonly'] = True
@@ -45,6 +45,37 @@ class USRPTXConfigurationForm(forms.ModelForm):
         conf.save()
         return conf
 
+class USRPTXEditionForm(forms.ModelForm):
+
+    def __init__(self, *args, **kwargs):
+        super(USRPTXEditionForm, self).__init__(*args, **kwargs)
+
+        instance = getattr(self, 'instance', None)
+
+        if instance and instance.pk:
+
+            devices = Device.objects.filter(device_type__name='usrp_tx')
+            #if instance.experiment:
+                #self.fields['experiment'].widget.attrs['read_only'] = True
+                #self.fields['experiment'].widget.choices = [(instance.experiment.id, instance.experiment)]
+            #self.fields['device'].widget.choices = [(device.id, device) for device in devices]
+
+        if 'initial' in kwargs and 'experiment' in kwargs['initial'] and kwargs['initial']['experiment'] not in (0, '0'):
+            self.fields['experiment'].widget.attrs['readonly'] = True
+
+    class Meta:
+        model = USRPTXConfiguration
+        exclude = ('template', 'device', 'label', 'ip_address', 'daughterboard', 'antenna', 'type', 'parameters', 'status', 'total_units', 'author', 'hash')
+
+    def clean(self):
+        form_data = super(USRPTXEditionForm, self).clean()
+        return form_data
+
+    def save(self, *args, **kwargs):
+        conf = super(USRPTXEditionForm, self).save(*args, **kwargs)
+        conf.save()
+        return conf
+
 class ExtFileField(forms.FileField):
     """
     Same as forms.FileField, but you can specify a file extension whitelist.
diff --git a/apps/usrp_tx/models.py b/apps/usrp_tx/models.py
index 34392f5..bb86216 100644
--- a/apps/usrp_tx/models.py
+++ b/apps/usrp_tx/models.py
@@ -130,6 +130,7 @@ class USRPTXConfiguration(Configuration):
 
     pulse_2 = models.FloatField(
         verbose_name='Width (Pulse 2)',
+        default=1,
         blank=True,
         null=True,
         help_text='Introduce the value in %'
@@ -228,7 +229,7 @@ class USRPTXConfiguration(Configuration):
     def stop_device(self):
 
         try:
-            command = self.device.url() + "stop"
+            command = self.device.url() + "stoptx"
             r = requests.get(command)
             if r:
                 self.device.status = 4
diff --git a/apps/usrp_tx/views.py b/apps/usrp_tx/views.py
index 645a90a..444e8c6 100644
--- a/apps/usrp_tx/views.py
+++ b/apps/usrp_tx/views.py
@@ -117,7 +117,7 @@ def import_file(request, conf_id):
             try:
                 data = conf.import_from_file(request.FILES['file_name'])
                 conf.dict_to_parms(data)
-                conf.update_pulses()
+                #conf.update_pulses()
                 messages.success(request, 'Configuration "%s" loaded succesfully' % request.FILES['file_name'])
                 return redirect(conf.get_absolute_url_edit())
 
diff --git a/usrp-api/api_server.py b/usrp-api/api_server.py
index 4a7ba62..295a980 100644
--- a/usrp-api/api_server.py
+++ b/usrp-api/api_server.py
@@ -39,14 +39,20 @@ def usrprx_start():
     time_source = request_data['time_source']
     clock_rate = request_data['clock_rate']
 
-    command_usrp_rx = subprocess.Popen(["python2.7", "/home/developer/HaystackOP/thor.py", "-m", ip_address, "-d", daughterboard, 
-                                        "-c ch0,ch1", "-y", antenna, "-r", str(sample_rate) + "e6", "-f", str(frequency) + "e6", 
-                                        "-datadir", datadir, "--clock_source", clock_source, "--time_source", time_source,
-                                        "--clock_rate", str(clock_rate) + "e6"], stdout=subprocess.PIPE)
-    command_usrp_rx_out = command_usrp_rx.communicate()[0]
-    print(command_usrp_rx_out)
+    #command_usrp_rx = subprocess.Popen(["python2.7", "/home/developer/HaystackOP/thor.py", "-m", ip_address, "-d", daughterboard, 
+    #                                    "-c ch0,ch1", "-y", antenna, "-r", str(sample_rate) + "e6", "-f", str(frequency) + "e6", 
+    #                                    "-datadir", datadir, "--clock_source", clock_source, "--time_source", time_source,
+    #                                    "--clock_rate", str(clock_rate) + "e6"], stdout=subprocess.PIPE)
+    command_usrp_rx = subprocess.Popen(["python", "thor.py"], stdout=subprocess.PIPE)                                    
+    #command_usrp_rx_out = command_usrp_rx.communicate()[0]
+    #print(command_usrp_rx_out)
     
     return "USRP Rx configured"
+
+@app.route('/stoprx/', methods=['GET'])
+def usrprx_stop():
+    #stop_usrp_rx = subprocess.Popen(["pkill", "-f", "thor.py"], stdout=subprocess.PIPE)
+    return 'USRP stopped'
     
 @app.route('/usrptx/', methods=['POST'])
 def usrptx_start():
@@ -172,15 +178,17 @@ def usrptx_start():
     print(name)
     cod.tofile(name)
 
-    command_usrp_tx = subprocess.Popen(["python", "tx.py", "-m", ip_address, "-d", daughterboard, "-y", antenna, "-f", str(frequency) + "e6",
-                                        "-r", str(sample_rate) + "e6", "code.bin"], stdout=subprocess.PIPE)
-    command_usrp_tx_out = command_usrp_tx.communicate()[0]
-    print(command_usrp_tx_out)
+    #command_usrp_tx = subprocess.Popen(["python", "tx.py", "-m", ip_address, "-d", daughterboard, "-y", antenna, "-f", str(frequency) + "e6",
+    #                                    "-r", str(sample_rate) + "e6", "code.bin"], stdout=subprocess.PIPE)
+    command_usrp_tx = subprocess.Popen(["python", "tx.py"], stdout=subprocess.PIPE)
+    #command_usrp_tx_out = command_usrp_tx.communicate()[1]
+    #print(command_usrp_tx_out)
     
     return "USRP Tx configured"
 
-@app.route('/stop/', methods=['GET'])
-def usrp_stop():
+@app.route('/stoptx/', methods=['GET'])
+def usrptx_stop():
+    #stop_usrp_tx = subprocess.Popen(["pkill", "-f", "tx.py"], stdout=subprocess.PIPE)
     return 'USRP stopped'
 
 if __name__ =='__main__':
diff --git a/usrp-api/code.bin b/usrp-api/code.bin
new file mode 100644
index 0000000000000000000000000000000000000000..dfb758ad89504622392709ad715ffb0a6e6a723c
GIT binary patch
literal 3200
hc%1FUAprmY2m`P;qkkJBU{MJ4W|nMS_W%F@e*?kN1ib(N

literal 0
Hc$@<O00001

diff --git a/usrp-api/thor.py b/usrp-api/thor.py
new file mode 100644
index 0000000..4fd7c8c
--- /dev/null
+++ b/usrp-api/thor.py
@@ -0,0 +1,5 @@
+import time
+
+while True:
+    print("Adquiriendo")
+    time.sleep(3)
\ No newline at end of file
diff --git a/usrp-api/tx.py b/usrp-api/tx.py
new file mode 100644
index 0000000..452e1ef
--- /dev/null
+++ b/usrp-api/tx.py
@@ -0,0 +1,5 @@
+import time
+
+while True:
+    print("Transmitiendo")
+    time.sleep(3)
\ No newline at end of file