@@ -280,6 +289,10 @@
+
+
{% if beam.id == active_beam %}
@@ -301,8 +314,12 @@
{% else %}
+
+ Change Beam
+
+
{% endif %}
@@ -317,23 +334,51 @@
{% endif %}
{% endblock extra-content %}
+
{% block extra-js%}
+
+
{% endblock %}
diff --git a/apps/abs/views.py b/apps/abs/views.py
index 002b20c..70a5b0c 100644
--- a/apps/abs/views.py
+++ b/apps/abs/views.py
@@ -24,6 +24,8 @@ from .utils.overJroShow import overJroShow
#Create your views here.
import json, ast
+from .mqtt import client as mqtt_client
+from radarsys.socketconfig import sio as sio
def get_values_from_form(form_data):
@@ -246,6 +248,41 @@ def import_file(request, id_conf):
return render(request, 'abs_import.html', kwargs)
+# def send_mqtt(request,id_conf):
+
+# # conf = get_object_or_404(ABSConfiguration, pk=id_conf)
+
+# # abs_mqtt = Configuration.objects.filter(pk=conf.device.conf_active).first()
+# # if abs_mqtt!=conf:
+# # url_mqtt = '#' if abs is None else abs.get_absolute_url()
+# # label_mqtt = 'None' if abs is None else abs.label
+# # messages.warning(
+# # request,
+# # mark_safe('The current configuration has not been written in the modules, the active configuration is {}'.format(
+# # url_mqtt,
+# # label_mqtt
+# # ))
+# # )
+# # return redirect(conf.get_absolute_url())
+
+# # beam = get_object_or_404(ABSBeam, pk=id_beam)
+
+# conf = get_object_or_404(ABSConfiguration, pk=id_conf)
+
+# mqtt_client.publish('abs/beams_up', 'Hola up')
+# mqtt_client.publish('abs/beams_down', 'Hola down')
+
+# kwargs = {
+# 'title': 'ABS',
+# 'suptitle': conf.label,
+# 'message': 'Are you sure you want to write ABS Beam?',
+# 'delete': False
+# }
+# kwargs['menu_configurations'] = 'active'
+
+# return render(request, 'confirm.html', kwargs)
+
+
def send_beam(request, id_conf, id_beam):
conf = get_object_or_404(ABSConfiguration, pk=id_conf)
@@ -443,3 +480,33 @@ def plot_pattern(request, id_conf, id_beam, antenna):
response = HttpResponse(buf.getvalue(), content_type='image/png')
return response
+import os
+from django.http import HttpResponse
+
+@sio.on('connection-bind')
+def abs_connection_bind(sid, data):
+ print("sid:",sid,"data",data)
+
+@sio.on('disconnect')
+def abs_test_disconnect(sid):
+ print("Disconnected")
+
+@sio.event
+def abs_send_beam_up(sid, message):
+ mqtt_client.publish('abs/beams_up', message['data'])
+
+@sio.event
+def abs_send_beam_down(sid, message):
+ mqtt_client.publish('abs/beams_down', message['data'])
+
+@sio.event
+def change_beam(sid,message):
+ data=str(message['data'])
+ data=data[16]
+ mqtt_client.publish('abs/change_beam',data)
+
+
+
+
+
+
diff --git a/apps/atrad/mqtt.py b/apps/atrad/mqtt.py
index 0e80604..89dcbe0 100644
--- a/apps/atrad/mqtt.py
+++ b/apps/atrad/mqtt.py
@@ -1,3 +1,4 @@
+import os
import paho.mqtt.client as mqtt
from radarsys import settings
from radarsys.socketconfig import sio as sio
@@ -16,11 +17,11 @@ def maxima_temp(trs):
return max(temps)
def on_message(mqtt_client, userdata, msg):
- print(f'Received message on topic: {msg.topic} with payload: {msg.payload}', flush=True)
+ # print(f'Received message on topic: {msg.topic} with payload: {msg.payload}', flush=True)
trsi = [[],[],[],[]]
mensaje = str(msg.payload)
datos = [i for i in mensaje[21:-1].split("*")]
- status=''.join([datos[i][3] for i in [0,1,2,3]])
+ status=''.join([datos[i][3] for i in range(3)])
for trs,i in zip(datos,[0,1,2,3]) :
trsi[i]= [int(i) for i in trs[1:-1].split(",")]
potencias = [trsi[0][34],trsi[0][36],trsi[2][32],trsi[2][34]]
@@ -30,9 +31,9 @@ def on_message(mqtt_client, userdata, msg):
client = mqtt.Client()
client.on_connect = on_connect
client.on_message = on_message
-client.username_pw_set(settings.MQTT_USER, settings.MQTT_PASSWORD)
+client.username_pw_set(os.environ.get('MQTT_USER_ATRAD', 'atrad'), os.environ.get('MQTT_PASSWORD_ATRAD', 'atrad'))
client.connect(
- host=settings.MQTT_SERVER,
- port=settings.MQTT_PORT,
- keepalive=settings.MQTT_KEEPALIVE
+ host=os.environ.get('MQTT_SERVER', '0.0.0.0'),
+ port=int(settings.os.environ.get('MQTT_PORT', 1883)),
+ keepalive=int(os.environ.get('MQTT_KEEPALIVE', 36000))
)
\ No newline at end of file
diff --git a/radarsys/settings.py b/radarsys/settings.py
index b057210..2b1d4a0 100644
--- a/radarsys/settings.py
+++ b/radarsys/settings.py
@@ -170,7 +170,7 @@ django.utils.encoding.force_text = force_str
# choose of auto-created primary keys
DEFAULT_AUTO_FIELD='django.db.models.AutoField'
-MQTT_SERVER = '10.10.10.99'
+MQTT_SERVER = '10.10.10.200'
MQTT_PORT = 1883
MQTT_KEEPALIVE = 60
MQTT_USER = ''