| @@ -491,7 +491,7 class ABSConfiguration(Configuration): | |||||
| 491 | # Create the datagram socket |
|
491 | # Create the datagram socket | |
| 492 | sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) |
|
492 | sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) | |
| 493 | sock.settimeout(1) |
|
493 | sock.settimeout(1) | |
| 494 |
local_ip = os.environ.get('LOCAL_IP', '1 |
|
494 | local_ip = os.environ.get('LOCAL_IP', '192.168.1.128') | |
| 495 | sock.setsockopt(socket.IPPROTO_IP, socket.IP_MULTICAST_IF, socket.inet_aton(local_ip)) |
|
495 | sock.setsockopt(socket.IPPROTO_IP, socket.IP_MULTICAST_IF, socket.inet_aton(local_ip)) | |
| 496 | sock.sendto(message, multicast_group) |
|
496 | sock.sendto(message, multicast_group) | |
| 497 | print('Sending ' + message) |
|
497 | print('Sending ' + message) | |
| @@ -571,9 +571,9 class Configuration(PolymorphicModel): | |||||
| 571 |
|
571 | |||
| 572 | template = models.BooleanField(default=False) |
|
572 | template = models.BooleanField(default=False) | |
| 573 | # name = models.CharField(verbose_name="Configuration Name", max_length=40, default='') |
|
573 | # name = models.CharField(verbose_name="Configuration Name", max_length=40, default='') | |
| 574 | label = models.CharField(verbose_name="Label", max_length=40, default='', blank=True, null=True) |
|
|||
| 575 | experiment = models.ForeignKey('Experiment', verbose_name='Experiment', null=True, blank=True, on_delete=models.CASCADE) |
|
|||
| 576 | device = models.ForeignKey('Device', verbose_name='Device', null=True, on_delete=models.CASCADE) |
|
574 | device = models.ForeignKey('Device', verbose_name='Device', null=True, on_delete=models.CASCADE) | |
|
|
575 | label = models.CharField(verbose_name="Label", max_length=40, default='', blank=True, null=True) | |||
|
|
576 | experiment = models.ForeignKey('Experiment', verbose_name='Experiment', null=True, blank=True, on_delete=models.CASCADE) | |||
| 577 | type = models.PositiveSmallIntegerField(default=0, choices=CONF_TYPES) |
|
577 | type = models.PositiveSmallIntegerField(default=0, choices=CONF_TYPES) | |
| 578 | created_date = models.DateTimeField(auto_now_add=True) |
|
578 | created_date = models.DateTimeField(auto_now_add=True) | |
| 579 | programmed_date = models.DateTimeField(auto_now=True) |
|
579 | programmed_date = models.DateTimeField(auto_now=True) | |
| @@ -94,6 +94,9 class RCConfigurationForm(forms.ModelForm): | |||||
| 94 |
|
94 | |||
| 95 | def save(self, *args, **kwargs): |
|
95 | def save(self, *args, **kwargs): | |
| 96 | conf = super(RCConfigurationForm, self).save(*args, **kwargs) |
|
96 | conf = super(RCConfigurationForm, self).save(*args, **kwargs) | |
|
|
97 | clk = RCClock.objects.filter(rc_configuration=conf).first() | |||
|
|
98 | if clk: | |||
|
|
99 | conf.clock_in = clk.frequency | |||
| 97 | conf.total_units = conf.ipp*conf.ntx*conf.km2unit |
|
100 | conf.total_units = conf.ipp*conf.ntx*conf.km2unit | |
| 98 | conf.save() |
|
101 | conf.save() | |
| 99 | return conf |
|
102 | return conf | |
General Comments 0
You need to be logged in to leave comments.
Login now