diff --git a/.env b/.env index 92bedb2..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 = 0.0.0.0 +# 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 e087d42..41351b9 100644 --- a/apps/abs/models.py +++ b/apps/abs/models.py @@ -361,6 +361,16 @@ class ABSConfiguration(Configuration): return True + def stop_device_mqtt(self): + + self.device.status = 2 + self.device.save() + self.message = 'ABS has been stopped.' + self.save() + + mqtt_client.publish(os.environ.get('TOPIC_ABS', 'abs/beams'),"STOP") + + return True def write_device(self): @@ -494,6 +504,35 @@ class ABSConfiguration(Configuration): return True def write_device_mqtt(self): + + if self.experiment is None: + confs = [] + else: + confs = Configuration.objects.filter(experiment = self.experiment).filter(type=0) + confdds = '' + confjars = '' + confrc = '' + #TO STOP DEVICES: DDS-JARS-RC + for i in range(0,len(confs)): + if i==0: + for conf in confs: + if conf.device.device_type.name == 'dds': + confdds = conf + confdds.stop_device() + break + if i==1: + for conf in confs: + if conf.device.device_type.name == 'jars': + confjars = conf + confjars.stop_device() + break + if i==2: + for conf in confs: + if conf.device.device_type.name == 'rc': + confrc = conf + confrc.stop_device() + break + apuntes_up_down='' beams = ABSBeam.objects.filter(abs_conf=self) @@ -506,13 +545,18 @@ class ABSConfiguration(Configuration): apuntes_up_down=apuntes_up_down+info apuntes_up_down=apuntes_up_down[:len(apuntes_up_down)-1] - apuntes_up_down=inicializacion+ apuntes_up_down+finalizacion - - #print(apuntes_up_down,flush=True) - mqtt_client.publish(os.environ.get('TOPIC_ABS', 'abs/beams'),apuntes_up_down) + #Start DDS-RC-JARS + if confdds: + confdds.start_device() + if confrc: + #print confrc + confrc.start_device() + if confjars: + confjars.start_device() + return True def read_module(self, module): diff --git a/apps/abs/views.py b/apps/abs/views.py index 70a5b0c..39b7616 100644 --- a/apps/abs/views.py +++ b/apps/abs/views.py @@ -174,6 +174,14 @@ def abs_conf(request, id_conf): return render(request, 'abs_conf.html', kwargs) +# def abs_conf_mqtt(request, id_conf): +# # socket.on('beams_ack',function(data){ + # ack=data; + # console.log("ack") + # console.log(ack) + # }) + + def abs_conf_edit(request, id_conf): conf = get_object_or_404(ABSConfiguration, pk=id_conf) @@ -248,41 +256,6 @@ 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) diff --git a/apps/main/models.py b/apps/main/models.py index 2ed9bbe..d699b51 100644 --- a/apps/main/models.py +++ b/apps/main/models.py @@ -781,6 +781,10 @@ class Configuration(PolymorphicModel): self.message = 'Function not implemented' return False + def write_device_mqtt(self, parms): + + self.message = 'Function not implemented' + return False def read_device(self): @@ -817,6 +821,9 @@ class Configuration(PolymorphicModel): def get_absolute_url_stop(self): return reverse('url_stop_dev_conf', args=[str(self.id)]) + + def get_absolute_url_stop_mqtt(self): + return reverse('url_stop_mqtt_dev_conf', args=[str(self.id)]) def get_absolute_url_status(self): return reverse('url_status_dev_conf', args=[str(self.id)]) diff --git a/apps/main/mqtt.py b/apps/main/mqtt.py index 6b4dc87..347d338 100644 --- a/apps/main/mqtt.py +++ b/apps/main/mqtt.py @@ -5,12 +5,8 @@ from radarsys.socketconfig import sio as sio lista_ack=[ - chr( 33 ), chr( 34 ), chr( 35 ), chr( 36 ), chr( 37 ), chr( 38 ), chr( 39 ), chr( 40 ), chr( 41 ), chr( 42 ), chr( 43 ), chr( 44 ), chr( 45 ), chr( 46 ), chr( 47 ), chr( 48 ), chr( 49 ), chr( 50 ), chr( 51 ), chr( 52 ), chr( 53 ), chr( 54 ), chr( 55 ), chr( 56 ), chr( 57 ), chr( 58 ), chr( 59 ), chr( 60 ), chr( 61 ), chr( 62 ), chr( 63 ), chr( 64 ), chr( 65 ), chr( 66 ), chr( 67 ), chr( 68 ), chr( 69 ), chr( 70 ), chr( 71 ), chr( 72 ), chr( 73 ), chr( 74 ), chr( 75 ), chr( 76 ), chr( 77 ), chr( 78 ), chr( 79 ), chr( 80 ), chr( 81 ), chr( 82 ), chr( 83 ), chr( 84 ), chr( 85 ), chr( 86 ), chr( 87 ), chr( 88 ), chr( 89 ), chr( 90 ), chr( 91 ), chr( 92 ), chr( 93 ), chr( 94 ), chr( 95 ), chr( 96 ) - ] - -lista_ack_dismatching=[ - chr( 97 ), chr( 98 ), chr( 99 ), chr( 100 ), chr( 101 ), chr( 102 ), chr( 103 ), chr( 104 ), chr( 105 ), chr( 106 ), chr( 107 ), chr( 108 ), chr( 109 ), chr( 110 ), chr( 111 ), chr( 112 ), chr( 113 ), chr( 114 ), chr( 115 ), chr( 116 ), chr( 117 ), chr( 118 ), chr( 119 ), chr( 120 ), chr( 121 ), chr( 122 ), chr( 123 ), chr( 124 ), chr( 125 ), chr( 126 ), chr( 127 ), chr( 128 ), chr( 129 ), chr( 130 ), chr( 131 ), chr( 132 ), chr( 133 ), chr( 134 ), chr( 135 ), chr( 136 ), chr( 137 ), chr( 138 ), chr( 139 ), chr( 140 ), chr( 141 ), chr( 142 ), chr( 143 ), chr( 144 ), chr( 145 ), chr( 146 ), chr( 147 ), chr( 148 ), chr( 149 ), chr( 150 ), chr( 151 ), chr( 152 ), chr( 153 ), chr( 154 ), chr( 155 ), chr( 156 ), chr( 157 ), chr( 158 ), chr( 159 ), chr(160) -] + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128 + ] @@ -25,11 +21,33 @@ def on_message(mqtt_client, userdata, msg): # print(f'Received message on topic: {msg.topic} with payload: {msg.payload}', flush=True) # message= str(msg.payload) # sio.emit('abs_ws',data={'msg':message}) - print("HOLA",flush=True) + #print("HOLA",flush=True) # message=msg.payload[1] # print("HOLAAA ",message,flush=True) # #lista_ack.remove(msg.payload) # print("LISTA ",lista_ack) + global lista_ack + global lista_ack_dismatching + message= str(msg.payload) + message=message[2:len(message)-1] + if(message=="UPDATE"): + print("UUPDATE") + sio.emit('beams_ack',data={'msg':lista_ack}) + print(lista_ack,flush=True) + lista_ack=[ + 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17, 18, 19, 20, 21, 22, 23, 24, 25, 26, 27, 28, 29, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57, 58, 59, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, 87, 88, 89, 90, 91, 92, 93, 94, 95, 96, 97, 98, 99, 100, 101, 102, 103, 104, 105, 106, 107, 108, 109, 110, 111, 112, 113, 114, 115, 116, 117, 118, 119, 120, 121, 122, 123, 124, 125, 126, 127, 128 + ] + else: + message=int(message) + if(message<=64): + # print(message,"\t MATCH",flush=True) + lista_ack.remove(message+64) + + elif(message>64): + # print(message,"\t DISMATCH",flush=True) + lista_ack.remove(message-64) + else: + print(len(message)) diff --git a/apps/main/templates/dev_conf.html b/apps/main/templates/dev_conf.html index 5560613..921de49 100644 --- a/apps/main/templates/dev_conf.html +++ b/apps/main/templates/dev_conf.html @@ -28,6 +28,7 @@
  • Write
    • {% if dev_conf.device.device_type.name == 'abs' %}
  • Write MQTT
    • +
  • Stop MQTT
    • {% endif %} {% if dev_conf.device.device_type.name != 'abs' %}
  • Read
    • diff --git a/apps/main/urls.py b/apps/main/urls.py index 5e505be..73466a8 100644 --- a/apps/main/urls.py +++ b/apps/main/urls.py @@ -59,6 +59,7 @@ urlpatterns = ( path('dev_conf//export/', views.dev_conf_export, name='url_export_dev_conf'), path('dev_conf//start/', views.dev_conf_start, name='url_start_dev_conf'), path('dev_conf//stop/', views.dev_conf_stop, name='url_stop_dev_conf'), + path('dev_conf//stop_mqtt/', views.dev_conf_stop_mqtt, name='url_stop_mqtt_dev_conf'), path('dev_conf//status/', views.dev_conf_status, name='url_status_dev_conf'), path('operation/', views.operation, name='url_operation'), diff --git a/apps/main/views.py b/apps/main/views.py index 2854386..6d8045d 100644 --- a/apps/main/views.py +++ b/apps/main/views.py @@ -1465,6 +1465,19 @@ def dev_conf_stop(request, id_conf): return redirect(conf.get_absolute_url()) +@login_required +def dev_conf_stop_mqtt(request, id_conf): + + conf = get_object_or_404(Configuration, pk=id_conf) + + if conf.stop_device_mqtt(): + messages.success(request, conf.message) + else: + messages.error(request, conf.message) + + #conf.status_device() + + return redirect(conf.get_absolute_url()) @login_required def dev_conf_status(request, id_conf): @@ -1513,7 +1526,6 @@ def dev_conf_write(request, id_conf): if request.method == 'POST': if conf.write_device(): - mqtt_client.publish('abs/beams_up', 'Write normal') conf.device.conf_active = conf.pk conf.device.save() messages.success(request, conf.message) @@ -1542,9 +1554,6 @@ def dev_conf_write_mqtt(request,id_conf): if request.method == 'POST': if conf.write_device_mqtt(): - mqtt_client.publish('abs/beams_up', 'Mqtt') - #mqtt_client.publish('abs/beams_down', 'Hola down') - conf.device.conf_active = conf.pk conf.device.save() messages.success(request, conf.message) @@ -1552,7 +1561,7 @@ def dev_conf_write_mqtt(request,id_conf): conf.clone(type=1, template=False) else: messages.error(request, conf.message) - + print("return",flush=True) return redirect(get_object_or_404(Configuration, pk=id_conf).get_absolute_url()) kwargs = { @@ -1562,7 +1571,7 @@ def dev_conf_write_mqtt(request,id_conf): 'delete': False } kwargs['menu_configurations'] = 'active' - + print("Confirm",flush=True) return render(request, 'confirm.html', kwargs)