diff --git a/.env b/.env index e33b8bb..9d4911e 100644 --- a/.env +++ b/.env @@ -18,8 +18,8 @@ TZ=America/Lima DOCKER_DATA=/data/dockers/radarsys/ LOCAL_IP=192.168.1.128 -MQTT_SERVER=10.10.10.200 -# MQTT_SERVER = 192.168.100.5 +# MQTT_SERVER=10.10.10.200 +MQTT_SERVER = 192.168.100.5 MQTT_PORT = 1883 MQTT_KEEPALIVE = 3660 diff --git a/apps/abs/models.py b/apps/abs/models.py index ecb8351..a1c17f9 100644 --- a/apps/abs/models.py +++ b/apps/abs/models.py @@ -339,6 +339,7 @@ class ABSConfiguration(Configuration): try: #self.write_device() send_task('task_change_beam', [self.id],) + print("*************************RUNNING ABS**************************",flush=True) self.message = 'ABS running' except Exception as e: @@ -356,6 +357,7 @@ class ABSConfiguration(Configuration): self.device.status = 2 self.device.save() self.message = 'ABS has been stopped.' + print("*************************STOPPED ABS**************************",flush=True) self.save() return True diff --git a/apps/abs/templates/abs_downpattern_img.html b/apps/abs/templates/abs_downpattern_img.html index b994d74..57288ea 100644 --- a/apps/abs/templates/abs_downpattern_img.html +++ b/apps/abs/templates/abs_downpattern_img.html @@ -2,10 +2,6 @@ {% load django_bootstrap5 %} {% load main_tags %} -{% block content %} +Error ploting... -
- Error ploting... -
-{% endblock %} diff --git a/apps/abs/templates/abs_pattern.html b/apps/abs/templates/abs_pattern.html index 1aa8192..a30df91 100644 --- a/apps/abs/templates/abs_pattern.html +++ b/apps/abs/templates/abs_pattern.html @@ -122,7 +122,12 @@ font-size: 95%; } - +.image_plot { + border: 2px solid #00334d; + display: inline-block; + vertical-align: 50px; + margin-left: 10px; +} .abs_rx tr:nth-last-child(1){ border-bottom: 0px solid #00334d; @@ -373,9 +378,16 @@ - {% if not edit %} - {% include "abs_uppattern_img.html" %} - {% endif %} + + + + +
+ {% if not edit %} + {% include "abs_uppattern_img.html" %} + {% endif %} + +

@@ -597,9 +609,15 @@ - {% if not edit %} - {% include "abs_downpattern_img.html" %} - {% endif %} + + + + +
+ {% if not edit %} + {% include "abs_downpattern_img.html" %} + {% endif %} +

diff --git a/apps/abs/templates/abs_patterns.html b/apps/abs/templates/abs_patterns.html index 4d88534..25c06ad 100644 --- a/apps/abs/templates/abs_patterns.html +++ b/apps/abs/templates/abs_patterns.html @@ -36,7 +36,7 @@