From 08d5cd67904ad60668cd5da4d8bfa023a4362b1b 2024-09-24 14:29:19 From: krodriguez Date: 2024-09-24 14:29:19 Subject: [PATCH] Added monitor channel to the RC configuration. --- diff --git a/apps/rc/models.py b/apps/rc/models.py index 681a4c7..9fcc380 100644 --- a/apps/rc/models.py +++ b/apps/rc/models.py @@ -80,6 +80,7 @@ class RCConfiguration(Configuration): time_before = models.PositiveIntegerField(verbose_name='Time before [μS]', default=12) time_after = models.PositiveIntegerField(verbose_name='Time after [μS]', default=1) sync = models.PositiveIntegerField(verbose_name='Synchro delay', default=0) + ch_monitor = models.PositiveIntegerField(verbose_name='Channel Monitor', validators=[MinValueValidator(0), MaxValueValidator(15)], default=6) sampling_reference = models.CharField(verbose_name='Sampling Reference', choices=SAMPLING_REFS, default='none', max_length=40) control_tx = models.BooleanField(verbose_name='Control Switch TX', default=False) control_sw = models.BooleanField(verbose_name='Control Switch SW', default=False) @@ -578,6 +579,9 @@ class RCConfiguration(Configuration): print("write device") if not raw: + + + clock = RCClock.objects.get(rc_configuration=self) if clock.mode: data = {'default': clock.frequency} @@ -594,6 +598,18 @@ class RCConfiguration(Configuration): #if payload['setfreq'] == 'fail': if payload['programming'] == 'fail': self.message = 'RC write: error programming CGS chip' + + ############################################################## + data = {'setwindow': self.ch_monitor} + print(data) + payload = self.request('setwin', 'post', data=json.dumps(data)) + + if payload['setwindow'] == 'ok': + self.message = 'RC write: {}'.format(payload['setwindow']) + else: + if payload['command'] != 'wrong format or key': + self.message = 'Error RC monitor channel: {}'.format(payload['command']) + ############################################################## values = [] print('wait delay values...') diff --git a/apps/rc/views.py b/apps/rc/views.py index f6bd8c2..5a63512 100644 --- a/apps/rc/views.py +++ b/apps/rc/views.py @@ -33,7 +33,7 @@ def conf(request, conf_id): kwargs['dev_conf'] = conf kwargs['rc_lines'] = lines kwargs['dev_conf_keys'] = ['ipp_unit', 'ntx', 'clock_divider', 'clock', - 'time_before', 'time_after', 'sync', 'sampling_reference', + 'time_before', 'time_after', 'sync', 'ch_monitor', 'sampling_reference', 'control_tx', 'control_sw'] kwargs['title'] = 'Configuration'