radarsys_met Commit - r413:231bd42642ba

Create 'ip_address_rx', 'daughterboard_rx' and 'antenna_rx' parameters (USRP Rx) and Update models.py file (Pedestal)

eynilupu -

r413:231bd42642ba

parent child

Context file:

r413:231bd42642ba

volumes/sirm/apps/main/views.py +16 -4

@@ -279,13 +279,25 def experiment(request, id_exp):
279	kwargs = {}	279	kwargs = {}
280	kwargs['experiment_keys'] = ['name', 'latitude', 'longitude', 'heading']	280	kwargs['experiment_keys'] = ['name', 'latitude', 'longitude', 'heading']
281	kwargs['experiment'] = experiment	281	kwargs['experiment'] = experiment
282	kwargs['experiment_pedestal_keys'] = ['mode', 'axis', 'speed', 'angle']	282
		283	if conf_pedestal.mode == 'position':
		284	kwargs['experiment_pedestal_keys'] = ['mode', 'axis', 'angle']
		285	elif conf_pedestal.mode == 'speed':
		286	kwargs['experiment_pedestal_keys'] = ['mode', 'axis', 'speed']
		287	else:
		288	kwargs['experiment_pedestal_keys'] = ['mode', 'axis', 'speed', 'angle', 'min_value', 'max_value']
283	kwargs['experiment_pedestal'] = conf_pedestal	289	kwargs['experiment_pedestal'] = conf_pedestal
284	kwargs['experiment_rx_keys'] = ['samplerate_rx', 'frequency_rx', 'datadir', 'clocksource', 'timesource', 'clockrate']	290
		291	kwargs['experiment_rx_keys'] = ['ip_address_rx', 'daughterboard_rx', 'antenna_rx', 'samplerate_rx', 'frequency_rx', 'datadir', 'clocksource', 'timesource', 'clockrate']
285	kwargs['experiment_rx'] = conf_rx	292	kwargs['experiment_rx'] = conf_rx
286	kwargs['experiment_tx_keys'] = ['frequency', 'samplerate', 'ipp', 'delay', 'pulse_1', 'code_type_1', 'code_1', 'repetitions_1',	293
287	'enable_2', 'pulse_2', 'code_type_2', 'code_2', 'repetitions_2']	294	if not conf_tx.enable_2:
		295	kwargs['experiment_tx_keys'] = ['ip_address', 'daughterboard', 'antenna', 'frequency', 'samplerate', 'ipp', 'delay', 'pulse_1', 'code_type_1', 'code_1', 'repetitions_1']
		296	else:
		297	kwargs['experiment_tx_keys'] = ['ip_address', 'daughterboard', 'antenna', 'frequency', 'samplerate', 'ipp', 'delay', 'pulse_1', 'code_type_1', 'code_1', 'repetitions_1',
		298	'pulse_2', 'code_type_2', 'code_2', 'repetitions_2']
288	kwargs['experiment_tx'] = conf_tx	299	kwargs['experiment_tx'] = conf_tx
		300
289	kwargs['title'] = 'Experiment'	301	kwargs['title'] = 'Experiment'
290	kwargs['suptitle'] = 'Details'	302	kwargs['suptitle'] = 'Details'
291	kwargs['button'] = 'Add Configuration'	303	kwargs['button'] = 'Add Configuration'

volumes/sirm/apps/pedestal/models.py +4 0

                             coded_table = base64.standard_b64encode(bytes(byte_table))
                             coded_table_ascii = coded_table.decode('ascii')
                             speed = [float(x.strip()) for x in self.speed.split(',')]
+                            if isinstance(axis, str):
+                                axis = [axis]
                             payload = {
                                 'arraylength': len(speed),
                                 'axis': axis,

volumes/sirm/apps/usrp_rx/forms.py +1 -1

                 class Meta:
                     model = USRPRXConfiguration
-                    exclude = ('template', 'device', 'label', 'ip_address', 'daughterboard', 'antenna', 'type', 'parameters', 'status', 'total_units', 'author', 'hash')
+                    exclude = ('template', 'device', 'label', 'type', 'parameters', 'status', 'total_units', 'author', 'hash')
                 def clean(self):
                     form_data = super(USRPRXEditionForm, self).clean()

volumes/sirm/apps/usrp_rx/models.py +9 -9

             class USRPRXConfiguration(Configuration):
-                ip_address = models.GenericIPAddressField(
+                ip_address_rx = models.GenericIPAddressField(
                     verbose_name = 'IP address',
                     protocol='IPv4',
                     default='0.0.0.0')
-                daughterboard = models.CharField(
+                daughterboard_rx = models.CharField(
                     verbose_name='Daughterboard',
                     max_length=3,
                     choices=BOARD_VALUE,
                     blank=False
                 )
-                antenna = models.CharField(
+                antenna_rx = models.CharField(
                     verbose_name='Antenna',
                     max_length=3,
                     choices=ANT_VALUE,
                 )
                 samplerate_rx = models.FloatField(
-                    verbose_name='Sample Rate',
+                    verbose_name='Sample Rate [MHz]',
                     validators=[MinValueValidator(0.01), MaxValueValidator(10.00)],
                     blank=False,
                     null=False,
                 )
                 frequency_rx = models.FloatField(
-                    verbose_name='Frequency',
+                    verbose_name='Frequency [MHz]',
                     validators=[MinValueValidator(0.01)],
                     blank=False,
                     null=False,
                 )
                 clockrate = models.FloatField(
-                    verbose_name='Clock Rate',
+                    verbose_name='Clock Rate [MHz]',
                     blank=False,
                     null=False,
                     help_text='Introduce the value in MHz (10^6)'
                     try:
                         usrp = USRPRXConfiguration.objects.get(pk=self)
-                        usrp_daughterboard = usrp.get_daughterboard_display()
+                        usrp_daughterboard_rx = usrp.get_daughterboard_rx_display()
-                        usrp_antenna = usrp.get_antenna_display()
+                        usrp_antenna_rx = usrp.get_antenna_rx_display()
                         usrp_clocksource = usrp.get_clocksource_display()
                         usrp_timesource = usrp.get_timesource_display()
-                        payload = {'ip_address': usrp.ip_address, 'daughterboard': usrp_daughterboard, 'antenna': usrp_antenna, 'sample_rate': usrp.samplerate_rx, 'frequency': usrp.frequency_rx,
+                        payload = {'ip_address': usrp.ip_address_rx, 'daughterboard': usrp_daughterboard_rx, 'antenna': usrp_antenna_rx, 'sample_rate': usrp.samplerate_rx, 'frequency': usrp.frequency_rx,
                                 'datadir': usrp.datadir, 'clock_source': usrp_clocksource, 'time_source': usrp_timesource, 'clock_rate':usrp.clockrate}
                         r = requests.post(self.device.url("usrprx"), json=payload)

volumes/sirm/apps/usrp_rx/views.py +1 -1

                 kwargs = {}
                 kwargs['dev_conf'] = conf
-                kwargs['dev_conf_keys'] = ['ip_address', 'daughterboard', 'antenna', 'samplerate_rx', 'frequency_rx', 'datadir', 'clocksource', 'timesource', 'clockrate']
+                kwargs['dev_conf_keys'] = ['ip_address_rx', 'daughterboard_rx', 'antenna_rx', 'samplerate_rx', 'frequency_rx', 'datadir', 'clocksource', 'timesource', 'clockrate']
                 kwargs['title'] = 'Configuration'
                 kwargs['suptitle'] = 'Detail'

volumes/sirm/apps/usrp_tx/forms.py +1 -1

                 class Meta:
                     model = USRPTXConfiguration
-                    exclude = ('template', 'device', 'label', 'ip_address', 'daughterboard', 'antenna', 'type', 'parameters', 'status', 'total_units', 'author', 'hash')
+                    exclude = ('template', 'device', 'label', 'type', 'parameters', 'status', 'total_units', 'author', 'hash')
                 def clean(self):
                     form_data = super(USRPTXEditionForm, self).clean()

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