radarsys_met Commit - r360:46316742ce9f

New experiment views

amorales -

r360:46316742ce9f

parent child

Context file:

r360:46316742ce9f

Collapse all files

usrp-api/code.bin created 644 binary 0 0

NO CONTENT: new file 100644, binary diff hidden

usrp-api/thor.py created 644 +5 0

@@ -0,0 +1,5
	1	import time
	2
	3	while True:
	4	print("Adquiriendo")
	5	time.sleep(3) No newline at end of file

usrp-api/tx.py created 644 +5 0

@@ -0,0 +1,5
	1	import time
	2
	3	while True:
	4	print("Transmitiendo")
	5	time.sleep(3) No newline at end of file

apps/generator/forms.py +3 -3

                     if instance and instance.pk:
                         devices = Device.objects.filter(device_type__name='generator')
-                        if instance.experiment:
+                        #if instance.experiment:
-                            self.fields['experiment'].widget.attrs['read_only'] = True
+                            #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

apps/main/forms.py +18 -1

@@ -79,6 +79,23 class ExperimentForm(forms.ModelForm):
79	class Meta:	79	class Meta:
80	model = Experiment	80	model = Experiment
81	exclude = ['task', 'status', 'author', 'hash']	81	exclude = ['task', 'status', 'author', 'hash']
		82
		83	class ExperimentEditionForm(forms.ModelForm):
		84
		85	def __init__(self, args, *kwargs):
		86	super(ExperimentEditionForm, self).__init__(args, *kwargs)
		87	#self.fields['start_time'].widget = TimepickerWidget(self.fields['start_time'].widget.attrs)
		88	#self.fields['end_time'].widget = TimepickerWidget(self.fields['end_time'].widget.attrs)
		89
		90	def save(self, args, *kwargs):
		91	exp = super(ExperimentEditionForm, self).save(args, *kwargs)
		92	exp.name = exp.name.replace(' ', '')
		93	exp.save()
		94	return exp
		95
		96	class Meta:
		97	model = Experiment
		98	exclude = ['pedestal', 'generator', 'task', 'status', 'author', 'hash']
82		99
83	class LocationForm(forms.ModelForm):	100	class LocationForm(forms.ModelForm):
84	class Meta:	101	class Meta:
@@ -111,7 +128,7 class DownloadFileForm(forms.Form):
111	format = forms.ChoiceField(choices= ((0, 'json'),) )	128	format = forms.ChoiceField(choices= ((0, 'json'),) )
112		129
113	def __init__(self, device_type, args, *kwargs):	130	def __init__(self, device_type, args, *kwargs):
114		131
115	super(DownloadFileForm, self).__init__(args, *kwargs)	132	super(DownloadFileForm, self).__init__(args, *kwargs)
116		133
117	self.fields['format'].choices = FILE_FORMAT	134	self.fields['format'].choices = FILE_FORMAT

apps/main/models.py +51 -28

                     if self.status == 0:
                         color = "danger"
                     elif self.status == 1:
-                        color = "warning"
+                        color = "primary"
                     elif self.status == 2:
                         color = "info"
                     elif self.status == 3:
                 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)
                 #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:
                     '''
                     Configure and start experiments's devices
                     '''
+                    #confs = []
-                    confs = []
+                    #allconfs = Configuration.objects.filter(experiment=self, type = 0).order_by('-device__device_type__sequence')
-                    allconfs = Configuration.objects.filter(experiment=self, type = 0).order_by('-device__device_type__sequence')
+                    #confs = allconfs
-                    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:
+                        print("Hola")
-                            conf.stop_device()
+                        #Configuration.objects.get(id = id_rx).start_device()
-                            print("OK")
+                        #Configuration.objects.get(id = id_p).start_device()
-                            #conf.write_device()
+                        #Configuration.objects.get(id = id_tx).start_device()
-                            conf.device.conf_active = conf.pk
+                        # for conf in confs:
-                            conf.device.save()
+                        #     conf.stop_device()
-                            conf.start_device()
+                        #     print("OK")
-                            print("OK")
+                        #     #conf.write_device()
-                            time.sleep(1)
+                        #     conf.device.conf_active = conf.pk
+                        #     conf.device.save()
+                        #     conf.start_device()
+                        #     print("OK")
+                        #     time.sleep(1)
                     except:
                         return 0
                     return 2
                     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:
+                        Configuration.objects.get(id = id_rx).stop_device()
-                            conf.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
                 # 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)
                     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:
                         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,
                 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

apps/main/templates/base.html +1 0

                   <div class="page-header">
                     <h1>{% block content-title %}{% endblock %} <small>{% block content-suptitle %}{% endblock %}</small></h1>
+                    <br>
                     </div>
                     {% block messages %}
                       {% if messages %}

apps/main/templates/base_edit.html +14 0

@@ -19,6 +19,20
19	{% endblock %}	19	{% endblock %}
20	{% else %}	20	{% else %}
21	{% bootstrap_form form layout='horizontal' size='medium' %}	21	{% bootstrap_form form layout='horizontal' size='medium' %}
		22	{% if form_pedestal %}
		23	<br>
		24	<h1>Pedestal</h1>
		25	<br>
		26	{% bootstrap_form form_pedestal layout='horizontal' size='medium' %}
		27	<br>
		28	<h1>RX</h1>
		29	<br>
		30	{% bootstrap_form form_rx layout='horizontal' size='medium' %}
		31	<br>
		32	<h1>TX</h1>
		33	<br>
		34	{% bootstrap_form form_tx layout='horizontal' size='medium' %}
		35	{% endif %}
22	{% endif %}	36	{% endif %}
23		37
24	<div style="clear: both;"></div>	38	<div style="clear: both;"></div>

apps/main/templates/experiment_edit.html +1 0

             {% endblock %}
             {% block extra-js%}
             <script src="{% static 'js/bootstrap-datetimepicker.min.js' %}"></script>
             <script type="text/javascript">

apps/main/views.py +48 -26

             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_rx.forms import USRPRXConfigurationForm, USRPRXEditionForm
-            from apps.usrp_tx.forms import USRPTXConfigurationForm
+            from apps.usrp_tx.forms import USRPTXConfigurationForm, USRPTXEditionForm
             from .utils import Params
             from .models              import Campaign, Experiment, Device, Configuration, Location, RunningExperiment, DEV_STATES
             @login_required
             def device_edit(request, id_dev):
                 device = get_object_or_404(Device, pk=id_dev)
                 if request.method == 'GET':
                 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
             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']
                 kwargs['suptitle'] = 'Details'
                 kwargs['button'] = 'Add Configuration'
                 kwargs['menu_experiments'] = 'active'
+                #print(kwargs)
                 ###### SIDEBAR ######
                 kwargs.update(sidebar(experiment=experiment))
             @login_required
             def experiment_new(request, id_camp=None):
                 if not is_developer(request.user):
                     messages.error(
                         request, 'Developer required, to create new Experiments')
             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'
                 if request.method == 'POST':
                     if is_developer(request.user):
-                        for conf in Configuration.objects.filter(experiment=experiment):
+                        #for conf in Configuration.objects.filter(experiment=experiment):
-                            conf.delete()
+                            #conf.delete()
                         experiment.delete()
                         return redirect('url_experiments')
             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:
                 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'
             @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]
                     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())
             @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')
                 conf = kwargs.get('conf', None)
                 experiment = kwargs.get('experiment', None)
-                if not experiment:
+                #if not experiment:
-                    experiment = conf.experiment
+                   #experiment = conf.experiment
                 if experiment:
                     side_data['experiment'] = experiment
                         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(
+                    #side_data['side_configurations'] = configurations.order_by('device__device_type__name')
-                        'device__device_type__name')
                 return side_data

apps/pedestal/forms.py +35 -4

@@ -24,17 +24,17 class PedestalConfigurationForm(forms.ModelForm):
24	if instance and instance.pk:	24	if instance and instance.pk:
25		25
26	devices = Device.objects.filter(device_type__name='pedestal')	26	devices = Device.objects.filter(device_type__name='pedestal')
27	if instance.experiment:	27	#if instance.experiment:
28	self.fields['experiment'].widget.attrs['read_only'] = True	28	#self.fields['experiment'].widget.attrs['read_only'] = True
29	#self.fields['experiment'].widget.choices = [(instance.experiment.id, instance.experiment)]	29	#self.fields['experiment'].widget.choices = [(instance.experiment.id, instance.experiment)]
30	self.fields['device'].widget.choices = [(device.id, device) for device in devices]	30	#self.fields['device'].widget.choices = [(device.id, device) for device in devices]
31		31
32	if 'initial' in kwargs and 'experiment' in kwargs['initial'] and kwargs['initial']['experiment'] not in (0, '0'):	32	if 'initial' in kwargs and 'experiment' in kwargs['initial'] and kwargs['initial']['experiment'] not in (0, '0'):
33	self.fields['experiment'].widget.attrs['readonly'] = True	33	self.fields['experiment'].widget.attrs['readonly'] = True
34		34
35	class Meta:	35	class Meta:
36	model = PedestalConfiguration	36	model = PedestalConfiguration
37	exclude = ('type', 'parameters', 'status', 'total_units', 'author', 'hash')	37	exclude = ('template', 'type', 'parameters', 'status', 'total_units', 'author', 'hash')
38		38
39	def clean(self):	39	def clean(self):
40	form_data = super(PedestalConfigurationForm, self).clean()	40	form_data = super(PedestalConfigurationForm, self).clean()
@@ -45,6 +45,37 class PedestalConfigurationForm(forms.ModelForm):
45	conf.save()	45	conf.save()
46	return conf	46	return conf
47		47
		48	class PedestalEditionForm(forms.ModelForm):
		49
		50	def __init__(self, args, *kwargs):
		51	super(PedestalEditionForm, self).__init__(args, *kwargs)
		52
		53	instance = getattr(self, 'instance', None)
		54
		55	if instance and instance.pk:
		56
		57	devices = Device.objects.filter(device_type__name='pedestal')
		58	#if instance.experiment:
		59	#self.fields['experiment'].widget.attrs['read_only'] = True
		60	#self.fields['experiment'].widget.choices = [(instance.experiment.id, instance.experiment)]
		61	#self.fields['device'].widget.choices = [(device.id, device) for device in devices]
		62
		63	if 'initial' in kwargs and 'experiment' in kwargs['initial'] and kwargs['initial']['experiment'] not in (0, '0'):
		64	self.fields['experiment'].widget.attrs['readonly'] = True
		65
		66	class Meta:
		67	model = PedestalConfiguration
		68	exclude = ('device', 'label', 'template', 'type', 'parameters', 'status', 'total_units', 'author', 'hash')
		69
		70	def clean(self):
		71	form_data = super(PedestalEditionForm, self).clean()
		72	return form_data
		73
		74	def save(self, args, *kwargs):
		75	conf = super(PedestalEditionForm, self).save(args, *kwargs)
		76	conf.save()
		77	return conf
		78
48	class ExtFileField(forms.FileField):	79	class ExtFileField(forms.FileField):
49	"""	80	"""
50	Same as forms.FileField, but you can specify a file extension whitelist.	81	Same as forms.FileField, but you can specify a file extension whitelist.

apps/pedestal/models.py +7 -7

             from apps.main.models import Configuration
             AXIS_VALUE = (
-                    ('AZI', 'azimuth'),
+                    ('azimuth', 'PPI'),
-                    ('ELE', 'elevation')
+                    ('elevation', 'RHI')
                 )
             class PedestalConfiguration(Configuration):
                 axis = models.CharField(
                     verbose_name='Axis',
-                    max_length=3,
+                    max_length=10,
                     choices=AXIS_VALUE,
                     null=False,
                     blank=False
                     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(","))
                         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:

apps/pedestal/templates/pedestal_conf_edit.html 0 -1

             {% 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>

apps/pedestal/views.py +1 -1

             @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")

apps/usrp_rx/forms.py +34 -3

@@ -24,10 +24,10 class USRPRXConfigurationForm(forms.ModelForm):
24	if instance and instance.pk:	24	if instance and instance.pk:
25		25
26	devices = Device.objects.filter(device_type__name='usrp_rx')	26	devices = Device.objects.filter(device_type__name='usrp_rx')
27	if instance.experiment:	27	#if instance.experiment:
28	self.fields['experiment'].widget.attrs['read_only'] = True	28	#self.fields['experiment'].widget.attrs['read_only'] = True
29	#self.fields['experiment'].widget.choices = [(instance.experiment.id, instance.experiment)]	29	#self.fields['experiment'].widget.choices = [(instance.experiment.id, instance.experiment)]
30	self.fields['device'].widget.choices = [(device.id, device) for device in devices]	30	#self.fields['device'].widget.choices = [(device.id, device) for device in devices]
31		31
32	if 'initial' in kwargs and 'experiment' in kwargs['initial'] and kwargs['initial']['experiment'] not in (0, '0'):	32	if 'initial' in kwargs and 'experiment' in kwargs['initial'] and kwargs['initial']['experiment'] not in (0, '0'):
33	self.fields['experiment'].widget.attrs['readonly'] = True	33	self.fields['experiment'].widget.attrs['readonly'] = True
@@ -45,6 +45,37 class USRPRXConfigurationForm(forms.ModelForm):
45	conf.save()	45	conf.save()
46	return conf	46	return conf
47		47
		48	class USRPRXEditionForm(forms.ModelForm):
		49
		50	def __init__(self, args, *kwargs):
		51	super(USRPRXEditionForm, self).__init__(args, *kwargs)
		52
		53	instance = getattr(self, 'instance', None)
		54
		55	if instance and instance.pk:
		56
		57	devices = Device.objects.filter(device_type__name='usrp_rx')
		58	#if instance.experiment:
		59	#self.fields['experiment'].widget.attrs['read_only'] = True
		60	#self.fields['experiment'].widget.choices = [(instance.experiment.id, instance.experiment)]
		61	#self.fields['device'].widget.choices = [(device.id, device) for device in devices]
		62
		63	if 'initial' in kwargs and 'experiment' in kwargs['initial'] and kwargs['initial']['experiment'] not in (0, '0'):
		64	self.fields['experiment'].widget.attrs['readonly'] = True
		65
		66	class Meta:
		67	model = USRPRXConfiguration
		68	exclude = ('template', 'device', 'label', 'ip_address', 'daughterboard', 'antenna', 'type', 'parameters', 'status', 'total_units', 'author', 'hash')
		69
		70	def clean(self):
		71	form_data = super(USRPRXEditionForm, self).clean()
		72	return form_data
		73
		74	def save(self, args, *kwargs):
		75	conf = super(USRPRXEditionForm, self).save(args, *kwargs)
		76	conf.save()
		77	return conf
		78
48	class ExtFileField(forms.FileField):	79	class ExtFileField(forms.FileField):
49	"""	80	"""
50	Same as forms.FileField, but you can specify a file extension whitelist.	81	Same as forms.FileField, but you can specify a file extension whitelist.

apps/usrp_rx/models.py +1 -1

                 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

apps/usrp_tx/forms.py +34 -3

@@ -24,10 +24,10 class USRPTXConfigurationForm(forms.ModelForm):
24	if instance and instance.pk:	24	if instance and instance.pk:
25		25
26	devices = Device.objects.filter(device_type__name='usrp_tx')	26	devices = Device.objects.filter(device_type__name='usrp_tx')
27	if instance.experiment:	27	#if instance.experiment:
28	self.fields['experiment'].widget.attrs['read_only'] = True	28	#self.fields['experiment'].widget.attrs['read_only'] = True
29	#self.fields['experiment'].widget.choices = [(instance.experiment.id, instance.experiment)]	29	#self.fields['experiment'].widget.choices = [(instance.experiment.id, instance.experiment)]
30	self.fields['device'].widget.choices = [(device.id, device) for device in devices]	30	#self.fields['device'].widget.choices = [(device.id, device) for device in devices]
31		31
32	if 'initial' in kwargs and 'experiment' in kwargs['initial'] and kwargs['initial']['experiment'] not in (0, '0'):	32	if 'initial' in kwargs and 'experiment' in kwargs['initial'] and kwargs['initial']['experiment'] not in (0, '0'):
33	self.fields['experiment'].widget.attrs['readonly'] = True	33	self.fields['experiment'].widget.attrs['readonly'] = True
@@ -45,6 +45,37 class USRPTXConfigurationForm(forms.ModelForm):
45	conf.save()	45	conf.save()
46	return conf	46	return conf
47		47
		48	class USRPTXEditionForm(forms.ModelForm):
		49
		50	def __init__(self, args, *kwargs):
		51	super(USRPTXEditionForm, self).__init__(args, *kwargs)
		52
		53	instance = getattr(self, 'instance', None)
		54
		55	if instance and instance.pk:
		56
		57	devices = Device.objects.filter(device_type__name='usrp_tx')
		58	#if instance.experiment:
		59	#self.fields['experiment'].widget.attrs['read_only'] = True
		60	#self.fields['experiment'].widget.choices = [(instance.experiment.id, instance.experiment)]
		61	#self.fields['device'].widget.choices = [(device.id, device) for device in devices]
		62
		63	if 'initial' in kwargs and 'experiment' in kwargs['initial'] and kwargs['initial']['experiment'] not in (0, '0'):
		64	self.fields['experiment'].widget.attrs['readonly'] = True
		65
		66	class Meta:
		67	model = USRPTXConfiguration
		68	exclude = ('template', 'device', 'label', 'ip_address', 'daughterboard', 'antenna', 'type', 'parameters', 'status', 'total_units', 'author', 'hash')
		69
		70	def clean(self):
		71	form_data = super(USRPTXEditionForm, self).clean()
		72	return form_data
		73
		74	def save(self, args, *kwargs):
		75	conf = super(USRPTXEditionForm, self).save(args, *kwargs)
		76	conf.save()
		77	return conf
		78
48	class ExtFileField(forms.FileField):	79	class ExtFileField(forms.FileField):
49	"""	80	"""
50	Same as forms.FileField, but you can specify a file extension whitelist.	81	Same as forms.FileField, but you can specify a file extension whitelist.

apps/usrp_tx/models.py +2 -1

                 pulse_2 = models.FloatField(
                     verbose_name='Width (Pulse 2)',
+                    default=1,
                     blank=True,
                     null=True,
                     help_text='Introduce the value in %'
                 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

apps/usrp_tx/views.py +1 -1

                         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())

usrp-api/api_server.py +20 -12

                 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,
+                #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",
+                #                                    "-c ch0,ch1", "-y", antenna, "-r", str(sample_rate) + "e6", "-f", str(frequency) + "e6",
-                                                    "-datadir", datadir, "--clock_source", clock_source, "--time_source", time_source,
+                #                                    "-datadir", datadir, "--clock_source", clock_source, "--time_source", time_source,
-                                                    "--clock_rate", str(clock_rate) + "e6"], stdout=subprocess.PIPE)
+                #                                    "--clock_rate", str(clock_rate) + "e6"], stdout=subprocess.PIPE)
-                command_usrp_rx_out = command_usrp_rx.communicate()[0]
+                command_usrp_rx = subprocess.Popen(["python", "thor.py"], stdout=subprocess.PIPE)
-                print(command_usrp_rx_out)
+                #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():
                 print(name)
                 cod.tofile(name)
-                command_usrp_tx = subprocess.Popen(["python", "tx.py", "-m", ip_address, "-d", daughterboard, "-y", antenna, "-f", str(frequency) + "e6",
+                #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)
+                #                                    "-r", str(sample_rate) + "e6", "code.bin"], stdout=subprocess.PIPE)
-                command_usrp_tx_out = command_usrp_tx.communicate()[0]
+                command_usrp_tx = subprocess.Popen(["python", "tx.py"], stdout=subprocess.PIPE)
-                print(command_usrp_tx_out)
+                #command_usrp_tx_out = command_usrp_tx.communicate()[1]
+                #print(command_usrp_tx_out)
                 return "USRP Tx configured"
-            @app.route('/stop/', methods=['GET'])
+            @app.route('/stoptx/', methods=['GET'])
-            def usrp_stop():
+            def usrptx_stop():
+                #stop_usrp_tx = subprocess.Popen(["pkill", "-f", "tx.py"], stdout=subprocess.PIPE)
                 return 'USRP stopped'
             if __name__ =='__main__':

General Comments 0

Write
Preview

You need to be logged in to leave comments. Login now

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages