diff --git a/apps/abs/models.py b/apps/abs/models.py index 186d798..2ea53c9 100644 --- a/apps/abs/models.py +++ b/apps/abs/models.py @@ -491,7 +491,7 @@ class ABSConfiguration(Configuration): # Create the datagram socket sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM) sock.settimeout(1) - local_ip = os.environ.get('LOCAL_IP', '127.0.0.1') + local_ip = os.environ.get('LOCAL_IP', '192.168.1.128') sock.setsockopt(socket.IPPROTO_IP, socket.IP_MULTICAST_IF, socket.inet_aton(local_ip)) sock.sendto(message, multicast_group) print('Sending ' + message) diff --git a/apps/main/models.py b/apps/main/models.py index 1debab8..224fde8 100644 --- a/apps/main/models.py +++ b/apps/main/models.py @@ -571,9 +571,9 @@ class Configuration(PolymorphicModel): template = models.BooleanField(default=False) # name = models.CharField(verbose_name="Configuration Name", max_length=40, default='') - label = models.CharField(verbose_name="Label", max_length=40, default='', blank=True, null=True) - experiment = models.ForeignKey('Experiment', verbose_name='Experiment', null=True, blank=True, on_delete=models.CASCADE) device = models.ForeignKey('Device', verbose_name='Device', null=True, on_delete=models.CASCADE) + label = models.CharField(verbose_name="Label", max_length=40, default='', blank=True, null=True) + 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) diff --git a/apps/rc/forms.py b/apps/rc/forms.py index fec2b2e..afeaa17 100644 --- a/apps/rc/forms.py +++ b/apps/rc/forms.py @@ -94,6 +94,9 @@ class RCConfigurationForm(forms.ModelForm): def save(self, *args, **kwargs): conf = super(RCConfigurationForm, self).save(*args, **kwargs) + clk = RCClock.objects.filter(rc_configuration=conf).first() + if clk: + conf.clock_in = clk.frequency conf.total_units = conf.ipp*conf.ntx*conf.km2unit conf.save() return conf