radarsys Commit - r395:cfb0f9955b15 · Jicamarca Repository

.env +2 -2

             DOCKER_DATA=/data/dockers/radarsys/
             LOCAL_IP=192.168.1.128
-            # MQTT_SERVER=10.10.10.200
+            MQTT_SERVER=10.10.10.200
-            MQTT_SERVER = 192.168.100.5
+            # MQTT_SERVER = 192.168.100.5
             MQTT_PORT = 1883
             MQTT_KEEPALIVE = 3660

apps/atrad/models.py +5 0

                     if self.device.status == 2: #Configured
                         self.message = 'TX device is already stopped.'
                         return False
+                    # Se crea el modo ocupado para una vez inicia el STOP
+                    self.device.status = 5
+                    self.device.save()
+                    # Por si se demora deteniendo, que su estado sea busy
                     post_data = {"topic":0}
                     route = "http://" + str(ip) + ":" + str(port) + "/write/"

apps/cgs/models.py +5 0

                     if self.device.status == 2: #Configured
                         self.message = 'CGS device is already stopped.'
                         return False
+                    # Se crea el modo ocupado para una vez inicia el STOP
+                    self.device.status = 5
+                    self.device.save()
+                    # Por si se demora deteniendo, que su estado sea busy
                     post_data = {"freq0":0, "freq1":0, "freq2":0, "freq3":0}
                     route = "http://" + str(ip) + ":" + str(port) + "/write/"

apps/dds/models.py +5 0

                 def stop_device(self):
+                    # Se crea el modo ocupado para una vez inicia el STOP
+                    self.device.status = 5
+                    self.device.save()
+                    # Por si se demora deteniendo, que su estado sea busy
                     try:
                         answer = api.disable_rf(ip = self.device.ip_address,
                                                 port = self.device.port_address)

apps/dds_rest/models.py +5 0

                 def stop_device(self):
+                    # Se crea el modo ocupado para una vez inicia el STOP
+                    self.device.status = 5
+                    self.device.save()
+                    # Por si se demora deteniendo, que su estado sea busy
                     try:
                         payload = self.request('stop', 'post',data=json.dumps({'_rf_enable':0}))
                         self.message = 'DDS REST: {}'.format(payload['stop'])

apps/jars/models.py +5 0

                 def stop_device(self):
+                    # Se crea el modo ocupado para una vez inicia el STOP
+                    self.device.status = 5
+                    self.device.save()
+                    # Por si se demora deteniendo, que su estado sea busy
                     try:
                         payload = self.request('stop', 'post')
                         self.device.status = payload['status']

apps/main/models.py +4 -4

                              (2,'Running'),               #GREEN
                              (3,'Scheduled'),             #BLUE
                              (4,'Unknown'),               #WHITE
+                             (5,'Busy'),
                          )
             CONF_TYPES = (
                     '''
                     self.status=5 #Busy
                     self.save()
-                    # print("Guardando STATUS: {}".format(self.status))
+                    print("Realizando operación. \nEXPERIMENT STATUS : {}".format(self.status))
                     confs = []
                     allconfs = Configuration.objects.filter(experiment=self, type = 0).order_by('-device__device_type__sequence')
                     for conf in confs:
-                        print("conf->",conf)
-                        print(conf.device)
-                        print(conf.device.status)
                         print("--------------",flush=True)
+                        print("STATUS: {}".format(conf.device.status))
                         print("Stop ",conf.name,flush=True)
                         if conf.stop_device() ==False:
                             print("Falló Stop ",conf.name)
                     return reverse('url_%s_conf' % self.device.device_type.name, args=[str(self.id)])
                 def get_absolute_mqtt_url(self):
+                    print("----------------- {} ----------------------".format(self.device.device_type.name),flush=True)
                     if self.device.device_type.name=='abs':
                         return reverse('url_%s_conf_mqtt' % self.device.device_type.name, args=[str(self.id)])
                     else:

apps/main/templates/base_list.html +1 -1

                 {% endfor%}
               </tr>
               {% for object in objects %}
-                <tr class="clickable-row" data-href="{{object.get_absolute_mqtt_url}}">
+                <tr class="clickable-row" data-href="{{object.get_absolute_url}}">
                   <td>{{ forloop.counter|add:offset }}</td>
                   {% for key in keys %}
                   {% if key == 'actions' %}

apps/main/templates/campaign.html +1 -1

             			  {% endfor%}
             			</tr>
             			{% for item in experiments %}
-            			<tr class="clickable-row" data-href="{% url 'url_experiment' item.id %}">
+            			<tr class="clickable-row" s data-href="{% url 'url_experiment' item.id %}">
             			  <td>{{ forloop.counter }}</td>
             			  {% for key in experiment_keys %}
             			  <td>{{ item|attr:key }}</td>

apps/rc/models.py +4 -1

                     return True
                 def stop_device(self):
+                    # Se crea el modo ocupado para una vez inicia el STOP
+                    self.device.status = 5
+                    self.device.save()
+                    # Por si se demora deteniendo, que su estado sea busy
                     try:
                         payload = self.request('stop', 'post')
                         self.message = 'RC stop: {}'.format(payload['stop'])

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages