diff --git a/.env b/.env
index cf2fd7f..6411616 100644
--- a/.env
+++ b/.env
@@ -8,5 +8,5 @@ DB_PASSWORD=docker
PGDATA=/var/lib/postgresql/data
LC_ALL=C.UTF-8
TZ=America/Lima
-DOCKER_DATA=/Volumes/dockers/radarsys/
+DOCKER_DATA=/data/dockers/radarsys/
LOCAL_IP=192.168.1.128
diff --git a/apps/abs/models.py b/apps/abs/models.py
index e5339d4..424ad1c 100644
--- a/apps/abs/models.py
+++ b/apps/abs/models.py
@@ -365,7 +365,7 @@ class ABSConfiguration(Configuration):
It needs 'module_conf' function
"""
print("Write")
- beams = ABSBeam.objects.filter(abs_conf=self)
+ beams = ABSBeam.objects.filter(abs_conf=self)
nbeams = len(beams)
# Se manda a cero RC para poder realizar cambio de beam
@@ -479,7 +479,7 @@ class ABSConfiguration(Configuration):
self.module_status = ''.join(status)
self.save()
print('Estatus salvado')
- conf_active = ABSActive.objects.get_or_create(pk=1)
+ conf_active, __ = ABSActive.objects.get_or_create(pk=1)
conf_active.conf = self
conf_active.save()
return True
diff --git a/apps/dds_rest/models.py b/apps/dds_rest/models.py
index 0c3eab6..db05bbb 100644
--- a/apps/dds_rest/models.py
+++ b/apps/dds_rest/models.py
@@ -121,46 +121,74 @@ class DDSRestConfiguration(Configuration):
def reset_device(self):
- answer = api.reset(ip = self.device.ip_address,
- port = self.device.port_address)
-
- if answer[0] != "1":
- self.message = 'DDS - {}'.format(answer[2:])
- return 0
+ try:
+ payload = self.request('reset', 'post')
+ if payload['reset']=='ok':
+ self.message = 'DDS REST restarted OK'
+ self.device.status = 2
+ self.device.save()
+ else:
+ self.message = 'DDS REST restart fail'
+ self.device.status = 4
+ self.device.save()
+ except Exception as e:
+ self.message = 'DDS REST reset: {}'.format(str(e))
+ return False
- self.message = 'DDS - {}'.format(answer[2:])
- return 1
+ return True
def stop_device(self):
try:
- answer = api.disable_rf(ip = self.device.ip_address,
- port = self.device.port_address)
-
- return self.status_device()
-
+ payload = self.request('stop', 'post',data=json.dumps({'_rf_enable':0}))
+ self.message = 'DDS REST: {}'.format(payload['stop'])
+ if payload['stop']=='ok':
+ self.device.status = 2
+ self.device.save()
+ else:
+ self.device.status = 4
+ self.device.save()
+ return False
except Exception as e:
- self.message = str(e)
+ if 'No route to host' not in str(e):
+ self.device.status = 4
+ else:
+ self.device.status = 0
+ self.message = 'DDS REST stop: {}'.format(str(e))
+ self.device.save()
return False
+ return True
+
def start_device(self):
try:
- answer = api.enable_rf(ip = self.device.ip_address,
- port = self.device.port_address)
-
- return self.status_device()
-
+ payload = self.request('start', 'post',data=json.dumps({'_rf_enable':1}))
+ self.message = 'DDS REST start: {}'.format(payload['start'])
+ if payload['start']=='ok':
+ self.device.status = 3
+ self.device.save()
+ else:
+ self.device.status = 2
+ self.device.save()
+ return False
except Exception as e:
- self.message = str(e)
+ if 'No route to host' not in str(e):
+ self.device.status = 4
+ else:
+ self.device.status = 0
+ self.message = 'DDS REST start: {}'.format(str(e))
+ self.device.save()
return False
+ return True
+
def read_device(self):
- parms = api.read_config(ip = self.device.ip_address,
- port = self.device.port_address)
+ parms = self.request('read')
+ print(parms)
if not parms:
- self.message = "Could not read DDS parameters from this device"
+ self.message = "Could not read DDS REST parameters from this device"
return parms
self.message = ""
@@ -211,7 +239,8 @@ class DDSRestConfiguration(Configuration):
print(update_clock)
ramp_rate_clock = self.ramp_rate_clock or 0
print(ramp_rate_clock)
-
+ osrr = 0
+ qdac = 0
control = self.arma_control(clock,multiplier,modulation)
phase1 = self.conv_phase(phaseA_degrees)
phase2 = self.conv_phase(phaseB_degrees)
@@ -227,7 +256,9 @@ class DDSRestConfiguration(Configuration):
'amplitudeI': (b64encode((amplitudeI).to_bytes(2,'little'))).decode("UTF-8"),\
'amplitudeQ': (b64encode((amplitudeQ).to_bytes(2,'little'))).decode("UTF-8"),\
'_phase1': (b64encode((phase1))).decode("UTF-8"),\
- '_phase2': (b64encode((phase2))).decode("UTF-8")
+ '_phase2': (b64encode((phase2))).decode("UTF-8"),\
+ 'osrr': (b64encode((osrr).to_bytes(1,'little'))).decode("UTF-8"),\
+ 'qdac': (b64encode((qdac).to_bytes(2,'little'))).decode("UTF-8")
}
return cadena_json
diff --git a/apps/dds_rest/templates/dds_rest_conf_edit - Copy.html b/apps/dds_rest/templates/dds_rest_conf_edit - Copy.html
new file mode 100644
index 0000000..d14c611
--- /dev/null
+++ b/apps/dds_rest/templates/dds_rest_conf_edit - Copy.html
@@ -0,0 +1,463 @@
+{% extends "dev_conf_edit.html" %}
+{% load bootstrap4 %}
+{% load static %}
+{% load main_tags %}
+
+{% block dds_rest%}
+
+ {% bootstrap_field form.template layout='horizontal' size='medium' %}
+ {% bootstrap_field form.device layout='horizontal' size='medium' %}
+ {% bootstrap_field form.label layout='horizontal' size='medium' %}
+ {% bootstrap_field form.experiment layout='horizontal' size='medium' %}
+
+ {% bootstrap_field form.clock layout='horizontal' size='medium' %}
+ {% bootstrap_field form.multiplier layout='horizontal' size='medium' %}
+
+
+ {% bootstrap_field form.frequencyA_Mhz layout='horizontal' size='medium' %}
+
+ {% bootstrap_field form.frequencyA layout='horizontal' size='medium' %}
+
+ 1000 0000
+
+
+
+ {% bootstrap_field form.frequencyB layout='horizontal' size='medium' %}
+
+ 1000 0000
+
+
+
+ {% bootstrap_field form.delta_frequency layout='horizontal' size='medium' %}
+
+ 1000 0000
+
+
+
+ {% bootstrap_field form.ramp_rate_clock_Mhz layout='horizontal' size='medium' %}
+ {% bootstrap_field form.ramp_rate_clock layout='horizontal' size='medium' %}
+
+ 1000 0000
+
+
+
+
+ 9282
+
+
+ 1000 0000
+
+
+
+
+ 9876
+
+
+ 1000 0000
+
+
+
+
+ 35
+
+
+ 0000 0000 0010
+
+
+
+
+ 40
+
+
+ 0000 1010 1000
+
+
+